jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gwenhywfar: fix cross for qt4 and qt5

Browse source 
Enable Qt4 and Qt5 bindings for all target architectures.
This commit is contained in:
Jürgen Buchmüller 2017-01-15 12:03:45 +01:00
parent 2a4a269899
commit 3291670bed
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/shlibs
View file

@ -1504,6 +1504,7 @@ libgwenhywfar.so.60 gwenhywfar-4.10.0beta_1
libgwengui-gtk2.so.0 gwenhywfar-gtk-4.10.0beta_1 libgwengui-gtk2.so.0 gwenhywfar-gtk-4.10.0beta_1
libgwengui-cpp.so.0 gwenhywfar-4.10.0beta_1 libgwengui-cpp.so.0 gwenhywfar-4.10.0beta_1
libgwengui-qt4.so.0 gwenhywfar-qt-4.15.3_2 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 libaqbanking.so.35 aqbanking-5.6.10_1
libaqnone.so.35 aqbanking-5.6.10_1 libaqnone.so.35 aqbanking-5.6.10_1
libaqhbci.so.23 aqbanking-5.6.11_1 libaqhbci.so.23 aqbanking-5.6.11_1

1
srcpkgs/gwenhywfar-qt5 Symbolic link
View file

@ -0,0 +1 @@
gwenhywfar

42
srcpkgs/gwenhywfar/template
View file

@ -1,12 +1,16 @@
# Template file for 'gwenhywfar' # Template file for 'gwenhywfar'
pkgname=gwenhywfar pkgname=gwenhywfar
version=4.15.3 version=4.15.3
revision=2 revision=3
_dnrel=201 _dnrel=201
hostmakedepends="automake pkg-config libgcrypt-devel libtool" 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" 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 <gottox@voidlinux.eu>" maintainer="Enno Boland <gottox@voidlinux.eu>"
license="LGPL" license="LGPL"
homepage="http://www.aquamaniac.de" 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" distfiles="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$version.tar.gz"
checksum=6a0e8787c99620414da6140e567c616b55856c5edf8825a9ebc67431923ee63a checksum=6a0e8787c99620414da6140e567c616b55856c5edf8825a9ebc67431923ee63a
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt-host-tools qt-devel qt5-host-tools qt5-devel"
fi
pre_configure() { pre_configure() {
# Build all GUIs
sed -i configure.ac -e's;"qt4 gtk2";"qt4 qt5 gtk2";'
autoreconf -fi 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() { gwenhywfar-gtk_package() {
short_desc+=" - gtk+2 bindings" short_desc+=" - gtk+2 bindings"
pkg_install() { 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() { gwenhywfar-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"