[PR PATCH] Streamline workarounds for wxWidgets usage in cmake

[PR PATCH] Streamline workarounds for wxWidgets usage in cmake

[Johnnynator]

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

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages cmake-wx
https://github.com/void-linux/void-packages/pull/27496

Streamline workarounds for wxWidgets usage in cmake


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-wx-27496.patch --]
[-- Type: text/x-diff, Size: 5948 bytes --]

From fc319cf30021291540fd0737627124f37e2c4bf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:24:26 +0100
Subject: [PATCH 1/6] build-style/cmake.sh: remove handeling of wxWidgets when
 cross compiing

This can be potentially broken, and the preffered way is to just set the WX_CONFIG env variable
---
 common/build-style/cmake.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 136312ed7b4..3135508b8b0 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -33,9 +33,6 @@ _EOF
 			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
 			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
 		esac
-		if [ -x "${XBPS_CROSS_BASE}/usr/bin/wx-config-gtk3" ]; then
-			wx_config=wx-config-gtk3
-		fi
 		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
 SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_SYSTEM_VERSION 1)
@@ -51,8 +48,6 @@ SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
 _EOF
 		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi

From ee013af6713a51da8492e6699a25785575269338 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:26:25 +0100
Subject: [PATCH 2/6] openbabel: export WX_CONFIG instead of
 wxWidgets_CONFIG_EXECUTABLE/symlink to wx-config

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

diff --git a/srcpkgs/openbabel/template b/srcpkgs/openbabel/template
index dde07d02341..54520f2b860 100644
--- a/srcpkgs/openbabel/template
+++ b/srcpkgs/openbabel/template
@@ -21,11 +21,9 @@ fi
 pre_configure() {
 	# workaround for cmake to find wx-config-gtk3
 	if [ "$CROSS_BUILD" ]; then
-		# cannot override wxWidgets_CONFIG_EXECUTABLE set in
-		# the cross toolchain file otherwise
-		ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+		export WX_CONFIG=${XBPS_WRAPPERDIR}/wx-config-gtk3
 	else
-		sed -i "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+		export WX_CONFIG=wx-config-gtk3
 	fi
 }
 

From 7f27da8640b17925a42039d2d02eb6e6772b951e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:27:52 +0100
Subject: [PATCH 3/6] codelite: export WX_CONFIG

---
 srcpkgs/codelite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 2cb5d35bccb..ffa8a8628fd 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -28,7 +28,7 @@ desc_option_mysql="Enable mysql/mariadb support"
 desc_option_sftp="Enable Workspace Mirroring plugin"
 
 pre_configure() {
+	export WX_CONFIG=wx-config-gtk3
 	sed -i -e 's,wx-config,&-gtk3,g' \
-	 -e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
 	 CMakeLists.txt
 }

From fc618af20b0ac80abf52f36a8dda619c76c0c6fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:28:20 +0100
Subject: [PATCH 4/6] hugin: export WX_CONFIG

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index a4f291b0217..ccb14c04833 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -29,10 +29,8 @@ pre_configure() {
 	# 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,}
+		export WX_CONFIG=${XBPS_WRAPPERDIR}/wx-config-gtk3
 	else
-		sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+		export WX_CONFIG=wx-config-gtk3
 	fi
 }

From bce926772d25bd08bb22a4bee0ca21349cfdfffd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:28:51 +0100
Subject: [PATCH 5/6] OpenCPN: export WX_CONFIG

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

diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template
index 0b9c936b25b..dab1b22076c 100644
--- a/srcpkgs/OpenCPN/template
+++ b/srcpkgs/OpenCPN/template
@@ -32,12 +32,16 @@ case $XBPS_TARGET_MACHINE in
 	*) build_options_default+=" crashreport";;
 esac
 
