From fe75379f17242d2f3eb3561d54712f84412afd36 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 31 Jul 2023 16:53:00 -0400 Subject: [PATCH] gwenhywfar: update to 5.10.2, remove -gtk gwenhywfar-gtk: remove package, GTK2 no longer supported --- common/shlibs | 1 - srcpkgs/gwenhywfar-gtk | 1 - srcpkgs/gwenhywfar/patches/qt5-cross.patch | 25 ++++---- srcpkgs/gwenhywfar/template | 74 ++++++++++------------ srcpkgs/removed-packages/template | 1 + 5 files changed, 48 insertions(+), 54 deletions(-) delete mode 120000 srcpkgs/gwenhywfar-gtk diff --git a/common/shlibs b/common/shlibs index a521ea1b66ae1..f1397a98e423b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1548,7 +1548,6 @@ libslang.so.2 slang-2.2.4_1 libtre.so.5 tre-0.8.0_1 libktoblzcheck.so.1 ktoblzcheck-1.43_2 libgwenhywfar.so.79 gwenhywfar-5.4.0_2 -libgwengui-gtk2.so.79 gwenhywfar-gtk-5.4.0_2 libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.4.0_2 libgwengui-cpp.so.79 gwenhywfar-5.4.0_2 libgwengui-qt5.so.79 gwenhywfar-qt5-5.4.0_2 diff --git a/srcpkgs/gwenhywfar-gtk b/srcpkgs/gwenhywfar-gtk deleted file mode 120000 index b046bf7ff97c8..0000000000000 --- a/srcpkgs/gwenhywfar-gtk +++ /dev/null @@ -1 +0,0 @@ -gwenhywfar \ No newline at end of file diff --git a/srcpkgs/gwenhywfar/patches/qt5-cross.patch b/srcpkgs/gwenhywfar/patches/qt5-cross.patch index 3488200908f1e..b7c53311b0fa8 100644 --- a/srcpkgs/gwenhywfar/patches/qt5-cross.patch +++ b/srcpkgs/gwenhywfar/patches/qt5-cross.patch @@ -1,28 +1,31 @@ ---- a/m4/ax_have_qt.m4 2020-01-16 19:40:22.927813462 +0100 -+++ b/m4/ax_have_qt.m4 2020-01-16 19:42:12.106436543 +0100 -@@ -74,6 +74,12 @@ +diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4 +index f035a81852..b43f8c2387 100644 +--- a/m4/ax_have_qt.m4 ++++ b/m4/ax_have_qt.m4 +@@ -74,6 +74,13 @@ AC_DEFUN([AX_HAVE_QT], + [QT_QMAKE="$withval"], [QT_QMAKE="qmake"] ) - ++ + AC_ARG_WITH(qt5-config, + [ --with-qt5-config=FILE uses given qt configuration], -+ [QT_CONFIGURATION="$withval"], ++ [QT_CONFIGURATION="$withval"], + [QT_CONFIGURATION=""] + ) -+ ++ AC_MSG_CHECKING(for Qt) # If we have Qt5 or later in the path, we're golden ver=`$QT_QMAKE --version | grep -o "Qt version ."` -@@ -122,7 +128,11 @@ +@@ -96,7 +103,11 @@ percent.target = % percent.commands = @echo -n "\$(\$(@))\ " QMAKE_EXTRA_TARGETS += percent EOF - $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile + if test -z $QT_CONFIGURATION; then -+ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile ++ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile + else -+ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile -qtconf $QT_CONFIGURATION ++ $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile -qtconf $QT_CONFIGURATION + fi - QT_CXXFLAGS=`make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` - QT_LIBS=`make -s -f $am_have_qt_makefile LIBS` + QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` + QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS` rm $am_have_qt_pro $am_have_qt_makefile diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template index c6e01f4bea860..e6fdfa7a1aea6 100644 --- a/srcpkgs/gwenhywfar/template +++ b/srcpkgs/gwenhywfar/template @@ -1,18 +1,19 @@ # Template file for 'gwenhywfar' pkgname=gwenhywfar -version=5.6.0 +version=5.10.2 revision=1 build_style=gnu-configure -configure_args="--disable-binreloc +configure_args="--disable-binreloc --disable-network-checks --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic" -hostmakedepends="automake pkg-config libgcrypt-devel libtool which" +hostmakedepends="automake pkg-config libgcrypt-devel libtool which + gettext-devel" makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt5-devel gtk+3-devel" short_desc="OS abstraction functions for various projects" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://github.com/aqbanking/gwenhywfar" -distfiles="https://github.com/aqbanking/gwenhywfar/archive/${version}.tar.gz" -checksum=9f2876770824a283d02fd730bb1f7a98970fa6f20121f4af433d6698831c3a84 +distfiles="https://github.com/aqbanking/gwenhywfar/archive/refs/tags/${version}.tar.gz" +checksum=2b0b9dd49b95f025f4e0c0346ba88e20b893407c444fccf6403a4da349954f04 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" @@ -20,44 +21,35 @@ fi pre_configure() { export QT_SELECT=5 - # Build all GUIs - vsed -i configure.ac -e's;"qt4 gtk2";"qt5 gtk2 gtk3";' autoreconf -fi if [ "$CROSS_BUILD" ]; then - cat > "${wrksrc}/qt.conf" <<_EOF -[Paths] -Sysroot=${XBPS_CROSS_BASE} -Prefix=${XBPS_CROSS_BASE}/usr -ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5 -Data=${XBPS_CROSS_BASE}/usr/share/qt5 -Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5 -Headers=${XBPS_CROSS_BASE}/usr/include/qt5 -Libraries=${XBPS_CROSS_BASE}/usr/lib -LibraryExecutables=/usr/lib/qt5/libexec -Binaries=/usr/lib/qt5/bin -Tests=${XBPS_CROSS_BASE}/usr/tests -Plugins=/usr/lib/qt5/plugins -Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports -Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml -Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations -Settings=${XBPS_CROSS_BASE}/etc/xdg -Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples -HostPrefix=/usr -HostData=/usr/lib/qt5 -HostBinaries=/usr/lib/qt5/bin -HostLibraries=/usr/lib -Spec=linux-g++ -TargetSpec=linux-g++ -_EOF - configure_args+=" --with-qt5-config=${wrksrc}/qt.conf" - fi -} - -gwenhywfar-gtk_package() { - short_desc+=" - gtk+2 bindings" - pkg_install() { - vmove usr/lib/*-gtk2* - } + cat > "${wrksrc}/qt.conf" <<- _EOF + [Paths] + Sysroot=${XBPS_CROSS_BASE} + Prefix=${XBPS_CROSS_BASE}/usr + ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5 + Data=${XBPS_CROSS_BASE}/usr/share/qt5 + Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5 + Headers=${XBPS_CROSS_BASE}/usr/include/qt5 + Libraries=${XBPS_CROSS_BASE}/usr/lib + LibraryExecutables=/usr/lib/qt5/libexec + Binaries=/usr/lib/qt5/bin + Tests=${XBPS_CROSS_BASE}/usr/tests + Plugins=/usr/lib/qt5/plugins + Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports + Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml + Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations + Settings=${XBPS_CROSS_BASE}/etc/xdg + Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples + HostPrefix=/usr + HostData=/usr/lib/qt5 + HostBinaries=/usr/lib/qt5/bin + HostLibraries=/usr/lib + Spec=linux-g++ + TargetSpec=linux-g++ + _EOF + configure_args+=" --with-qt5-config=${wrksrc}/qt.conf" + fi } gwenhywfar-gtk3_package() { diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 5b0e0047ee3e6..711569bc6f134 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -166,6 +166,7 @@ replaces=" gtkhtml<=4.10.0_1 guile1.8-devel<=1.8.8_3 guile1.8<=1.8.8_3 + gwenhywfar-gtk<=5.6.0_1 gx-go<=1.9.0_1 gx<=0.14.3_1 hangups<=0.4.18_2