[packages/gwenhywfar] - added qt6 gui library

Thu Apr 16 21:53:24 CEST 2026

commit e34f9d0a0c7eb6a9cd8409ab3565f0becc0e795d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Apr 16 21:53:58 2026 +0200

    - added qt6 gui library

 gwenhywfar-qt5.patch | 22 +++++++++++--
 gwenhywfar.spec      | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 104 insertions(+), 5 deletions(-)
---

diff --git a/gwenhywfar.spec b/gwenhywfar.spec
index 9097c02..50de19e 100644
--- a/gwenhywfar.spec
+++ b/gwenhywfar.spec
@@ -6,6 +6,7 @@
 %bcond_without	qt		# any Qt GUI (convenience)
 %bcond_without	qt4		# Qt 4 GUI
 %bcond_without	qt5		# Qt 5 GUI
+%bcond_without	qt6		# Qt 6 GUI
 %bcond_without	static_libs	# static libraries
 %bcond_with	tests		# run tests
 
@@ -13,6 +14,7 @@
 %if %{without qt}
 %undefine	with_qt4
 %undefine	with_qt5
+%undefine	with_qt6
 %endif
 Summary:	Gwenhywfar - a multi-platform helper library for networking and security
 Summary(pl.UTF-8):	Gwenhywfar - wieloplatformowa biblioteka pomocnicza do sieci i bezpieczeństwa
@@ -53,6 +55,13 @@ BuildRequires:	Qt5Widgets-devel >= 5
 BuildRequires:	qt5-build >= 5
 BuildRequires:	qt5-qmake >= 5
 %endif
+%if %{with qt6}
+BuildRequires:	Qt6Core-devel >= 6
+BuildRequires:	Qt6Gui-devel >= 6
+BuildRequires:	Qt6Widgets-devel >= 6
+BuildRequires:	qt6-build >= 6
+BuildRequires:	qt6-qmake >= 6
+%endif
 Requires:	gnutls-libs >= 2.9.8
 Requires:	libgcrypt >= 1.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -355,6 +364,36 @@ Static Qt 5 Gwenhywfar GUI library.
 %description gui-qt5-static -l pl.UTF-8
 Statyczna biblioteka graficznego interfejsu Qt 5 do Gwenhywfar.
 
+%package gui-qt6
+Summary:	Qt 6 Gwenhywfar GUI library implementation of the GWEN_DIALOG framework
+Summary(pl.UTF-8):	Biblioteka graficznego interfejsu Qt 6 do Gwenhywfar
+Group:		X11/Libraries
+Requires:	%{name}-gui-cpp = %{version}-%{release}
+
+%description gui-qt6
+Qt 6 Gwenhywfar GUI library, containing Qt 6 implementation of the
+GWEN_DIALOG framework.
+
+%description gui-qt6 -l pl.UTF-8
+Biblioteka graficznego interfejsu Qt 6 do Gwenhywfar, zawierająca
+implementację Qt 6 szkieletu GWEN_DIALOG.
+
+%package gui-qt6-devel
+Summary:	Header files for Qt 6 Gwenhywfar GUI library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki graficznego interfejsu Qt 6 do Gwenhywfar
+Group:		X11/Development/Libraries
+Requires:	%{name}-gui-cpp-devel = %{version}-%{release}
+Requires:	%{name}-gui-qt6 = %{version}-%{release}
+Requires:	Qt5Core-devel >= 6
+Requires:	Qt5Gui-devel >= 6
+Requires:	Qt5Widgets-devel >= 6
+
+%description gui-qt6-devel
+Header files for Qt 6 Gwenhywfar GUI library
+
+%description gui-qt6-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki graficznego interfejsu Qt 6 do Gwenhywfar.
+
 %package gwenbuild
 Summary:	Specific build system for the aqbanking universe
 Summary(pl.UTF-8):	Specyficzny system budowania dla uniwersum aqbanking
@@ -382,6 +421,11 @@ aqbanking.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
+%define	configuredir ..
+
+install -d build
+cd build
 %configure \
 	QMAKE=%{_bindir}/qmake-qt5 \
 	QT_MOC=%{_bindir}/moc-qt5 \
@@ -394,16 +438,38 @@ aqbanking.
 
 # QT_LIBS is workaround for libtool ignoring /absolute/path/lib.so args (+remove redundant libs from linking)
 %{__make} \