-if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
-fi
-
 CFLAGS="-fcommon"
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		export WX_CONFIG=${XBPS_WRAPPERDIR}/wx-config-gtk3
+	else
+		export WX_CONFIG=wx-config-gtk3
+	fi
+}
+
 post_install() {
 	vlicense libs/glshim/LICENSE LICENSE.glshim
 	vlicense libs/SQLiteCpp/LICENSE.txt LICENSE.SQLiteCpp

From 8fb83643635821017ef8cf51258f5fe91bd2275f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:29:49 +0100
Subject: [PATCH 6/6] SLADE: export WX_CONFIG

---
 srcpkgs/SLADE/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 21bac8fe31f..a39b921e06a 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -14,11 +14,12 @@ changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
 checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
-if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
-fi
-
 pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		export WX_CONFIG=${XBPS_WRAPPERDIR}/wx-config-gtk3
+	else
+		export WX_CONFIG=wx-config-gtk3
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64* | i686*);;
 		*) vsed -e '/D_USE_SSE/d' -i src/CMakeLists.txt;;

Re: Streamline workarounds for wxWidgets usage in cmake

[fosslinux]

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/27496#issuecomment-752023927

Comment:
Given that there is at least in 5 packages, how about a build_helper or variable for the cmake build style instaed?

Re: [PR PATCH] [Updated] Streamline workarounds for wxWidgets usage in cmake

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages cmake-wx
https://github.com/void-linux/void-packages/pull/27496

Streamline workarounds for wxWidgets usage in cmake


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-wx-27496.patch --]
[-- Type: text/x-diff, Size: 8217 bytes --]

From e8752c123e392455944e4cc966bad47431669714 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:24:26 +0100
Subject: [PATCH 1/7] build-style/cmake.sh: remove handeling of wxWidgets when
 cross compiing

This can be potentially broken, and the preffered way is to just set the WX_CONFIG env variable
---
 common/build-style/cmake.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 136312ed7b4..3135508b8b0 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -33,9 +33,6 @@ _EOF
 			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
 			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
 		esac
-		if [ -x "${XBPS_CROSS_BASE}/usr/bin/wx-config-gtk3" ]; then
-			wx_config=wx-config-gtk3
-		fi
 		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
 SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_SYSTEM_VERSION 1)
@@ -51,8 +48,6 @@ SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
 _EOF
 		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi

From 916bede12a8dbd9e86fea4427ccba0a25aa3d9e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 16:41:44 +0100
Subject: [PATCH 2/7] common: Add new cmake-wxWidgets-gtk3 build-helper

---
 Manual.md                                   | 2 ++
 common/build-helper/cmake-wxWidgets-gtk3.sh | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 common/build-helper/cmake-wxWidgets-gtk3.sh

diff --git a/Manual.md b/Manual.md
index 99e76e4da82..922cbd30f45 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1013,6 +1013,8 @@ This aims to fix cross-builds for when the build-style is mixed: e.g. when in a
 `gnu-configure` style the configure script calls `qmake` or a `Makefile` in
 `gnu-makefile` style, respectively.
 
+- `cmake-wxWidgets-gtk3` sets the `WX_CONFIG` variable which is used by FindwxWidgets.cmake
+
 <a id="functions"></a>
 ### Functions
 
diff --git a/common/build-helper/cmake-wxWidgets-gtk3.sh b/common/build-helper/cmake-wxWidgets-gtk3.sh
new file mode 100644
index 00000000000..9e59751fd7a
--- /dev/null
+++ b/common/build-helper/cmake-wxWidgets-gtk3.sh
@@ -0,0 +1,5 @@
+if [ "$CROSS_BUILD" ]; then
+	export WX_CONFIG=${XBPS_WRAPPERDIR}/wx-config-gtk3
+else
+	export WX_CONFIG=wx-config-gtk3
+fi

From 8625c8f777e6e1fd86c410e051bfba482388ae02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:26:25 +0100
Subject: [PATCH 3/7] openbabel: use cmake-wxWidgets-gtk3 build_helper

---
 srcpkgs/openbabel/template | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/srcpkgs/openbabel/template b/srcpkgs/openbabel/template
