gwenhywfar: update to 5.12.1.

This commit is contained in:
Helmut Pozimski 2025-08-05 20:04:28 +02:00
parent 7b5a823f7c
commit 5032b1eef0
2 changed files with 14 additions and 15 deletions

View file

@ -2,29 +2,28 @@ 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"]
@@ -76,6 +76,12 @@
[]
)
+
+ 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 ."`
am_have_qt_qmexe_suff=`echo $QMAKE | sed 's,^.*qmake,,'`
@@ -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
- $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
+ $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
+ $QMAKE $am_have_qt_pro -o $am_have_qt_makefile -qtconf $QT_CONFIGURATION
+ fi
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`

View file

@ -1,19 +1,19 @@
# Template file for 'gwenhywfar'
pkgname=gwenhywfar
version=5.10.2
revision=2
version=5.12.1
revision=1
build_style=gnu-configure
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
gettext-devel"
gettext-devel qt5-tools"
makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt5-devel gtk+3-devel"
short_desc="OS abstraction functions for various projects"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/aqbanking/gwenhywfar"
distfiles="https://github.com/aqbanking/gwenhywfar/archive/refs/tags/${version}.tar.gz"
checksum=2b0b9dd49b95f025f4e0c0346ba88e20b893407c444fccf6403a4da349954f04
checksum=5cf3f70ff30040f1856545a2cfb101786035a57035db294f4886a832f3c0c925
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"