From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] PyQt stack: update to 5.15.3
Date: Thu, 11 Mar 2021 00:58:58 +0100 [thread overview]
Message-ID: <20210310235858.oLhppIK7Cc-LNpI-56_qYwGSZ_9bla1jWDt1VME9_GQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29178@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1629 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages new-build-style-sip-build-for-PyQt-stack
https://github.com/void-linux/void-packages/pull/29178
PyQt stack: update to 5.15.3
<!-- 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?
- [x] 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
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/29178.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-build-style-sip-build-for-PyQt-stack-29178.patch --]
[-- Type: text/x-diff, Size: 24339 bytes --]
From 6301dd03cf2f223dee82ade0064ab5110f16f292 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: Thu, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 1/4] python3-PyQt5: update to 5.15.3.
---
srcpkgs/python3-PyQt5-networkauth | 1 -
srcpkgs/python3-PyQt5/template | 197 +++++-------------------------
2 files changed, 31 insertions(+), 167 deletions(-)
delete mode 120000 srcpkgs/python3-PyQt5-networkauth
diff --git a/srcpkgs/python3-PyQt5-networkauth b/srcpkgs/python3-PyQt5-networkauth
deleted file mode 120000
index 75ad8e779a9..00000000000
--- a/srcpkgs/python3-PyQt5-networkauth
+++ /dev/null
@@ -1 +0,0 @@
-python3-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 058095e7c69..4437295251d 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,158 +1,36 @@
# Template file for 'python3-PyQt5'
pkgname=python3-PyQt5
-version=5.15.2
-revision=3
+version=5.15.3
+revision=1
_sipver=12.8.0
wrksrc="PyQt5-${version}"
-build_helper=qemu
-hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
+build_helper="qemu qmake"
+hostmakedepends="pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools
python3-dbus"
makedepends="qscintilla-qt5-devel python3-sip-PyQt5
python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel
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"
+ qt5-x11extras-devel qt5-xmlpatterns-devel pulseaudio-devel"
depends="python3-sip-PyQt5>=${_sipver}"
short_desc="Python 3 bindings for the Qt5 toolkit"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-only"
homepage="https://riverbankcomputing.com/software/pyqt/intro"
distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
-checksum=372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc
+checksum=965ba50e7029b37f218a54ace24e87c77db3e5a9f0b83baeb21fb57b4154b838
lib32disabled=yes
+CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
+CXXFLAGS="$CFLAGS"
+
+export INCPATH=$XBPS_CROSS_BASE/usr/include/python$py3_ver
post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- local qplatformdefs="/usr/lib/qt5/mkspecs/linux-g++/qplatformdefs.h"
-
- mkdir -p "${wrksrc}/.target-spec/linux-g++"
- cat >"${wrksrc}/.target-spec/linux-g++/qmake.conf" <<-_EOF
- MAKEFILE_GENERATOR = UNIX
- CONFIG += incremental no_qt_rpath
- QMAKE_INCREMENTAL_STYLE = sublib
-
- include(/usr/lib/qt5/mkspecs/common/linux.conf)
- include(/usr/lib/qt5/mkspecs/common/gcc-base-unix.conf)
- include(/usr/lib/qt5/mkspecs/common/g++-unix.conf)
-
- 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}
- QMAKE_LINK_C = ${CC}
- QMAKE_LINK_SHLIB = ${CXX}
-
- QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
- QMAKE_OBJCOPY = ${OBJCOPY}
- QMAKE_NM = ${NM} -P
- QMAKE_STRIP = ${STRIP}
-
- 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++/
-
- mkdir -p "${wrksrc}/.host-spec/linux-g++"
- cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<-_EOF
- MAKEFILE_GENERATOR = UNIX
- CONFIG += incremental no_qt_rpath
- QMAKE_INCREMENTAL_STYLE = sublib
-
- include(/usr/lib/qt5/mkspecs/common/linux.conf)
- include(/usr/lib/qt5/mkspecs/common/gcc-base-unix.conf)
- include(/usr/lib/qt5/mkspecs/common/g++-unix.conf)
-
- QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri
- QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri
- QMAKE_CC = ${CC_FOR_BUILD}
- QMAKE_CXX = ${CXX_FOR_BUILD}
- QMAKE_LINK = ${CXX_FOR_BUILD}
- QMAKE_LINK_C = ${CC_FOR_BUILD}
- QMAKE_LINK_SHLIB = ${CXX_FOR_BUILD}
-
- QMAKE_AR = gcc-ar cqs
- QMAKE_OBJCOPY = ${OBJCOPY_FOR_BUILD}
- QMAKE_NM = ${NM_FOR_BUILD} -P
- QMAKE_STRIP = ${STRIP_FOR_BUILD}
-
- QMAKE_CFLAGS = ${CFLAGS_FOR_BUILD}
- QMAKE_CXXFLAGS = ${CXXFLAGS_FOR_BUILD}
- QMAKE_LFLAGS = ${LDFLAGS_FOR_BUILD}
- load(qt_config)
- _EOF
- ln -sf $qplatformdefs ${wrksrc}/.host-spec/linux-g++/
-
- cat >"${wrksrc}/qt.conf" <<-_EOF
- [Paths]
- Sysroot=${XBPS_CROSS_BASE}
- Prefix=/usr
- ArchData=/usr/lib/qt5
- Data=/usr/share/qt5
- Documentation=/usr/share/doc/qt5
- Headers=${XBPS_CROSS_BASE}/usr/include/qt5
- Libraries=${XBPS_CROSS_BASE}/usr/lib
- LibraryExecutables=/usr/lib/qt5/libexec
- Binaries=/usr/lib/qt5/bin
- Tests=${XBPS_CROSS_BASE}/usr/tests
- Plugins=/usr/lib/qt5/plugins
- Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports
- Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml
- Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations
- Settings=${XBPS_CROSS_BASE}/etc/xdg
- Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples
- HostPrefix=/usr
- HostData=/usr/lib/qt5
- HostBinaries=/usr/lib/qt5/bin
- HostLibraries=/usr/lib
- Spec=$wrksrc/.host-spec/linux-g++
- TargetSpec=$wrksrc/.target-spec/linux-g++
- _EOF
-
- case $XBPS_TARGET_MACHINE in
- i686*) _qt_arch=i386;;
- x86_64*) _qt_arch=x86_64;;
- aarch64*) _qt_arch=arm64;;
- arm*) _qt_arch=arm;;
- mips*) _qt_arch=mips;;
- esac
- cat >$XBPS_WRAPPERDIR/qmake <<_EOF
-#!/bin/sh
-export PREFIX=/usr
-export QT_INSTALL_PREFIX=/usr
-export LIB=/usr/lib
-export QT_TARGET_ARCH=$_qt_arch
-export PKG_CONFIG_EXECUTABLE=$XBPS_WRAPPERDIR/$PKG_CONFIG
-case " \$* " in
-" -query ")
- /usr/lib/qt5/bin/qmake "\$@" -qtconf $wrksrc/qt.conf |
- sed '/^QT_INSTALL_/s,$XBPS_CROSS_BASE,,'
- ;;
-*)
- exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;;
-esac
-_EOF
-}
-
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 \
--api-dir /usr/share/qt5/qsci/api/python \
@@ -161,29 +39,24 @@ do_configure() {
if [ "$CROSS_BUILD" ]; then
# -I/usr/include/python$py3_ver is set by sip-build :(
find build -name Makefile |
- xargs sed -i "
- s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g
- "
+ xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
fi
}
do_build() {
- cd build
- make ${makejobs}
+ make -C build ${makejobs}
}
do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+ make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
for f in pylupdate5 pyrcc5 pyuic5; do
- sed -i '1s,python3[.0-9]*,python3,' ${DESTDIR}/usr/bin/${f}
mv ${DESTDIR}/usr/bin/{,python3-}${f}
done
}
python3-PyQt5-devel-tools_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc+=" - development tools"
alternatives="
pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
@@ -196,7 +69,7 @@ python3-PyQt5-devel-tools_package() {
}
}
python3-PyQt5-devel_package() {
- depends="sip>=6.0.0 python3-PyQt5-${version}_${revision}"
+ depends="sip>=6.0.0 python3-PyQt5>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove ${py3_sitelib}/PyQt5/bindings
@@ -204,7 +77,7 @@ python3-PyQt5-devel_package() {
}
python3-PyQt5-dbus_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision} python3-dbus"
+ depends="python3-PyQt5>=${version}_${revision} python3-dbus"
short_desc="${short_desc} - dbus support"
pkg_install() {
vmove ${py3_sitelib}/dbus
@@ -212,7 +85,7 @@ python3-PyQt5-dbus_package() {
}
python3-PyQt5-connectivity_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - connectivity module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtBluetooth.*"
@@ -221,24 +94,16 @@ python3-PyQt5-connectivity_package() {
}
python3-PyQt5-multimedia_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - multimedia module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtMultimedia.*"
vmove "${py3_sitelib}/PyQt5/QtMultimediaWidgets.*"
}
}
-python3-PyQt5-networkauth_package() {
- lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
- short_desc="${short_desc} - networkauth module"
- pkg_install() {
- vmove "${py3_sitelib}/PyQt5/QtNetworkAuth.*"
- }
-}
python3-PyQt5-opengl_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - opengl module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtOpenGL.*"
@@ -249,7 +114,7 @@ python3-PyQt5-opengl_package() {
}
python3-PyQt5-location_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - location module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtLocation.*"
@@ -258,7 +123,7 @@ python3-PyQt5-location_package() {
}
python3-PyQt5-quick_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - quick module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtQml.*"
@@ -269,7 +134,7 @@ python3-PyQt5-quick_package() {
}
python3-PyQt5-sensors_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - sensors module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSensors.*"
@@ -277,7 +142,7 @@ python3-PyQt5-sensors_package() {
}
python3-PyQt5-serialport_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - serialport module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSerialPort.*"
@@ -285,7 +150,7 @@ python3-PyQt5-serialport_package() {
}
python3-PyQt5-sql_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - sql module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSql.*"
@@ -293,7 +158,7 @@ python3-PyQt5-sql_package() {
}
python3-PyQt5-svg_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - svg module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtSvg.*"
@@ -301,7 +166,7 @@ python3-PyQt5-svg_package() {
}
python3-PyQt5-tools_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - designer, help modules"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtHelp.*"
@@ -311,7 +176,7 @@ python3-PyQt5-tools_package() {
}
python3-PyQt5-webchannel_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - webchannel module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebChannel.*"
@@ -319,7 +184,7 @@ python3-PyQt5-webchannel_package() {
}
python3-PyQt5-webkit_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - webkit module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebKit.*"
@@ -328,7 +193,7 @@ python3-PyQt5-webkit_package() {
}
python3-PyQt5-websockets_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - websockets module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtWebSockets.*"
@@ -336,7 +201,7 @@ python3-PyQt5-websockets_package() {
}
python3-PyQt5-x11extras_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - x11extras module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtX11Extras.*"
@@ -344,7 +209,7 @@ python3-PyQt5-x11extras_package() {
}
python3-PyQt5-xmlpatterns_package() {
lib32disabled=yes
- depends="python3-PyQt5-${version}_${revision}"
+ depends="python3-PyQt5>=${version}_${revision}"
short_desc="${short_desc} - xmlpatterns module"
pkg_install() {
vmove "${py3_sitelib}/PyQt5/QtXmlPatterns.*"
From ba88a30daecfa8faee51ec9c016167e86b606d92 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: Thu, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 2/4] python3-PyQt5-webengine: update to 5.15.3.
---
srcpkgs/python3-PyQt5-webengine/template | 158 +++--------------------
1 file changed, 17 insertions(+), 141 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 7f4cb452f8e..6027049cf68 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,177 +1,53 @@
# Template file for 'python3-PyQt5-webengine'
pkgname=python3-PyQt5-webengine
-version=5.15.2
-revision=2
+version=5.15.3
+revision=1
wrksrc="PyQtWebEngine-${version}"
+build_helper="qmake"
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"
+depends="python3-PyQt5>=${version} python3-PyQt5-webchannel>=${version}"
short_desc="Python 3 bindings for the Qt5 toolkit - webengine module"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-only"
homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
-checksum=4d72fea774071ce6f76e341a3d2c5d595886c9906a9b9493239c841cce54a634
+checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
lib32disabled=yes
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
+CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
-case "$XBPS_TARGET_MACHINE" in
- ppc64le*) ;;
- ppc*) broken="no webengine for big endian ppc";;
- arm*) broken="depends on qt5-webengine";;
-esac
+if [ "$XBPS_TARGET_ENDIAN" != le ]; then
+ broken="no webengine for big endian"
+fi
+
+if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+ broken="webengine can be built only if word size matches"
+fi
post_extract() {
rm -rf pyuic/uic/port_v2
}
-_cross_configure() {
- local qplatformdefs="/usr/lib/qt5/mkspecs/linux-g++/qplatformdefs.h"
-
- mkdir -p "${wrksrc}/.target-spec/linux-g++"
- cat >"${wrksrc}/.target-spec/linux-g++/qmake.conf" <<-_EOF
- MAKEFILE_GENERATOR = UNIX
- CONFIG += incremental no_qt_rpath
- QMAKE_INCREMENTAL_STYLE = sublib
-
- include(/usr/lib/qt5/mkspecs/common/linux.conf)
- include(/usr/lib/qt5/mkspecs/common/gcc-base-unix.conf)
- include(/usr/lib/qt5/mkspecs/common/g++-unix.conf)
-
- 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}
- QMAKE_LINK_C = ${CC}
- QMAKE_LINK_SHLIB = ${CXX}
-
- QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
- QMAKE_OBJCOPY = ${OBJCOPY}
- QMAKE_NM = ${NM} -P
- QMAKE_STRIP = ${STRIP}
-
- 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++/
-
- mkdir -p "${wrksrc}/.host-spec/linux-g++"
- cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<-_EOF
- MAKEFILE_GENERATOR = UNIX
- CONFIG += incremental no_qt_rpath
- QMAKE_INCREMENTAL_STYLE = sublib
-
- include(/usr/lib/qt5/mkspecs/common/linux.conf)
- include(/usr/lib/qt5/mkspecs/common/gcc-base-unix.conf)
- include(/usr/lib/qt5/mkspecs/common/g++-unix.conf)
-
- QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri
- QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri
- QMAKE_CC = ${CC_FOR_BUILD}
- QMAKE_CXX = ${CXX_FOR_BUILD}
- QMAKE_LINK = ${CXX_FOR_BUILD}
- QMAKE_LINK_C = ${CC_FOR_BUILD}
- QMAKE_LINK_SHLIB = ${CXX_FOR_BUILD}
-
- QMAKE_AR = gcc-ar cqs
- QMAKE_OBJCOPY = ${OBJCOPY_FOR_BUILD}
- QMAKE_NM = ${NM_FOR_BUILD} -P
- QMAKE_STRIP = ${STRIP_FOR_BUILD}
-
- QMAKE_CFLAGS = ${CFLAGS_FOR_BUILD}
- QMAKE_CXXFLAGS = ${CXXFLAGS_FOR_BUILD}
- QMAKE_LFLAGS = ${LDFLAGS_FOR_BUILD}
- load(qt_config)
- _EOF
- ln -sf $qplatformdefs ${wrksrc}/.host-spec/linux-g++/
-
- cat > "$wrksrc/qt.conf" <<-_EOF
- [Paths]
- Sysroot=${XBPS_CROSS_BASE}
- Prefix=/usr
- ArchData=/usr/lib/qt5
- Data=/usr/share/qt5
- Documentation=/usr/share/doc/qt5
- Headers=${XBPS_CROSS_BASE}/usr/include/qt5
- Libraries=${XBPS_CROSS_BASE}/usr/lib
- LibraryExecutables=/usr/lib/qt5/libexec
- Binaries=/usr/lib/qt5/bin
- Tests=${XBPS_CROSS_BASE}/usr/tests
- Plugins=/usr/lib/qt5/plugins
- Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports
- Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml
- Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations
- Settings=${XBPS_CROSS_BASE}/etc/xdg
- Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples
- HostPrefix=/usr
- HostData=/usr/lib/qt5
- HostBinaries=/usr/lib/qt5/bin
- HostLibraries=/usr/lib
- Spec=$wrksrc/.host-spec/linux-g++
- TargetSpec=$wrksrc/.target-spec/linux-g++
- _EOF
-
- case $XBPS_TARGET_MACHINE in
- i686*) _qt_arch=i386;;
- x86_64*) _qt_arch=x86_64;;
- aarch64*) _qt_arch=arm64;;
- arm*) _qt_arch=arm;;
- mips*) _qt_arch=mips;;
- esac
- cat <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/bin/sh
-export PREFIX=/usr
-export QT_INSTALL_PREFIX=/usr
-export LIB=/usr/lib
-export QT_TARGET_ARCH=$_qt_arch
-export PKG_CONFIG_EXECUTABLE=$XBPS_WRAPPERDIR/$PKG_CONFIG
-case " \$* " in
-" -query ")
- /usr/lib/qt5/bin/qmake "\$@" -qtconf $wrksrc/qt.conf |
- sed '/^QT_INSTALL_/s,$XBPS_CROSS_BASE,,'
- ;;
-*)
- exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;;
-esac
-EOF
-}
-
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 python include
+ # -I/usr/include/python$py3_ver is set by sip-build :(
find build -name Makefile |
xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
fi
}
do_build() {
- cd build
- make ${makejobs}
+ make -C build ${makejobs}
}
do_install() {
- cd build
- make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
- rm -rf ${DESTDIR}/usr/share
+ make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
}
From 4f1762cc195f88a76909a92d0b85da5c23d61a22 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: Tue, 2 Mar 2021 21:58:54 +0700
Subject: [PATCH 3/4] python3-PyQt5-webengine: split -devel
---
srcpkgs/python3-PyQt5-webengine-devel | 1 +
srcpkgs/python3-PyQt5-webengine/template | 8 ++++++++
2 files changed, 9 insertions(+)
create mode 120000 srcpkgs/python3-PyQt5-webengine-devel
diff --git a/srcpkgs/python3-PyQt5-webengine-devel b/srcpkgs/python3-PyQt5-webengine-devel
new file mode 120000
index 00000000000..9187de47966
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-webengine-devel
@@ -0,0 +1 @@
+python3-PyQt5-webengine
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 6027049cf68..aed879a2dba 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -51,3 +51,11 @@ do_build() {
do_install() {
make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
}
+
+python3-PyQt5-webengine-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
From b709de05c5e6c67434e6daa194ae1fb514fb4143 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: Tue, 2 Mar 2021 08:20:45 +0700
Subject: [PATCH 4/4] python3-PyQt5-networkauth: update to 5.15.3
Splited from python3-PyQt5
---
srcpkgs/python3-PyQt5-networkauth-devel | 1 +
srcpkgs/python3-PyQt5-networkauth/template | 47 ++++++++++++++++++++++
2 files changed, 48 insertions(+)
create mode 120000 srcpkgs/python3-PyQt5-networkauth-devel
create mode 100644 srcpkgs/python3-PyQt5-networkauth/template
diff --git a/srcpkgs/python3-PyQt5-networkauth-devel b/srcpkgs/python3-PyQt5-networkauth-devel
new file mode 120000
index 00000000000..1dd296bda79
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth-devel
@@ -0,0 +1 @@
+python3-PyQt5-networkauth
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template
new file mode 100644
index 00000000000..b0768fc041b
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,47 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_helper="qmake"
+hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip
+ python3-PyQt-builder"
+makedepends="python3-devel python3-PyQt5-devel qt5-networkauth-devel"
+depends="python3-PyQt5>=$version"
+short_desc="Python bindings for the Qt5 Network Authorization library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
+CXXFLAGS="$CFLAGS"
+
+do_configure() {
+ mkdir -p build
+ sip-build --no-make \
+ --api-dir /usr/share/qt5/qsci/api/python \
+ --build-dir build
+
+ if [ "$CROSS_BUILD" ]; then
+ # -I/usr/include/python$py3_ver is set by sip-build :(
+ find build -name Makefile |
+ xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
+ fi
+}
+
+do_build() {
+ make -C build ${makejobs}
+}
+
+do_install() {
+ make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+}
+
+python3-PyQt5-networkauth-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ }
+}
next prev parent reply other threads:[~2021-03-10 23:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 14:44 [PR PATCH] New build-style: sip-build for PyQt stack, " sgn
2021-03-02 15:09 ` [PR PATCH] [Updated] " sgn
2021-03-02 15:14 ` sgn
2021-03-05 0:55 ` sgn
2021-03-05 1:16 ` [PR PATCH] [Updated] PyQt stack: " sgn
2021-03-08 5:26 ` sgn
2021-03-10 16:15 ` sgn
2021-03-10 23:58 ` sgn [this message]
2021-03-10 23:59 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210310235858.oLhppIK7Cc-LNpI-56_qYwGSZ_9bla1jWDt1VME9_GQ@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).