index dde07d02341..83eef561f8a 100644
--- a/srcpkgs/openbabel/template
+++ b/srcpkgs/openbabel/template
@@ -5,6 +5,7 @@ revision=7
 _ver=${version//./-}
 wrksrc=${pkgname}-${pkgname}-${_ver}
 build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config"
 makedepends="cairo-devel libxml2-devel eigen3.2 wxWidgets-gtk3-devel"
 short_desc="The Open Source Chemistry Toolbox"
@@ -18,17 +19,6 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python"
 fi
 
-pre_configure() {
-	# workaround for cmake to find wx-config-gtk3
-	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
-}
-
 openbabel-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 4d37c2447d1e96d967a5e3e7db8aed8946082b42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:27:52 +0100
Subject: [PATCH 4/7] codelite: use cmake-wxWidgets-gtk3 build_helper

---
 srcpkgs/codelite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 2cb5d35bccb..4475b703435 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -4,6 +4,7 @@ version=13.0
 revision=4
 archs="i686* x86_64* ppc64le*"
 build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
 configure_args="-DWITH_PCH=0
  $(vopt_if sftp -DENABLE_SFTP=1)
  $(vopt_if lldb -DENABLE_LLDB=1)"
@@ -29,6 +30,5 @@ desc_option_sftp="Enable Workspace Mirroring plugin"
 
 pre_configure() {
 	sed -i -e 's,wx-config,&-gtk3,g' \
-	 -e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
 	 CMakeLists.txt
 }

From 876e8352582565b3a2359b01618230d740925264 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:28:20 +0100
Subject: [PATCH 5/7] hugin: use cmake-wxWidgets-gtk3 build_helper

---
 srcpkgs/hugin/template | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index a4f291b0217..451e75fe682 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -4,6 +4,7 @@ version=2020.0.0
 revision=2
 wrksrc="${pkgname}-${version}"
 build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
 hostmakedepends="pkg-config exiftool swig gettext"
 makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
@@ -24,15 +25,3 @@ if [ "$CROSS_BUILD" ]; then
 else
 	makedepends+=" flann-devel"
 fi
-
-pre_configure() {
-	# 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
-}

From d3fe441c9a71cf1ab1d46f139a9d4e77653c2b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:28:51 +0100
Subject: [PATCH 6/7] OpenCPN: use cmake-wxWidgets-gtk3 build_helper

---
 srcpkgs/OpenCPN/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template
index 0b9c936b25b..7ba81e8fb96 100644
--- a/srcpkgs/OpenCPN/template
+++ b/srcpkgs/OpenCPN/template
@@ -3,6 +3,7 @@ pkgname=OpenCPN
 version=5.2.0
 revision=1
 build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON
  -DOCPN_BUNDLE_DOCS=ON -DOCPN_FORCE_GTK3=ON
  -DOCPN_USE_CRASHREPORT=$(vopt_if crashreport ON OFF)
@@ -32,10 +33,6 @@ case $XBPS_TARGET_MACHINE in
 	*) build_options_default+=" crashreport";;
 esac
 
-if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
-fi
-
 CFLAGS="-fcommon"
 
 post_install() {

From 46f778c736ab105d2578d6be20b76de0c1b46002 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 27 Dec 2020 00:29:49 +0100
Subject: [PATCH 7/7] SLADE: use cmake-wxWidgets-gtk3 build_helper

---
 srcpkgs/SLADE/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 21bac8fe31f..64a183b5498 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -3,6 +3,7 @@ pkgname=SLADE
 version=3.1.12a
 revision=3
 build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
  gtk+3-devel libcurl-devel wxWidgets-gtk3-devel"
@@ -14,10 +15,6 @@ changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
 checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
-if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
-fi
-
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
 		x86_64* | i686*);;

Re: [PR PATCH] [Merged]: Streamline workarounds for wxWidgets usage in cmake

[Johnnynator]

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

There's a merged pull request on the void-packages repository

Streamline workarounds for wxWidgets usage in cmake
https://github.com/void-linux/void-packages/pull/27496

Description: