Re: [PR PATCH] [Updated] build-helper/qmake: disable rpath

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

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

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

https://github.com/sgn/void-packages qmake-build-helper-disable-rpath
https://github.com/void-linux/void-packages/pull/28581

build-helper/qmake: disable rpath
@st3r4g Please test qjackctl.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qmake-build-helper-disable-rpath-28581.patch --]
[-- Type: text/x-diff, Size: 12548 bytes --]

From c1851f1a9d3fa60f9b0a7aa3c91f703cb9855be9 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: Mon, 8 Feb 2021 18:50:56 +0700
Subject: [PATCH 01/10] build-helper/qmake: ignore rpath

---
 common/build-helper/qmake.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh
index 62581557aec..adf665408a5 100644
--- a/common/build-helper/qmake.sh
+++ b/common/build-helper/qmake.sh
@@ -40,9 +40,16 @@ exec /usr/lib/qt5/bin/qmake "\$@" \
 	QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
 	QMAKE_CFLAGS+="${CFLAGS}" QMAKE_CXXFLAGS+="${CXXFLAGS}" \
 	QMAKE_LFLAGS+="${LDFLAGS}" \
+	QMAKEMODULES=${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules \
+	CONFIG+=no_qt_rpath \
 	-qtconf "${XBPS_WRAPPERDIR}/qt.conf"
 _EOF
-
-	chmod 755 ${XBPS_WRAPPERDIR}/qmake
-	cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt5}
+else
+        cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt5/bin/qmake "\$@" \
+	CONFIG+=no_qt_rpath
+_EOF
 fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt5}

From 0e1369c8a1851af14c511671c382371d7fb63d91 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: Mon, 8 Feb 2021 18:53:26 +0700
Subject: [PATCH 02/10] qjackctl: remove rpath

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

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index f47da62e887..e4a482e63cc 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,11 +1,12 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
 version=0.9.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
-configure_args="$(vopt_enable jack_session jack-session)"
-hostmakedepends="pkg-config"
+configure_args="$(vopt_enable jack_session jack-session)
+ ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="alsa-lib-devel qt5-devel jack-devel qt5-x11extras-devel"
 depends="desktop-file-utils hicolor-icon-theme jack"
 short_desc="JACK Audio Connection Kit - Qt GUI Interface"
@@ -18,8 +19,3 @@ checksum=5196c5c01b7948c1a8ca37cd3198a7f0fe095a99a34a67086abd3466855b4abd
 build_options="jack_session"
 build_options_default="jack_session"
 desc_option_jack_session="Enable support for the deprecated Jack Session API"
