From 9e513c58d8c7c07cf7283078ed0a7df26f00ec5a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 14 Sep 2018 11:39:51 -0300 Subject: [PATCH] gwenhywfar: update to 4.20.1. --- common/shlibs | 1 - srcpkgs/gwenhywfar-qt | 1 - srcpkgs/gwenhywfar/template | 37 +++++++++++++++---------------------- 3 files changed, 15 insertions(+), 24 deletions(-) delete mode 120000 srcpkgs/gwenhywfar-qt diff --git a/common/shlibs b/common/shlibs index b288ae98104..be6acaed7db 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1514,7 +1514,6 @@ libgwenhywfar.so.60 gwenhywfar-4.10.0beta_1 libgwengui-gtk2.so.0 gwenhywfar-gtk-4.10.0beta_1 libgwengui-gtk3.so.0 gwenhywfar-gtk3-4.20.0_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 diff --git a/srcpkgs/gwenhywfar-qt b/srcpkgs/gwenhywfar-qt deleted file mode 120000 index b046bf7ff97..00000000000 --- a/srcpkgs/gwenhywfar-qt +++ /dev/null @@ -1 +0,0 @@ -gwenhywfar \ No newline at end of file diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template index eae041985f8..86b0ca36b59 100644 --- a/srcpkgs/gwenhywfar/template +++ b/srcpkgs/gwenhywfar/template @@ -1,31 +1,28 @@ # Template file for 'gwenhywfar' pkgname=gwenhywfar -version=4.20.0 -revision=3 -_dnrel=208 +version=4.20.1 +revision=1 hostmakedepends="automake pkg-config libgcrypt-devel libtool" -makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt-devel qt5-devel - gtk+3-devel" -build_style="gnu-configure" +makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt5-devel gtk+3-devel" +build_style=gnu-configure 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-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-2.1" -homepage="http://www.aquamaniac.de" short_desc="OS abstraction functions for various projects" -distfiles="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=02&dummy=gwenhywfar-$version.tar.gz" -checksum=5a88daabba1388f9528590aab5de527a12dd44a7da4572ce48469a29911b0fb0 +homepage="https://github.com/aqbanking/gwenhywfar" +distfiles="https://github.com/aqbanking/gwenhywfar/archive/${version}.tar.gz" +checksum=efc4b9dcb51981e7c56e22ac6054ace396c3387667b134128d4e9fcad50544b8 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel qt5-host-tools qt5-devel" +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-devel" fi pre_configure() { # Build all GUIs - sed -i configure.ac -e's;"qt4 gtk2";"qt4 qt5 gtk2 gtk3";' + sed -i configure.ac -e's;"qt4 gtk2";"qt5 gtk2 gtk3";' autoreconf -fi } @@ -43,13 +40,6 @@ gwenhywfar-gtk3_package() { } } -gwenhywfar-qt_package() { - short_desc+=" - qt4 bindings" - pkg_install() { - vmove usr/lib/*-qt4* - } -} - gwenhywfar-qt5_package() { short_desc+=" - qt5 bindings" pkg_install() { @@ -62,6 +52,9 @@ gwenhywfar-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/bin/gwenhywfar-config + vmove usr/share/aclocal + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.so" }