From b5d8fcd306e1d602927233c7637654e4610be49d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 10 Jan 2018 16:34:47 +0100 Subject: [PATCH] aqbanking: fix cross, change prefix detection for the cmake config file The cmake configuration file for aqbankung always uses /usr as prefix which causes issues while cross-compiling. This adds a patch to change the detection to do it the same way most KDE/QT software does it. Closes: #10663 [via git-merge-pr] --- srcpkgs/aqbanking/patches/cmake-prefix.patch | 23 ++++++++++++++++++++ srcpkgs/aqbanking/template | 12 +++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/aqbanking/patches/cmake-prefix.patch diff --git a/srcpkgs/aqbanking/patches/cmake-prefix.patch b/srcpkgs/aqbanking/patches/cmake-prefix.patch new file mode 100644 index 00000000000..a181d75530c --- /dev/null +++ b/srcpkgs/aqbanking/patches/cmake-prefix.patch @@ -0,0 +1,23 @@ +--- aqbanking-config.cmake.in 2018-01-10 16:09:39.079835643 +0100 ++++ aqbanking-config.cmake.in 2018-01-10 16:11:18.140403253 +0100 +@@ -19,7 +19,18 @@ + include(CMakeFindDependencyMacro) + find_dependency(gwenhywfar "@GWENHYWFAR_MINIMUM_VERSION@") + +-set_and_check(prefix "@prefix@") ++get_filename_component(prefix "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) ++ ++# Use original install prefix when loaded through a "/usr move" ++# cross-prefix symbolic link such as /lib -> /usr/lib. ++get_filename_component(_realCurr "${CMAKE_CURRENT_LIST_DIR}" REALPATH) ++get_filename_component(_realOrig "@prefix@/lib/cmake/aqbanking-@AQBANKING_VERSION_MAJOR@.@AQBANKING_VERSION_MINOR@" REALPATH) ++if(_realCurr STREQUAL _realOrig) ++ set(prefix "/usr") ++endif() ++unset(_realOrig) ++unset(_realCurr) ++ + set_and_check(exec_prefix "@exec_prefix@") + set_and_check(AQBANKING_INCLUDE_DIRS "@includedir@/aqbanking@AQBANKING_VERSION_MAJOR@") + set_and_check(AQBANKING_LIBRARIES "@libdir@/libaqbanking.so") + diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template index b365228380f..077c19c0df7 100644 --- a/srcpkgs/aqbanking/template +++ b/srcpkgs/aqbanking/template @@ -2,18 +2,24 @@ pkgname=aqbanking _dnrel=208 version=5.6.12 -revision=1 -hostmakedepends="pkg-config" +revision=2 +hostmakedepends="pkg-config gwenhywfar" makedepends="gwenhywfar-devel xmlsec1-devel ktoblzcheck-devel gmp-devel" build_style="gnu-configure" maintainer="Enno Boland " -license="LGPL" +license="GPL-2, GPL-3" homepage="http://www.aquamaniac.de/aqbanking" short_desc="A library for online banking and financial applications" distfiles="http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$version.tar.gz" checksum=0652706a487d594640a7d544271976261165bf269d90dc70447b38b363e54b22 disable_parallel_build=yes +if [ "$CROSS_BUILD" ]; then + configure_args+=" --with-gwen-dir=${XBPS_CROSS_BASE} -with-xmlmerge=/usr/bin/xmlmerge" + export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/gwenhywfar4" + export CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/gwenhywfar4" +fi + aqbanking-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"