From 3291670bed83ca4a6d484eac0c5b6f87db0704b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 15 Jan 2017 12:03:45 +0100 Subject: [PATCH] gwenhywfar: fix cross for qt4 and qt5 Enable Qt4 and Qt5 bindings for all target architectures. --- common/shlibs | 1 + srcpkgs/gwenhywfar-qt5 | 1 + srcpkgs/gwenhywfar/template | 42 ++++++++++++++++++++++++------------- 3 files changed, 29 insertions(+), 15 deletions(-) create mode 120000 srcpkgs/gwenhywfar-qt5 diff --git a/common/shlibs b/common/shlibs index ba2643a663d..23081e1c596 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1504,6 +1504,7 @@ libgwenhywfar.so.60 gwenhywfar-4.10.0beta_1 libgwengui-gtk2.so.0 gwenhywfar-gtk-4.10.0beta_1 libgwengui-cpp.so.0 gwenhywfar-4.10.0beta_1 libgwengui-qt4.so.0 gwenhywfar-qt-4.15.3_2 +libgwengui-qt5.so.0 gwenhywfar-qt5-4.15.3_3 libaqbanking.so.35 aqbanking-5.6.10_1 libaqnone.so.35 aqbanking-5.6.10_1 libaqhbci.so.23 aqbanking-5.6.11_1 diff --git a/srcpkgs/gwenhywfar-qt5 b/srcpkgs/gwenhywfar-qt5 new file mode 120000 index 00000000000..b046bf7ff97 --- /dev/null +++ b/srcpkgs/gwenhywfar-qt5 @@ -0,0 +1 @@ +gwenhywfar \ No newline at end of file diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template index a287d8f4a46..b37953347f0 100644 --- a/srcpkgs/gwenhywfar/template +++ b/srcpkgs/gwenhywfar/template @@ -1,12 +1,16 @@ # Template file for 'gwenhywfar' pkgname=gwenhywfar version=4.15.3 -revision=2 +revision=3 _dnrel=201 hostmakedepends="automake pkg-config libgcrypt-devel libtool" -makedepends="libgcrypt-devel gnutls-devel gtk+-devel" +makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt-devel qt5-devel" build_style="gnu-configure" -configure_args="--enable-visibility --disable-binreloc" +configure_args="--enable-visibility --disable-binreloc + --with-qt4-includes=${XBPS_CROSS_BASE}/usr/include --with-qt4-libs=${XBPS_CROSS_BASE}/usr/lib + --with-qt4-moc=/usr/lib/qt/bin/moc --with-qt4-uic=/usr/lib/qt/bin/uic + --with-qt5-includes=${XBPS_CROSS_BASE}/usr/include --with-qt5-libs=${XBPS_CROSS_BASE}/usr/lib + --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic" maintainer="Enno Boland " license="LGPL" homepage="http://www.aquamaniac.de" @@ -14,22 +18,16 @@ short_desc="OS abstraction functions for various projects" distfiles="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$version.tar.gz" checksum=6a0e8787c99620414da6140e567c616b55856c5edf8825a9ebc67431923ee63a +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt-host-tools qt-devel qt5-host-tools qt5-devel" +fi + pre_configure() { + # Build all GUIs + sed -i configure.ac -e's;"qt4 gtk2";"qt4 qt5 gtk2";' autoreconf -fi } -if [ -z "$CROSS_BUILD" ]; then - makedepends+=" qt-devel" - gwenhywfar-qt_package() { - short_desc+=" - qt4 bindings" - pkg_install() { - vmove usr/lib/*-qt4* - } - } -else - configure_args+=" --with-guis=gtk2" -fi - gwenhywfar-gtk_package() { short_desc+=" - gtk+2 bindings" pkg_install() { @@ -37,6 +35,20 @@ gwenhywfar-gtk_package() { } } +gwenhywfar-qt_package() { + short_desc+=" - qt4 bindings" + pkg_install() { + vmove usr/lib/*-qt4* + } +} + +gwenhywfar-qt5_package() { + short_desc+=" - qt5 bindings" + pkg_install() { + vmove usr/lib/*-qt5* + } +} + gwenhywfar-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"