Accepting request 1298397 from Office

OBS-URL: https://build.opensuse.org/request/show/1298397
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gwenhywfar?expand=0&rev=87

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>gwenhywfar-qt6</package>
+</multibuild>

gwenhywfar-5.10.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2f60a9dde5da27e57e0e5ef5f8931f495c1d541ad90a841e2b6231565547160
-size 2687042

gwenhywfar-5.10.1.tar.gz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEQkAK9esqF/Cmm7VR6YmdeEqXdBYFAmL0GoYACgkQ6YmdeEqX
-dBae5Qf+JwF2AiPECt7vR4V8iA5/SMSSWGNk/sdJJuuZS162OjG+XXANH8LwbB+Y
-Esenj65u8LogNeSMksJvyBd1RqcDZDgA1S1h1VkdGhppI/771n8TX4OKqQkv39rw
-XezPWvJaU965LycsCBZmOqY4NLXh/vKWMmqJlegqEJpLT71gHeIUgvFgPPVzosFw
-Q8Wmr/IQjroADpk5O0lh58jonXHdQeR7qxAWdIktU6FcIrPKEYE+uZQttSf3QsXI
-9JyIKo3jHke7yiigZOchXFknqBhHylS3/4pD5VJ8zFlh6rHN9IBLencPl76T+Giw
-CgJnVrQBIcA0vr6NClmSrwy6mRfsQA==
-=jdwi
------END PGP SIGNATURE-----

gwenhywfar-5.12.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d188448b9c3a9709721422ee0134b9d0b7790ab7514058d99e04399e39465dda
+size 2734237

gwenhywfar-5.12.1.tar.gz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEQkAK9esqF/Cmm7VR6YmdeEqXdBYFAmhquCYACgkQ6YmdeEqX
+dBYoBwgAkO7Icdk6F4CDTYDSdRPaOkdTgHq333bG4+PvB/v87NH3MEHZZzy7BNVo
+TCSo1qHALBrh6RqkVHzbe0aq5WXTkNxao3RNK3pRLIxXokYEtuizhu6wgJfzRBaP
+xPPLpF4XtER2OOdxvAfEXvV6TRiEEWdV2rUtQjsVpPcgtgLnqYDCp7wVXVkmDbCl
+wPKw0BUn+fjPiJOkJtgckAu3VzMXfqhL+C6LbmgUPymxRSvEFU0RHTgmrXF9peUA
+JFqamJ9CCe6XwW50+2UdRT34k9L2WR6ZNCmKzFWWtZ9kViCtAetgOxfyVXDYqHuq
+Xfkl9wLffo3Gz2CGVyy1fptPNUI8+w==
+=bIs/
+-----END PGP SIGNATURE-----

gwenhywfar-qt6.spec

