From 326b9cacee443de308d6b863cb9b6bb37fa51205 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 20 Nov 2023 09:40:41 -0500 Subject: [PATCH] wxWidgets-gtk3: fix -devel config, add hard dependencies --- srcpkgs/wxWidgets-gtk3/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template index eb18772ca2d..6bc2dd2ac08 100644 --- a/srcpkgs/wxWidgets-gtk3/template +++ b/srcpkgs/wxWidgets-gtk3/template @@ -1,7 +1,7 @@ # Template file for 'wxWidgets-gtk3' pkgname=wxWidgets-gtk3 version=3.2.4 -revision=1 +revision=2 build_style=cmake cmake_builddir="build-gtk3" configure_args="-DwxBUILD_TOOLKIT=gtk3 -DwxUSE_OPENGL=ON -DwxUSE_LIBMSPACK=ON @@ -36,11 +36,12 @@ post_install() { if [ "$CROSS_BUILD" ]; then # Remove $XBPS_CROSS_TRIPLET from cmake helper... - sed -i -e "s@/usr/${XBPS_CROSS_TRIPLET}@@g" \ + local _xprefix="${XBPS_CROSS_BASE}/usr/" + sed -i -e "s@${_xprefix}@\${_IMPORT_PREFIX}/@g" \ ${DESTDIR}/usr/lib/cmake/wxWidgets/wxWidgetsTargets.cmake # ...and the output of the wx-config utility - sed -i -e "s@/usr/${XBPS_CROSS_TRIPLET}@@g" \ + sed -i -e "s@${_xprefix}@\${prefix}/@g" \ ${DESTDIR}/usr/lib/wx/config/${_config} fi @@ -74,7 +75,11 @@ wxWidgets-common-devel_package() { } wxWidgets-gtk3-devel_package() { - depends="${sourcepkg}>=${version}_${revision} wxWidgets-common-devel>=${version}_${revision}" + depends=" + ${sourcepkg}>=${version}_${revision} + wxWidgets-common-devel>=${version}_${revision} + gtk+3-devel glib-devel SDL2-devel gspell-devel libnotify-devel + " short_desc+=" - development files" pkg_install() { vmove usr/bin