From 3622a6d36bbf4a37482cc2b8fdaf6fcf62021706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 7 Feb 2021 18:03:39 +0700 Subject: [PATCH 1/2] python3-PyQt5: remove rpath --- srcpkgs/python3-PyQt5/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template index 2a2733b439c..99adf15a117 100644 --- a/srcpkgs/python3-PyQt5/template +++ b/srcpkgs/python3-PyQt5/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt5' pkgname=python3-PyQt5 version=5.15.2 -revision=2 +revision=3 _sipver=12.8.0 wrksrc="PyQt5-${version}" build_helper=qemu @@ -32,7 +32,7 @@ _cross_configure() { mkdir -p "${wrksrc}/.target-spec/linux-g++" cat >"${wrksrc}/.target-spec/linux-g++/qmake.conf" <<-_EOF MAKEFILE_GENERATOR = UNIX - CONFIG += incremental + CONFIG += incremental no_qt_rpath QMAKE_INCREMENTAL_STYLE = sublib include(/usr/lib/qt5/mkspecs/common/linux.conf) @@ -62,7 +62,7 @@ _cross_configure() { mkdir -p "${wrksrc}/.host-spec/linux-g++" cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<-_EOF MAKEFILE_GENERATOR = UNIX - CONFIG += incremental + CONFIG += incremental no_qt_rpath QMAKE_INCREMENTAL_STYLE = sublib include(/usr/lib/qt5/mkspecs/common/linux.conf) From 7115a5e3e65862df77500b1ca941b416444853ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 7 Feb 2021 18:30:55 +0700 Subject: [PATCH 2/2] python3-PyQt5-webengine: remove rpath --- srcpkgs/python3-PyQt5-webengine/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template index ae385283b7f..5cd179f7cfe 100644 --- a/srcpkgs/python3-PyQt5-webengine/template +++ b/srcpkgs/python3-PyQt5-webengine/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt5-webengine' pkgname=python3-PyQt5-webengine version=5.15.2 -revision=1 +revision=2 wrksrc="PyQtWebEngine-${version}" hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip qt5-webengine-devel python3-PyQt-builder python3-PyQt5-devel @@ -33,7 +33,7 @@ _cross_configure() { mkdir -p "${wrksrc}/.target-spec/linux-g++" cat >"${wrksrc}/.target-spec/linux-g++/qmake.conf" <<-_EOF MAKEFILE_GENERATOR = UNIX - CONFIG += incremental + CONFIG += incremental no_qt_rpath QMAKE_INCREMENTAL_STYLE = sublib include(/usr/lib/qt5/mkspecs/common/linux.conf) @@ -63,7 +63,7 @@ _cross_configure() { mkdir -p "${wrksrc}/.host-spec/linux-g++" cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<-_EOF MAKEFILE_GENERATOR = UNIX - CONFIG += incremental + CONFIG += incremental no_qt_rpath QMAKE_INCREMENTAL_STYLE = sublib include(/usr/lib/qt5/mkspecs/common/linux.conf) @@ -155,6 +155,8 @@ do_configure() { # Fix location of libraries find build -name Makefile | xargs sed -i " + s,/usr/lib64,/usr/lib,g + s,/usr/lib32,/usr/lib,g s, \\(/usr/lib/libQt\\), $XBPS_CROSS_BASE\\1,g s,-L\\(/usr/lib\\),-L$XBPS_CROSS_BASE\\1,g /INSTALL_ROOT/s,$XBPS_CROSS_BASE,,g