@@ -0,0 +1,150 @@
+#
+# spec file for package gwenhywfar-qt6
+#
+# Copyright (c) 2025 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define libversion 79
+%define devversion 5
+%define devrelease 5.12
+# Beta does not mean "before release" but a release that is considered as beta:
+%define _version %{version}
+%define _name gwenhywfar
+%define releasenumber 533
+%define checksumreleasenumber 532
+%bcond_without configure
+Name:           gwenhywfar-qt6
+Version:        5.12.1
+Release:        0
+Summary:        Multiplatform helper library for other libraries
+License:        LGPL-2.1-or-later
+URL:            https://www.aquamaniac.de/rdm/projects/gwenhywfar
+Source:         https://www.aquamaniac.de/rdm/attachments/download/%{releasenumber}/%{_name}-%{_version}.tar.gz
+Source1:        https://www.aquamaniac.de/rdm/attachments/download/%{checksumreleasenumber}/%{_name}-%{_version}.tar.gz.asc
+BuildRequires:  fdupes
+%if 0%{?suse_version} < 1600
+BuildRequires:  gcc13
+BuildRequires:  gcc13-PIE
+%endif
+BuildRequires:  pkgconfig
+BuildRequires:  cmake(Qt6Concurrent)
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Network)
+BuildRequires:  cmake(Qt6PrintSupport)
+BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  pkgconfig(gnutls) >= 2.9.8
+BuildRequires:  pkgconfig(gpg-error)
+BuildRequires:  pkgconfig(libgcrypt) >= 1.2.0
+BuildRequires:  pkgconfig(opengl)
+BuildRequires:  pkgconfig(openssl)
+%if %{with configure}
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+%endif
+
+%description
+Gwenhywfar is a base library used to provide OS abstraction functions
+for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes some
+often needed functions (for example, handling and parsing of
+configuration files, reading and writingof XML files, and interprocess
+communication).
+
+%package -n libgwengui-qt6-%{libversion}
+Summary:        Qt6 UI backend for the gwenhywfar multi-platform helper library
+
+%description -n libgwengui-qt6-%{libversion}
+Gwenhywfar is a base library used to provide OS abstraction functions
+for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes
+some often needed functions (for example, for handling and parsing of
+configuration files, reading and writing of XML files, and interprocess
+communication).
+
+This package provides the Qt6 implementation of the generic UI toolkit.
+
+%package devel
+Summary:        Header files for the Gwenhywfar multi-platform helper library
+Requires:       glibc-devel
+Requires:       gwenhywfar-devel = %{version}
+Requires:       libgwengui-qt6-%{libversion} = %{version}
+Requires:       cmake(Qt6Core)
+Requires:       cmake(Qt6Widgets)
+
+%description devel
+Gwenhywfar is a base library used to provide OS abstraction functions
+for Linux, FreeBSD, OpenBSD, NetBSD, and Windows. It also includes
+some often needed functions (e.g. for handling and parsing of
+configuration files, reading/writing of XML files, interprocess
+communication etc).
+
+%lang_package
+
+%prep
+%autosetup -p1 -n %{_name}-%{_version}
+
+%build
+%if 0%{?suse_version} < 1600
+export CC=gcc-13 CXX=g++-13
+%endif
+
+export PATH=%{_qt6_bindir}:$PATH
+
+%if %{with configure}
+autoreconf -ifv
+%endif
+
+# with-guis=qt5 will build with Qt 6
+%configure\
+  --enable-release\
+  --disable-static \
+  --with-guis="qt5" \
+  --with-plugins-ct= \
+  --with-plugins-cfgmgr= \
+  --with-plugins-dbio=
+
+%make_jobs
+
+%install
+%make_install
+
+find %{buildroot} -type f -name "*.la" -delete -print
+
+# Cleanup, we only want Qt 6 related files
+rm -r %{buildroot}%{_bindir}
+rm -r %{buildroot}%{_datadir}
+# Headers are identical for both Qt 5 and 6 and we can't have 'Conflicts'
+rm -r %{buildroot}%{_includedir}
+rm -r %{buildroot}%{_libdir}/cmake/{gwengui-cpp,gwenhywfar}*
+rm %{buildroot}%{_libdir}/{libgwengui-cpp,libgwenhywfar}.*
+rm %{buildroot}%{_libdir}/pkgconfig/gwenhywfar.pc
+
+%fdupes %{buildroot}%{_libdir}/cmake
+
+%ldconfig_scriptlets -n libgwengui-qt6-%{libversion}
+
+%files -n libgwengui-qt6-%{libversion}
+%license COPYING
+%{_libdir}/libgwengui-qt6.so.*
+
+%files devel
+%{_libdir}/libgwengui-qt6.so
+%{_libdir}/pkgconfig/gwengui-qt6.pc
+%dir %{_libdir}/cmake
+%{_libdir}/cmake/gwengui-qt6-%{devrelease}
+
+%changelog

gwenhywfar.changes

@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Tue Aug  5 12:16:42 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 5.12.1
+  * Remove double declaration of HtmlObject_Grid_new
+  * added GWEN_Timestamp_GetWeekDay()
+  * tag16: added some tag read/write functions
+  * inetsocket: added flags (for raw dumping)
+  * Support building for Qt6
+- Drop patches, merged upstream:
+  * gwenhywfar-gcc15.patch
+  * 0001-Fix-name-of-output-variable.patch
+  * 0002-Support-building-for-Qt6.patch
+  * 0003-Adjusted-expression-to-work-correclty-using-Qt5-and-.patch
+  * 0004-Add-missing-files-to-AC_CONFIG_FILES.patch
+  * 0005-Prevent-configuration-for-Qt5-and-Qt6-at-the-same-ti.patch
+  * 0006-Improve-configuration-on-systems-with-Qt5-and-Qt6-in.patch
+  * 0007-Remove-debug-output.patch
+
+-------------------------------------------------------------------
+Tue Jun 24 22:33:43 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add patches for Qt 6 support:
+  * 0001-Fix-name-of-output-variable.patch
+  * 0002-Support-building-for-Qt6.patch
+  * 0003-Adjusted-expression-to-work-correclty-using-Qt5-and-.patch
+  * 0004-Add-missing-files-to-AC_CONFIG_FILES.patch
+  * 0005-Prevent-configuration-for-Qt5-and-Qt6-at-the-same-ti.patch
+  * 0006-Improve-configuration-on-systems-with-Qt5-and-Qt6-in.patch
+  * 0007-Remove-debug-output.patch
+- Spec cleanup
+
+-------------------------------------------------------------------
+Tue Jun 24 11:57:06 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add patch:
+  * gwenhywfar-gcc15.patch
+
+-------------------------------------------------------------------
+Thu Jan 23 11:17:50 UTC 2025 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Add missing runtime dependency for libgwengui-cpp to
+  the development package
+
+-------------------------------------------------------------------
+Wed Jan  1 18:41:47 UTC 2025 - Nico Kruber <nico.kruber@gmail.com>
+
+- Update to 5.12.0
+  + Add GWEN_MSG convenience functions
+  + Use pkgconf for gpg-error build flags
+  + Bugfixes
+
+-------------------------------------------------------------------
+Sun Nov 24 12:48:48 UTC 2024 - Nico Kruber <nico.kruber@gmail.com>
+
+- Update to 5.11.2 (beta)
+- Changelog for 5.11.0 (beta)
+  + first version with support for HKTAN#7 and first implementation
+    of "Decoupled TAN" for app-based TAN input
+
 -------------------------------------------------------------------
 Tue Oct 18 02:39:09 UTC 2022 - Jason Sikes <jsikes@suse.com>
 

