From be6b9930410c2c530cd9bbf25e91e208ed98319d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 8 Feb 2021 06:47:15 +0700 Subject: [PATCH 1/4] sip: update to 6.0.1. --- srcpkgs/sip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template index eb7a4ac56f4..34d8d632bba 100644 --- a/srcpkgs/sip/template +++ b/srcpkgs/sip/template @@ -1,6 +1,6 @@ # Template file for 'sip' pkgname=sip -version=6.0.0 +version=6.0.1 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only, GPL-3.0-only, custom:SIP" homepage="https://riverbankcomputing.com/software/sip/intro" distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz" -checksum=6185160e1aa8e167b5919c4761cbbf68cc7478d34fb655b3a28b3eb9acb5943a +checksum=c933e92b24aedc6d5827748bd8167209102b5de1526e86681a2202549027a784 lib32disabled=yes replaces="sip5<=${version}_${revision}" provides="sip5-${version}_${revision}" From a0c7cfeb45edc6337d52ed13f8c0a473261c4c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 8 Feb 2021 06:48:52 +0700 Subject: [PATCH 2/4] python3-PyQt-builder: update to 1.8.0. --- srcpkgs/python3-PyQt-builder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template index 956a6ab1cde..0bd0436784a 100644 --- a/srcpkgs/python3-PyQt-builder/template +++ b/srcpkgs/python3-PyQt-builder/template @@ -1,6 +1,6 @@ # Template file for 'python3-PyQt-builder' pkgname=python3-PyQt-builder -version=1.7.0 +version=1.8.0 revision=1 wrksrc=PyQt-builder-$version build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only, GPL-3.0-only, custom:SIP" homepage="https://www.riverbankcomputing.com/software/pyqt/" distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz" -checksum=b6e3c826f98ff4006ecb34df491ac6062a023b63a32e9f9f50904867aff72f2e +checksum=30b5fd3d1bdafeae3131070ebdc55481cf72c6a05a1b73ea2b420678bed2650c post_install() { rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle From 7c8c1de6a99d4049972aed78fb61aed1dcd50016 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 17:31:27 +0700 Subject: [PATCH 3/4] python3-PyQt5: remove rpath --- srcpkgs/python3-PyQt5/template | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template index 2a2733b439c..058095e7c69 100644 --- a/srcpkgs/python3-PyQt5/template +++ b/srcpkgs/python3-PyQt5/template @@ -1,18 +1,18 @@ # 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 -hostmakedepends="pkg-config qscintilla-qt5-devel python3-sip-PyQt5 +hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake + python3-dbus" +makedepends="qscintilla-qt5-devel python3-sip-PyQt5 python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel - python3-PyQt-builder qt5-connectivity-devel qt5-declarative-devel qt5-location-devel qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel" -makedepends="${hostmakedepends/pkg-config/}" depends="python3-sip-PyQt5>=${_sipver}" short_desc="Python 3 bindings for the Qt5 toolkit" maintainer="Đoàn Trần Công Danh " @@ -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) @@ -41,6 +41,7 @@ _cross_configure() { QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri + QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules QMAKE_CC = ${CC} QMAKE_CXX = ${CXX} QMAKE_LINK = ${CXX} @@ -55,6 +56,7 @@ _cross_configure() { QMAKE_CFLAGS = ${CFLAGS} QMAKE_CXXFLAGS = ${CXXFLAGS} QMAKE_LFLAGS = ${LDFLAGS} + INCPATH = $XBPS_CROSS_BASE/usr/include/python$py3_ver load(qt_config) _EOF ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/ @@ -62,7 +64,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) @@ -138,13 +140,18 @@ case " \$* " in exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;; esac _EOF - chmod +x $XBPS_WRAPPERDIR/qmake } do_configure() { if [ "$CROSS_BUILD" ]; then _cross_configure + else + cat >$XBPS_WRAPPERDIR/qmake <<-'_EOF' + #!/bin/sh + exec /usr/lib/qt5/bin/qmake "$@" CONFIG+=no_qt_rpath + _EOF fi + chmod +x $XBPS_WRAPPERDIR/qmake mkdir -p build sip-build --confirm-license --no-make \ @@ -152,14 +159,10 @@ do_configure() { --build-dir build if [ "$CROSS_BUILD" ]; then - # Fix location of libraries + # -I/usr/include/python$py3_ver is set by sip-build :( find build -name Makefile | xargs sed -i " - 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 s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g - s,-I\\(/usr/lib\\),-I$XBPS_CROSS_BASE\\1,g " fi } From 8c48db0caf171776f07ceeed23197e7d1c8304f3 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 4/4] python3-PyQt5-webengine: remove rpath --- srcpkgs/python3-PyQt5-webengine/template | 31 ++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template index ae385283b7f..7f4cb452f8e 100644 --- a/srcpkgs/python3-PyQt5-webengine/template +++ b/srcpkgs/python3-PyQt5-webengine/template @@ -1,11 +1,10 @@ # 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 - qt5-declarative-devel qt5-webchannel-devel qt5-location-devel" +hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel + sip python3-PyQt-builder" makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel qt5-webengine-devel python3-devel python3-PyQt5-devel" depends="python3-PyQt5>=${version}_1 python3-PyQt5-webchannel>=${version}_1" @@ -33,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) @@ -42,6 +41,7 @@ _cross_configure() { QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri + QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules QMAKE_CC = ${CC} QMAKE_CXX = ${CXX} QMAKE_LINK = ${CXX} @@ -56,6 +56,8 @@ _cross_configure() { QMAKE_CFLAGS = ${CFLAGS} QMAKE_CXXFLAGS = ${CXXFLAGS} QMAKE_LFLAGS = ${LDFLAGS} + INCPATH = $XBPS_CROSS_BASE/usr/include/python$py3_ver + INCPATH += $XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel load(qt_config) _EOF ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/ @@ -63,7 +65,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) @@ -139,28 +141,27 @@ case " \$* " in exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;; esac EOF - chmod +x $XBPS_WRAPPERDIR/qmake } do_configure() { if [ "$CROSS_BUILD" ]; then _cross_configure + else + cat >$XBPS_WRAPPERDIR/qmake <<-'_EOF' + #!/bin/sh + exec /usr/lib/qt5/bin/qmake "$@" CONFIG+=no_qt_rpath + _EOF fi + chmod +x $XBPS_WRAPPERDIR/qmake mkdir -p build sip-build --no-make \ --api-dir /usr/share/qt5/qsci/api/python \ --build-dir build if [ "$CROSS_BUILD" ]; then - # Fix location of libraries + # Fix location of python include find build -name Makefile | - xargs sed -i " - 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 - s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g - s,-I\\(/usr/lib\\),-I$XBPS_CROSS_BASE\\1,g - " + xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g" fi }