-
-if [ "${CROSS_BUILD}" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-x11extras-devel"
-	configure_args+=" ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"
-fi

From 694155a876a771e483e2b6f1831951f1e622cf67 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: Mon, 8 Feb 2021 18:55:33 +0700
Subject: [PATCH 03/10] abGate: remove rpath

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

diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template
index f772f49e796..aa19a2e3109 100644
--- a/srcpkgs/abGate/template
+++ b/srcpkgs/abGate/template
@@ -1,7 +1,7 @@
 # Template file for 'abGate'
 pkgname=abGate
 version=1.2.0
-revision=1
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,4 @@ homepage="http://abgate.sourceforge.net/"
 distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz>${pkgname}-${versiont}.tar.gz"
 checksum=ebee1cc545b088bf6e5989c114e7e34fa9f21ac7fdb1eee3fd067bcf98703b86
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
 CXXFLAGS="-fPIC"

From 3ba536dc350816dd7ff856ae2ebae2a6e9ce1610 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: Mon, 8 Feb 2021 18:56:29 +0700
Subject: [PATCH 04/10] djview: remove rpath

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

diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index 136bcced9fb..a6af3f0188d 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,11 +1,11 @@
 # Template file for 'djview'
 pkgname=djview
 version=4.12
-revision=1
+revision=2
 wrksrc="djview4-${version}"
 build_style=gnu-configure
 build_helper=qmake
-configure_args="QMAKE=qmake-qt5"
+configure_args="QMAKE=qmake-qt5 ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
 hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
 makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
 short_desc="Portable DjVu viewer and browser plugin"
@@ -15,10 +15,6 @@ homepage="http://djvu.sourceforge.net/djview4.html"
 distfiles="${SOURCEFORGE_SITE}/djvu/${pkgname}-${version}.tar.gz"
 checksum=5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3
 
-if [ "${CROSS_BUILD}" ]; then
-	configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
-fi
-
 post_extract() {
 	vsed -i -e '/Exec/s/djview4/djview/' \
 		-e '/StartupWMClass/s/Djview4/DjView/' \

From 76b8dd537f22121c6c65f502cc9d6c238fba7ea2 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: Mon, 8 Feb 2021 18:57:24 +0700
Subject: [PATCH 05/10] gpsbabel: remove rpath

---
 srcpkgs/gpsbabel/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c..c059329e030 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,10 +1,12 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
 version=1.5.4
-revision=1
+revision=2
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
+configure_args=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
@@ -16,11 +18,6 @@ checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
 
 replaces="gpsbabel-gui>=0"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
-fi
-
 do_build() {
 	sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc
 

From e058cdb6956495f0940005ae5c52f3a20a5b03f9 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: Mon, 8 Feb 2021 19:30:18 +0700
Subject: [PATCH 06/10] mkvtoolnix: remove rpath

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

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0e0948a8f03..a35d58c749f 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=52.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt

From a602c478b7380b40bf72ec0909d2d3957e813c3d 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: Mon, 8 Feb 2021 19:30:49 +0700
Subject: [PATCH 07/10] projectM: remove rpath

---
 srcpkgs/projectM/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index 6d9fc6a0a94..efd2e59ed54 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,13 +1,12 @@
 # Template file for 'projectM'
 pkgname=projectM
 version=3.1.7
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--datadir=/usr/libexec --enable-qt --enable-pulseaudio
  --enable-jack --enable-sdl"
-hostmakedepends="pkg-config qt5-host-tools automake libtool which qt5-qmake
- qt5-tools-devel"
+hostmakedepends="pkg-config qt5-host-tools automake libtool which qt5-qmake"
 makedepends="pulseaudio-devel alsa-lib-devel glew-devel ftgl-devel libXext-devel
  SDL2-devel gtkglext-devel jack-devel qt5-tools-devel libvisual-devel glm
  MesaLib-devel glu-devel"

From 987fdff2799f9b423e42eba8d8733c10977ce08f 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: Mon, 8 Feb 2021 19:31:27 +0700
Subject: [PATCH 08/10] qsynth: remove rpath

---
 srcpkgs/qsynth/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index 058743f761f..0397acf2e7f 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,10 +1,11 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.9.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
-hostmakedepends="pkg-config qt5-tools"
+configure_args=" ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"
+hostmakedepends="pkg-config qt5-tools qt5-host-tools qt5-qmake"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"
 depends="fluidsynth jack desktop-file-utils hicolor-icon-theme"
 short_desc="Qt GUI Interface for FluidSynth"
@@ -13,8 +14,3 @@ license="GPL-2.0-or-later"
 homepage="http://qsynth.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=72ab545c39b7ca518be3dfaaee61c8ce88b20d4c34dff946898a8ca7d8e85ae4
-
-if [ "${CROSS_BUILD}" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-	configure_args+=" ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"
-fi

From 74195e5ea62d36f9ad742ffc150e997561bb9905 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: Mon, 8 Feb 2021 19:51:38 +0700
Subject: [PATCH 09/10] smplayer: remove rpath

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

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index a92e285d3c9..de75260b85c 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,10 +1,10 @@
 # Template file for 'smplayer'
 pkgname=smplayer
 version=21.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
-hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
+hostmakedepends="qt5-host-tools qt5-qmake tar"
 makedepends="zlib-devel qt5-script-devel qt5-tools-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Complete front-end for mplayer and mpv"

From 292c2ce8764e6c863a86ebf79634e7161d11957f 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: Mon, 8 Feb 2021 19:54:22 +0700
Subject: [PATCH 10/10] sonic-visualiser: remove rpath

---
 srcpkgs/sonic-visualiser/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 4daa56060ee..1fb315b1c18 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,10 +1,12 @@
 # Template file for 'sonic-visualiser'
 pkgname=sonic-visualiser
 version=4.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=qmake
-hostmakedepends="pkg-config capnproto-devel"
+configure_args=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
+hostmakedepends="pkg-config capnproto-devel qt5-qmake qt5-host-tools
+ qt5-svg-devel"
 makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
  liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
  opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
@@ -16,16 +18,12 @@ homepage="https://www.sonicvisualiser.org/"
 changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
 distfiles="https://code.soundsoftware.ac.uk/attachments/download/2755/${pkgname}-${version}.tar.gz"
 checksum=38e91a4035962ad177905a9f1249136fe88d4b596fd9b8f40c82b60dadca5bf3
+broken="distfiles certs expired"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-svg-devel"
-	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
-fi
-
 post_extract() {
 	if [ "$CROSS_BUILD" ]; then
 		# don’t run target-built testing-binaries when cross building