From dc491a827590ff5e3fb56ce33a5691473f8e4efd Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 23 Mar 2026 15:07:34 +0100 Subject: [PATCH] gwenhywfar, bump to version 5.14.1 (#13858) --- ...5.12.2.recipe => gwenhywfar-5.14.1.recipe} | 68 ++++++++++++++----- ....2.patchset => gwenhywfar-5.14.1.patchset} | 30 ++++++-- 2 files changed, 78 insertions(+), 20 deletions(-) rename net-libs/gwenhywfar/{gwenhywfar-5.12.2.recipe => gwenhywfar-5.14.1.recipe} (75%) rename net-libs/gwenhywfar/patches/{gwenhywfar-5.12.2.patchset => gwenhywfar-5.14.1.patchset} (73%) diff --git a/net-libs/gwenhywfar/gwenhywfar-5.12.2.recipe b/net-libs/gwenhywfar/gwenhywfar-5.14.1.recipe similarity index 75% rename from net-libs/gwenhywfar/gwenhywfar-5.12.2.recipe rename to net-libs/gwenhywfar/gwenhywfar-5.14.1.recipe index 8a1bc09dd..0652c255d 100644 --- a/net-libs/gwenhywfar/gwenhywfar-5.12.2.recipe +++ b/net-libs/gwenhywfar/gwenhywfar-5.14.1.recipe @@ -5,7 +5,7 @@ COPYRIGHT="Martin Preuss" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://github.com/aqbanking/gwenhywfar/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="64e044f41a4ea59d3c5a7afe77ed8fed3ee850277f9310183bb5fcb0b2329633" +CHECKSUM_SHA256="d52937b56e0760d11dc200ad5fb2cfd9d8bf147d0b1b97451f23f31c6ee641a2" PATCHES="gwenhywfar-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -18,21 +18,48 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion="79.12.2" +libVersion="79.14.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" gwenhywfar$secondaryArchSuffix = $portVersion lib:libgwengui_cpp$secondaryArchSuffix = $libVersionCompat - lib:libgwengui_gtk3$secondaryArchSuffix = $libVersionCompat lib:libgwenhywfar$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + lib:libgcrypt$secondaryArchSuffix + lib:libgnutls$secondaryArchSuffix + lib:libgpg_error$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + " + +PROVIDES_devel=" + gwenhywfar${secondaryArchSuffix}_devel = $portVersion + cmd:gwenhywfar_config$commandSuffix + devel:libgwengui_cpp$secondaryArchSuffix = $libVersionCompat + devel:libgwenhywfar$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + gwenhywfar$secondaryArchSuffix == $portVersion base + devel:libgcrypt$secondaryArchSuffix + devel:libgnutls$secondaryArchSuffix + devel:libgtk_3$secondaryArchSuffix + " + +PROVIDES_gtk3=" + gwenhywfar${secondaryArchSuffix}_gtk3 = $portVersion + lib:libgwengui_gtk3$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_gtk3=" + haiku$secondaryArchSuffix + gwenhywfar$secondaryArchSuffix == $portVersion base lib:libatk_1.0$secondaryArchSuffix lib:libcairo$secondaryArchSuffix lib:libcairo_gobject$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix + lib:libgdk_3$secondaryArchSuffix lib:libgdk_pixbuf_2.0$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix @@ -44,21 +71,16 @@ REQUIRES=" lib:libpango_1.0$secondaryArchSuffix lib:libpangocairo_1.0$secondaryArchSuffix " - -PROVIDES_devel=" - gwenhywfar${secondaryArchSuffix}_devel = $portVersion - cmd:gwenhywfar_config$commandSuffix - devel:libgwengui_cpp$secondaryArchSuffix = $libVersionCompat +PROVIDES_gtk3_devel=" + gwenhywfar${secondaryArchSuffix}_gtk3_devel = $portVersion devel:libgwengui_gtk3$secondaryArchSuffix = $libVersionCompat - devel:libgwenhywfar$secondaryArchSuffix = $libVersionCompat " -REQUIRES_devel=" - gwenhywfar$secondaryArchSuffix == $portVersion base - devel:libgcrypt$secondaryArchSuffix - devel:libgnutls$secondaryArchSuffix - devel:libgtk_3$secondaryArchSuffix +REQUIRES_gtk3_devel=" + gwenhywfar${secondaryArchSuffix}_gtk3 + gwenhywfar${secondaryArchSuffix}_devel " + SUMMARY_tools="Command line utilities for gwenhywfar" PROVIDES_tools=" gwenhywfar${secondaryArchSuffix}_tools = $portVersion @@ -85,19 +107,23 @@ BUILD_REQUIRES=" devel:libgcrypt$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix devel:libgtk_3$secondaryArchSuffix - " + devel:libgettextlib$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + " BUILD_PREREQUIRES=" cmd:autoreconf cmd:gcc$secondaryArchSuffix cmd:gettext$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " BUILD() { - autoreconf -if + autoreconf -fi runConfigure --omit-dirs "binDir" ./configure \ --bindir=$commandBinDir \ --with-guis=gtk3 \ @@ -118,6 +144,16 @@ INSTALL() fixPkgconfig + # gtk3 package + packageEntries gtk3 \ + $libDir/libgwengui-gtk3.so.79* + + # gtk3_devel package + packageEntries gtk3_devel \ + $developLibDir/libgwengui-gtk3.* \ + $developLibDir/pkgconfig/gwengui-gtk3.pc \ + $includeDir/gwenhywfar5/gwen-gui-gtk3 + # devel package packageEntries devel \ $developDir \ diff --git a/net-libs/gwenhywfar/patches/gwenhywfar-5.12.2.patchset b/net-libs/gwenhywfar/patches/gwenhywfar-5.14.1.patchset similarity index 73% rename from net-libs/gwenhywfar/patches/gwenhywfar-5.12.2.patchset rename to net-libs/gwenhywfar/patches/gwenhywfar-5.14.1.patchset index 30e17120c..6775ea238 100644 --- a/net-libs/gwenhywfar/patches/gwenhywfar-5.12.2.patchset +++ b/net-libs/gwenhywfar/patches/gwenhywfar-5.14.1.patchset @@ -1,4 +1,4 @@ -From 320c3a16a778d19ae65758f28a5fd265d791b941 Mon Sep 17 00:00:00 2001 +From d255470b67f1b93132635d0abd7fd4dcedd15ef2 Mon Sep 17 00:00:00 2001 From: Javier Steinaker Date: Thu, 7 Nov 2024 12:07:29 -0300 Subject: Test http, https and TLS against a working domain @@ -44,10 +44,10 @@ index 6ee1dab..cfe4e4f 100644 baseLayer=sio; -- -2.50.1 +2.52.0 -From cb6691dad7ff061d10dcc8e8a78f6c9ce38f5d20 Mon Sep 17 00:00:00 2001 +From ab7e78fb91208111161cfcfb5b3f8c685b227bdc Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Tue, 30 Sep 2025 13:42:08 +0200 Subject: Include endian.h for Haiku also (fixes build) @@ -67,5 +67,27 @@ index d9a9f7b..3df897d 100644 # include -- -2.50.1 +2.52.0 + + +From 2efbe2ab6a7239194d479c3a788dcdf1848b31ef Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Tue, 24 Feb 2026 16:30:18 +0100 +Subject: fix build for: error: possibly undefined macro: AM_GNU_GETTEXT + + +diff --git a/configure.ac b/configure.ac +index 94d8b8a..59cec09 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -776,6 +776,7 @@ AM_CONDITIONAL(IF_MAKE_I18N_FILES, [test "$MAKE_I18N_FILES" = "yes"]) + + + AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION(0.24.1) + i18n_libs="$LTLIBINTL" + all_libraries="${all_libraries} $LTLIBINTL" + HAVE_I18N="$USE_NLS" +-- +2.52.0