gwenhywfar.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gwenhywfar
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,29 +18,28 @@
 
 %define libversion 79
 %define devversion 5
-%define devrelease 5.10
+%define devrelease 5.12
 # Beta does not mean "before release" but a release that is considered as beta:
 %define _version %{version}
 %define _name gwenhywfar
-%define releasenumber 465
+%define releasenumber 533
-%define checksumreleasenumber 464
+%define checksumreleasenumber 532
-%bcond_with configure
+%bcond_without configure
 Name:           gwenhywfar
-Version:        5.10.1
+Version:        5.12.1
 Release:        0
 Summary:        Multiplatform helper library for other libraries
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Group:          System/Libraries
 URL:            https://www.aquamaniac.de/rdm/projects/gwenhywfar
 Source:         https://www.aquamaniac.de/rdm/attachments/download/%{releasenumber}/%{_name}-%{_version}.tar.gz
 Source1:        https://www.aquamaniac.de/rdm/attachments/download/%{checksumreleasenumber}/%{_name}-%{_version}.tar.gz.asc
 BuildRequires:  doxygen
 BuildRequires:  fdupes
+# graphviz wants a URW font
+BuildRequires:  ghostscript-fonts-std-converted
 # For doc graphs
 BuildRequires:  graphviz
 BuildRequires:  graphviz-gd
-BuildRequires:  libgcrypt-devel >= 1.2.0
-BuildRequires:  libopenssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  xorg-x11-fonts
 BuildRequires:  cmake(Qt5Concurrent)
@@ -53,13 +52,17 @@ BuildRequires:  cmake(Qt5OpenGL)
 BuildRequires:  cmake(Qt5PrintSupport)
 BuildRequires:  cmake(Qt5Sql)
 BuildRequires:  cmake(Qt5Test)
-BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  pkgconfig(gnutls) >= 2.9.8
+BuildRequires:  pkgconfig(gpg-error)
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.17.5
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14.0
+BuildRequires:  pkgconfig(libgcrypt) >= 1.2.0
+BuildRequires:  pkgconfig(opengl)
+BuildRequires:  pkgconfig(openssl)
 Recommends:     libgwenhywfar%{libversion}
-%if !%{with configure}
+%if %{with configure}
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -80,7 +83,6 @@ communication).
 %package tools
 Summary:        Tools for the gwenhywfar multi-platform helper library
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Group:          System/Libraries
 Requires:       libgwenhywfar%{libversion} = %{version}
 
 %description tools
@@ -93,7 +95,6 @@ communication).
 %package -n libgwenhywfar%{libversion}-plugins
 Summary:        Plugins for the gwenhywfar multi-platform helper library
 License:        LGPL-2.1-or-later
-Group:          System/Libraries
 Requires:       %{name} = %{version}
 
 %description -n libgwenhywfar%{libversion}-plugins
@@ -106,7 +107,6 @@ communication).
 %package -n libgwenhywfar%{libversion}
 Summary:        Multiplatform Helper Library for Other Libraries
 License:        LGPL-2.1-or-later
-Group:          System/Libraries
 Recommends:     %{name}-lang
 Recommends:     libgwenhywfar%{libversion}-plugins = %{version}
 
@@ -120,7 +120,6 @@ communication).
 %package -n libgwengui-cpp%{libversion}
 Summary:        C++ interface for Gwenhywfar
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Group:          System/Libraries
 
 %description -n libgwengui-cpp%{libversion}
 This package contains the C++ GUI interface for Gwenhywfar.
@@ -128,7 +127,6 @@ This package contains the C++ GUI interface for Gwenhywfar.
 %package -n libgwengui-gtk2-%{libversion}
 Summary:        GTK+ 2 UI backend for Gwenhywfar
 License:        LGPL-2.1-or-later
-Group:          System/Libraries
 
 %description -n libgwengui-gtk2-%{libversion}
 Gwenhywfar is a base library used to provide OS abstraction functions