-	QT_LIBS="-lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread"
+	QT_LIBS="-lQt5Widgets -lQt5Gui -lQt5Core"
 
 %if %{with tests}
 %{__make} check
 %endif
+cd ..
+
+%if %{with qt6}
+# gwenhywfar configure doesn't allow building both qt5 & qt6 in one shot
+install -d build-qt6
+cd build-qt6
+%configure \
+	QMAKE=%{_bindir}/qmake-qt6 \
+	QT_MOC=%{_bindir}/moc-qt6 \
+	QT_UIC=%{_bindir}/uic-qt6 \
+	--disable-network-checks \
+	--with-guis="qt6" \
+	--with-openssl-libs=%{_libdir}
+
+%{__make} \
+	QT_LIBS="-lQt6Widgets -lQt6Gui -lQt6Core"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%if %{with qt6}
+%{__make} -C build-qt6 install \
+	DESTDIR=$RPM_BUILD_ROOT
+%endif
+
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la \
@@ -438,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %post	gui-qt5 -p /sbin/ldconfig
 %postun	gui-qt5 -p /sbin/ldconfig
 
+%post	gui-qt6 -p /sbin/ldconfig
+%postun	gui-qt6 -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -590,6 +659,20 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
+%if %{with qt6}
+%files gui-qt6
+%defattr(644,root,root,755)
+%{_libdir}/libgwengui-qt6.so.*.*.*
+%ghost %{_libdir}/libgwengui-qt6.so.79
+
+%files gui-qt6-devel
+%defattr(644,root,root,755)
+%{_libdir}/libgwengui-qt6.so
+%{_includedir}/gwenhywfar5/gwen-gui-qt6
+%{_pkgconfigdir}/gwengui-qt6.pc
+%{_libdir}/cmake/gwengui-qt6-%{ver_cmake}
+%endif
+
 %files gwenbuild
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gwbuild
diff --git a/gwenhywfar-qt5.patch b/gwenhywfar-qt5.patch
index 104896b..bc92039 100644
--- a/gwenhywfar-qt5.patch
+++ b/gwenhywfar-qt5.patch
@@ -1,6 +1,6 @@
---- gwenhywfar-5.14.0/m4/ax_have_qt.m4.orig	2025-07-06 19:48:38.000000000 +0200
-+++ gwenhywfar-5.14.0/m4/ax_have_qt.m4	2026-04-15 05:35:51.621602590 +0200
-@@ -80,9 +80,9 @@ AC_DEFUN([AX_HAVE_QT],
+--- gwenhywfar-5.14.1/m4/ax_have_qt.m4.orig	2025-07-06 19:48:38.000000000 +0200
++++ gwenhywfar-5.14.1/m4/ax_have_qt.m4	2026-04-16 20:51:16.295981068 +0200
+@@ -80,10 +80,14 @@ AC_DEFUN([AX_HAVE_QT],
    AC_MSG_CHECKING(for Qt)
    am_have_qt_qmexe_suff=`echo $QMAKE | sed 's,^.*qmake,,'`
    # If we have Qt5 or later in the path, we're golden
@@ -9,6 +9,22 @@
  
 -  if test "$ver" ">" "Qt version 4"; then
 +  if test "$ver" -gt 4; then
++   if test "$ver" -gt 5; then
++    QT_MAJOR_VERSION="6"
++   else
      QT_MAJOR_VERSION="5"
++   fi
      have_qt=yes
      # This pro file dumps qmake's variables, but it only works on Qt 5 or later
+     am_have_qt_dir=`mktemp -d`
+--- gwenhywfar-5.14.1/gui/qt5/Makefile.am.orig	2026-04-16 21:31:24.532934528 +0200
++++ gwenhywfar-5.14.1/gui/qt5/Makefile.am	2026-04-16 21:31:49.336133490 +0200
+@@ -29,7 +29,7 @@ nodist_libgwengui_qt at QT_MAJOR_VERSION@_l
+ nodist_noinst_HEADERS=
+ 
+ 
+-iheaderdir=${gwenhywfar_headerdir_am}/gwen-gui-qt5
++iheaderdir=${gwenhywfar_headerdir_am}/gwen-gui-qt at QT_MAJOR_VERSION@
+ iheader_HEADERS=\
+  qt5_gui.hpp \
+  qt5_gui_dialog.hpp \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gwenhywfar.git/commitdiff/e34f9d0a0c7eb6a9cd8409ab3565f0becc0e795d

