From 717491f27c91478e64483aa010179f0cfea95bc3 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 12 Sep 2018 15:46:39 +0200 Subject: [PATCH] passwordsafe: switch to wxWidgets-gtk3 --- srcpkgs/passwordsafe/template | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 8350dedb72a..1cbc4ed7ecd 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,13 +1,13 @@ # Template file for 'passwordsafe' pkgname=passwordsafe version=1.06BETA -revision=2 +revision=3 wrksrc="pwsafe-${version}" build_style=cmake configure_args="-DNO_GTEST=ON" # build process uses perl to generate core_st.cpp and zip to generate help files hostmakedepends="perl zip pkg-config gettext" -makedepends="wxWidgets-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel +makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel libykpers-devel gtest-devel qrencode-devel" short_desc="Simple & Secure Password Management" maintainer="Rui Abreu Ferreira " @@ -19,6 +19,16 @@ checksum=901ca5178c3254c750bdcbf13c0d2382269490b5de7be790b79f41cdd6297b2b pre_configure() { # ykpers-1 includes are hardcoded, add cross base sed -i -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" CMakeLists.txt + + # workaround for cmake to find wx-config-gtk3 + # can be removed once there is only one 'wx-config' + if [ "$CROSS_BUILD" ]; then + # cannot override wxWidgets_CONFIG_EXECUTABLE set in + # the cross toolchain file otherwise + ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,} + else + sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt + fi } do_install() {