Re: [PR PATCH] [Updated] wxWidgets: fix cross config

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages wxWidgets-fix-cross-config
https://github.com/void-linux/void-packages/pull/28526

wxWidgets: fix cross config
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28526.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxWidgets-fix-cross-config-28526.patch --]
[-- Type: text/x-diff, Size: 4646 bytes --]

From fae36c43c00de429d430be08a6c13b78cb2bc2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 22:56:27 +0700
Subject: [PATCH 1/3] CubicSDR: build with gtk3

---
 srcpkgs/CubicSDR/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index 2f8c589d9ae..87c2e037a0f 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,11 +1,11 @@
 # Template file for 'CubicSDR'
 pkgname=CubicSDR
 version=0.2.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
  $(vopt_bool pulseaudio USE_AUDIO_PULSE) $(vopt_bool jack USE_AUDIO_JACK)"
-makedepends="SoapySDR-devel wxWidgets-devel glu-devel liquid-dsp-devel hamlib-devel
+makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel hamlib-devel
  $(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if jack jack-devel)"
 short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
@@ -18,6 +18,10 @@ checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
 build_options="alsa pulseaudio jack"
 build_options_default="alsa pulseaudio"
 
+if [ "$CROSS_BUILD" ]; then
+	export WX_CONFIG=$XBPS_WRAPPERDIR/wx-config-gtk3
+fi
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DOTHER_LIBRARIES=atomic"

From f44b9fa11ca0b859513ac1154860d0655c5389c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 22:31:53 +0700
Subject: [PATCH 2/3] wxWidgets-gtk3: remove cross reference

---
 srcpkgs/wxWidgets-gtk3/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template
index 7847442b405..fe6dc777392 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.0.5.1
-revision=4
+revision=5
 wrksrc="wxWidgets-${version}"
 build_style=gnu-configure
 configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
@@ -28,17 +28,17 @@ post_install() {
 
 		sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
 			-e "s/-${XBPS_CROSS_TRIPLET}//g" \
+			-e "s,$XBPS_CROSS_BASE,,g" \
 			${DESTDIR}/usr/lib/wx/config/${_config}
 	fi
 	rm -f ${DESTDIR}/usr/bin/wx-config
 	ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3
 	#   - ignore --host option; breaks configure scripts when
 	#     cross compiling (isn’t necessary in our case anyway)
-	vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
-		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
+	sed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \
 		-e 's/is_cross().*/is_cross() { false; }/g' \
 		-e '/--\*=\*)/i --host=\*) continue;;' \
-		-e "s/lib${XBPS_WORDSIZE}/lib/g" \
+		-e "s,/usr/lib,\${exec_prefix}/lib,g" \
 		$DESTDIR/usr/lib/wx/config/${_config}
 }
 

From caaf38305b9a69f01b5553a5f8a7dbefdda39eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 22:23:17 +0700
Subject: [PATCH 3/3] wxWidgets: remove cross reference

---
 srcpkgs/wxWidgets/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index d02563fa6bd..c7e8f9f3a38 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets'
 pkgname=wxWidgets
 version=3.0.5.1
-revision=4
+revision=5
 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
  --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
 build_style=gnu-configure
@@ -41,14 +41,14 @@ post_install() {
 
 		sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \
 			-e "s/-${XBPS_CROSS_TRIPLET}//g" \
+			-e "s,$XBPS_CROSS_BASE,,g" \
 			${DESTDIR}/usr/lib/wx/config/${_config}
 
 	fi
-	vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
-		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
+	sed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \
 		-e 's/is_cross()  { .* }/is_cross() { false; }/g' \
 		-e '/--\*=\*)/i --host=\*) continue;;' \
-		-e "s/lib${XBPS_WORDSIZE}/lib/g" \
+		-e "s,/usr/lib,\${exec_prefix}/lib,g" \
 		${DESTDIR}/usr/lib/wx/config/${_config}
 	ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
 	ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config