@@ -142,7 +140,6 @@ This package provides the GTK+ 2 implementation of the generic UI toolkit.
 %package -n libgwengui-gtk3-%{libversion}
 Summary:        GTK+ 3 UI backend for Gwenhywfar
 License:        LGPL-2.1-or-later
-Group:          System/Libraries
 
 %description -n libgwengui-gtk3-%{libversion}
 Gwenhywfar is a base library used to provide OS abstraction functions
@@ -156,7 +153,6 @@ This package provides the GTK+ 3 implementation of the generic UI toolkit.
 %package -n libgwengui-qt5-%{libversion}
 Summary:        Qt5 UI backend for the gwenhywfar multi-platform helper library
 License:        LGPL-2.1-or-later
-Group:          System/Libraries
 Provides:       libgwengui-qt4-0 = %{version}
 Obsoletes:      libgwengui-qt4-0 < %{version}
 
@@ -172,7 +168,6 @@ This package provides the Qt5 implementation of the generic UI toolkit.
 %package -n libgwengui-fox16-%{libversion}
 Summary:        FOX interface for Gwenhywfar
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Group:          System/Libraries
 
 %description -n libgwengui-fox16-%{libversion}
 This package contains the interface to the FOX toolkit
@@ -181,8 +176,8 @@ for Gwenhywfar.
 %package devel
 Summary:        Header files for the Gwenhywfar multi-platform helper library
 License:        LGPL-2.1-or-later
-Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
+Requires:       libgwengui-cpp%{libversion} >= %{version}
 Requires:       libgwengui-fox16-%{libversion} >= %{version}
 Requires:       libgwengui-gtk2-%{libversion} >= %{version}
 Requires:       libgwengui-gtk3-%{libversion} >= %{version}
@@ -199,7 +194,6 @@ communication etc).
 %package gwenbuild
 Summary:        Specific build system for the aqbanking universe
 License:        LGPL-2.1-or-later
-Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
 
 %description gwenbuild
@@ -209,23 +203,25 @@ aqbanking universe.
 %lang_package
 
 %prep
-%setup -q -n %{_name}-%{_version}
+%autosetup -p1 -n %{_name}-%{_version}
 
 %build
+# Fix warnings
+doxygen -u Doxyfile.in
+
 export PATH=%{_libqt5_bindir}:$PATH
-# quick fix for $CPP being unset and configure failing to handle include dirs properly
+
-CPP=`which cpp`
+%if %{with configure}
-export CPP
-%if !%{with configure}
 autoreconf -ifv
 %endif
 %configure\
-	--enable-release\
+  --enable-release\
-	--enable-full-doc\
+  --enable-full-doc\
-	--with-docpath=%{_docdir}/%{name}/api \
+  --with-docpath=%{_docdir}/%{name}/api \
-	--disable-static \
+  --disable-static \
-	--with-guis="fox16 qt5 gtk2 gtk3" \
+  --with-guis="fox16 qt5 gtk2 gtk3" \
-	--with-plugins-cfgmgr=all
+  --with-plugins-cfgmgr=all
+
 %make_jobs
 %make_build srcdoc
 
@@ -239,24 +235,21 @@ pushd %{buildroot}%{_docdir}/%{name}/api
     # remove empty files
     `find -maxdepth 1 -type f -empty -print0 | xargs -0 echo rm -f`
 popd
+
 find %{buildroot} -type f -name "*.la" -delete -print
+
 %find_lang %{_name}
+
 %fdupes %{buildroot}%{_datadir}/%{_name}/apidoc
 %fdupes %{buildroot}%{_libdir}/cmake
 %fdupes %{buildroot}%{_docdir}
 
-%post   -n libgwenhywfar%{libversion} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgwenhywfar%{libversion}
-%postun -n libgwenhywfar%{libversion} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgwengui-cpp%{libversion}
-%post   -n libgwengui-cpp%{libversion} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgwengui-gtk2-%{libversion}
-%postun -n libgwengui-cpp%{libversion} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgwengui-gtk3-%{libversion}
-%post   -n libgwengui-gtk2-%{libversion} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgwengui-qt5-%{libversion}
-%postun -n libgwengui-gtk2-%{libversion} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgwengui-fox16-%{libversion}
-%post   -n libgwengui-gtk3-%{libversion} -p /sbin/ldconfig
-%postun -n libgwengui-gtk3-%{libversion} -p /sbin/ldconfig
-%post -n libgwengui-qt5-%{libversion} -p /sbin/ldconfig
-%postun -n libgwengui-qt5-%{libversion} -p /sbin/ldconfig
-%post -n libgwengui-fox16-%{libversion} -p /sbin/ldconfig
-%postun -n libgwengui-fox16-%{libversion} -p /sbin/ldconfig
 
 %files
 %license COPYING