From a686166778908b980353fea594984c9106e2bdb3 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, 24 May 2021 22:54:39 +0700 Subject: [PATCH 1/6] build-style: new build-style for sip-build --- common/build-style/sip-build.sh | 147 ++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 common/build-style/sip-build.sh diff --git a/common/build-style/sip-build.sh b/common/build-style/sip-build.sh new file mode 100644 index 00000000000000..d8b3bcea98bf09 --- /dev/null +++ b/common/build-style/sip-build.sh @@ -0,0 +1,147 @@ +# +# This helper is for templates using sip-build. +# + +do_configure() { + local _qt= + local _spec= + local _mkspec= + + : "${sip_builddir:=build}" + mkdir -p "$sip_builddir" + + if [ ! -d /$py3_sitelib/pyqtbuild ]; then + : "who uses sip-build without qmake anyway?" + elif [ -x /usr/lib/qt6/bin/qmake ]; then + _qt=qt6 + elif [ -x /usr/lib/qt5/bin/qmake ]; then + _qt=qt5 + else + msg_error 'qmake not found\n' + fi + + if [ ! "$_qt" ]; then + : "who use sip-build without qmake anyway?" + elif [ "$CROSS_BUILD" ]; then + _mkspec="usr/lib/$_qt/mkspecs" + _spec="$XBPS_WRAPPERDIR/sip-build/target-spec/linux-g++" + mkdir -p "$_spec" + cat >"$_spec/qmake.conf" <<-_EOF + MAKEFILE_GENERATOR = UNIX + CONFIG += incremental no_qt_rpath + QMAKE_INCREMENTAL_STYLE = sublib + + include(/$_mkspec/common/linux.conf) + include(/$_mkspec/common/gcc-base-unix.conf) + include(/$_mkspec/common/g++-unix.conf) + + QMAKE_TARGET_CONFIG = $XBPS_CROSS_BASE/$_mkspec/qconfig.pri + QMAKE_TARGET_MODULE = $XBPS_CROSS_BASE/$_mkspec/qmodule.pri + QMAKEMODULES = $XBPS_CROSS_BASE/$_mkspec/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 -I$XBPS_CROSS_BASE/usr/include/python$py3_ver + QMAKE_CXXFLAGS = $CXXFLAGS -I$XBPS_CROSS_BASE/usr/include/python$py3_ver + QMAKE_LFLAGS = -L$XBPS_CROSS_BASE/usr/lib $LDFLAGS + load(qt_config) + _EOF + + printf '#include "%s/%s/linux-g++/qplatformdefs.h"\n' \ + "$XBPS_CROSS_BASE" "$_mkspec" >"$_spec/qplatformdefs.h" + cat >"$XBPS_WRAPPERDIR/sip-build/qt.conf" <<-_EOF + [Paths] + Sysroot=$XBPS_CROSS_BASE + Prefix=$XBPS_CROSS_BASE/usr + ArchData=$XBPS_CROSS_BASE/usr/lib/$_qt + Data=$XBPS_CROSS_BASE/usr/share/$_qt + Documentation=$XBPS_CROSS_BASE/usr/share/doc/$_qt + Headers=$XBPS_CROSS_BASE/usr/include/$_qt + Libraries=$XBPS_CROSS_BASE/usr/lib + LibraryExecutables=/usr/lib/$_qt/libexec + Binaries=/usr/lib/$_qt/bin + Tests=$XBPS_CROSS_BASE/usr/tests + Plugins=/usr/lib/$_qt/plugins + Imports=$XBPS_CROSS_BASE/usr/lib/$_qt/imports + Qml2Imports=$XBPS_CROSS_BASE/usr/lib/$_qt/qml + Translations=$XBPS_CROSS_BASE/usr/share/$_qt/translations + Settings=$XBPS_CROSS_BASE/etc/xdg + Examples=$XBPS_CROSS_BASE/usr/share/$_qt/examples + HostPrefix=/usr + HostData=/usr/lib/$_qt + HostBinaries=/usr/lib/$_qt/bin + HostLibraries=/usr/lib + HostLibraryExecutables=/usr/lib/$_qt/libexec + Spec=linux-g++ + TargetSpec=$_spec + _EOF + # Call it sip-qmake to not override qmake build-helper + # + # XXX: Intentionally quote {C,CXX,LD}FLAGS here but not native. + # - Cross Build: + # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS + # + hardening flags will be picked up from environment variables + # - Native Build: + # + hardening flags will be picked up first (Makefile, qt.conf?) + # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS + # Maybe there're better workaround, I don't know. + cat >"$XBPS_WRAPPERDIR/sip-qmake" <<-_EOF + #!/bin/sh + exec /usr/lib/$_qt/bin/qmake "\$@" \\ + -qtconf "$XBPS_WRAPPERDIR/sip-build/qt.conf" \\ + PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG} \\ + QMAKE_CFLAGS+="\$CFLAGS" \\ + QMAKE_CXXFLAGS+="\$CXXFLAGS" \\ + QMAKE_LFLAGS+="\$LDFLAGS" + _EOF + chmod 755 ${XBPS_WRAPPERDIR}/sip-qmake + else + cat >"${XBPS_WRAPPERDIR}/sip-qmake" <<-_EOF + #!/bin/sh + exec /usr/lib/$_qt/bin/qmake \\ + "\$@" \\ + PREFIX=/usr \\ + QT_INSTALL_PREFIX=/usr \\ + LIB=/usr/lib \\ + QMAKE_CC="$CC" QMAKE_CXX="$CXX" \\ + QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \\ + QMAKE_CFLAGS+="$CFLAGS" \\ + QMAKE_CXXFLAGS+="$CXXFLAGS" \\ + QMAKE_LFLAGS+="$LDFLAGS" \\ + CONFIG+=no_qt_rpath + _EOF + chmod 755 ${XBPS_WRAPPERDIR}/sip-qmake + fi + + sip-build --no-make \ + ${_qt:+--qmake "$XBPS_WRAPPERDIR/sip-qmake"} \ + --api-dir /usr/share/$_qt/qsci/api/python \ + $configure_args \ + --build-dir "$sip_builddir" + + if [ "$CROSS_BUILD" ]; then + # -I/usr/include/python$py3_ver is set by sip-build :( + find "$sip_builddir" -name Makefile | + xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g" + fi +} + +do_build() { + : "${sip_builddir:=build}" + make -C "${sip_builddir}" ${makejobs} +} + +do_install() { + : "${sip_builddir:=build}" + make -C "${sip_builddir}" \ + DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} \ + install +} From 2c73cf27d9a88042592bd4f0e2f9e4dd38465328 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, 24 May 2021 22:51:51 +0700 Subject: [PATCH 2/6] New package: python3-pyqt6-sip-13.1.0 --- srcpkgs/python3-pyqt6-sip/template | 25 +++++++++++++++++++++++++ srcpkgs/python3-pyqt6-sip/update | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 srcpkgs/python3-pyqt6-sip/template create mode 100644 srcpkgs/python3-pyqt6-sip/update diff --git a/srcpkgs/python3-pyqt6-sip/template b/srcpkgs/python3-pyqt6-sip/template new file mode 100644 index 00000000000000..e7f2517c130ebc --- /dev/null +++ b/srcpkgs/python3-pyqt6-sip/template @@ -0,0 +1,25 @@ +# Template file for 'python3-pyqt6-sip' +pkgname=python3-pyqt6-sip +version=13.1.0 +revision=1 +wrksrc="PyQt6_sip-$version" +build_style=python3-module +hostmakedepends="python3-devel python3-setuptools sip" +makedepends="python3-devel" +depends="python3" +short_desc="PyQt6 SIP bindings with C and C++ for Python 3" +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/sip/" +distfiles="${PYPI_SITE}/P/PyQt6_sip/PyQt6_sip-${version}.tar.gz" +checksum=7c31073fe8e6cb8a42e85d60d3a096700a9047c772b354d6227dfe965566ec8a +lib32disabled=yes + +post_extract() { + # for do_check + mkdir -p PyQt6 +} + +post_install() { + vlicense /usr/share/licenses/sip/LICENSE +} diff --git a/srcpkgs/python3-pyqt6-sip/update b/srcpkgs/python3-pyqt6-sip/update new file mode 100644 index 00000000000000..b3e535a20eb49f --- /dev/null +++ b/srcpkgs/python3-pyqt6-sip/update @@ -0,0 +1,2 @@ +site=https://pypi.org/simple/PyQt6-sip +pattern='PyQt6_sip-\K([\d.]+)(?=.tar.gz)' From f82e21fd6c7e3af02cda16974a3cb941b2cabc20 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, 24 May 2021 22:54:59 +0700 Subject: [PATCH 3/6] New package: python3-pyqt6-6.1.1 --- srcpkgs/python3-pyqt6-core | 1 + srcpkgs/python3-pyqt6-core-devel | 1 + srcpkgs/python3-pyqt6-dbus | 1 + srcpkgs/python3-pyqt6-dbus-devel | 1 + srcpkgs/python3-pyqt6-declarative | 1 + srcpkgs/python3-pyqt6-declarative-devel | 1 + srcpkgs/python3-pyqt6-devel | 1 + srcpkgs/python3-pyqt6-devel-tools | 1 + srcpkgs/python3-pyqt6-gui | 1 + srcpkgs/python3-pyqt6-gui-devel | 1 + srcpkgs/python3-pyqt6-network | 1 + srcpkgs/python3-pyqt6-network-devel | 1 + srcpkgs/python3-pyqt6-opengl-widgets | 1 + srcpkgs/python3-pyqt6-opengl-widgets-devel | 1 + srcpkgs/python3-pyqt6-printsupport | 1 + srcpkgs/python3-pyqt6-printsupport-devel | 1 + srcpkgs/python3-pyqt6-quick3d | 1 + srcpkgs/python3-pyqt6-quick3d-devel | 1 + srcpkgs/python3-pyqt6-sql | 1 + srcpkgs/python3-pyqt6-sql-devel | 1 + srcpkgs/python3-pyqt6-svg | 1 + srcpkgs/python3-pyqt6-svg-devel | 1 + srcpkgs/python3-pyqt6-test | 1 + srcpkgs/python3-pyqt6-test-devel | 1 + srcpkgs/python3-pyqt6-tools | 1 + srcpkgs/python3-pyqt6-tools-devel | 1 + srcpkgs/python3-pyqt6-widgets | 1 + srcpkgs/python3-pyqt6-widgets-devel | 1 + srcpkgs/python3-pyqt6-xml | 1 + srcpkgs/python3-pyqt6-xml-devel | 1 + .../patches/pyproject-cross.patch | 20 + srcpkgs/python3-pyqt6/template | 341 ++++++++++++++++++ 32 files changed, 391 insertions(+) create mode 120000 srcpkgs/python3-pyqt6-core create mode 120000 srcpkgs/python3-pyqt6-core-devel create mode 120000 srcpkgs/python3-pyqt6-dbus create mode 120000 srcpkgs/python3-pyqt6-dbus-devel create mode 120000 srcpkgs/python3-pyqt6-declarative create mode 120000 srcpkgs/python3-pyqt6-declarative-devel create mode 120000 srcpkgs/python3-pyqt6-devel create mode 120000 srcpkgs/python3-pyqt6-devel-tools create mode 120000 srcpkgs/python3-pyqt6-gui create mode 120000 srcpkgs/python3-pyqt6-gui-devel create mode 120000 srcpkgs/python3-pyqt6-network create mode 120000 srcpkgs/python3-pyqt6-network-devel create mode 120000 srcpkgs/python3-pyqt6-opengl-widgets create mode 120000 srcpkgs/python3-pyqt6-opengl-widgets-devel create mode 120000 srcpkgs/python3-pyqt6-printsupport create mode 120000 srcpkgs/python3-pyqt6-printsupport-devel create mode 120000 srcpkgs/python3-pyqt6-quick3d create mode 120000 srcpkgs/python3-pyqt6-quick3d-devel create mode 120000 srcpkgs/python3-pyqt6-sql create mode 120000 srcpkgs/python3-pyqt6-sql-devel create mode 120000 srcpkgs/python3-pyqt6-svg create mode 120000 srcpkgs/python3-pyqt6-svg-devel create mode 120000 srcpkgs/python3-pyqt6-test create mode 120000 srcpkgs/python3-pyqt6-test-devel create mode 120000 srcpkgs/python3-pyqt6-tools create mode 120000 srcpkgs/python3-pyqt6-tools-devel create mode 120000 srcpkgs/python3-pyqt6-widgets create mode 120000 srcpkgs/python3-pyqt6-widgets-devel create mode 120000 srcpkgs/python3-pyqt6-xml create mode 120000 srcpkgs/python3-pyqt6-xml-devel create mode 100644 srcpkgs/python3-pyqt6/patches/pyproject-cross.patch create mode 100644 srcpkgs/python3-pyqt6/template diff --git a/srcpkgs/python3-pyqt6-core b/srcpkgs/python3-pyqt6-core new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-core @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-core-devel b/srcpkgs/python3-pyqt6-core-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-core-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-dbus b/srcpkgs/python3-pyqt6-dbus new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-dbus @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-dbus-devel b/srcpkgs/python3-pyqt6-dbus-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-dbus-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-declarative b/srcpkgs/python3-pyqt6-declarative new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-declarative @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-declarative-devel b/srcpkgs/python3-pyqt6-declarative-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-declarative-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-devel b/srcpkgs/python3-pyqt6-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-devel-tools b/srcpkgs/python3-pyqt6-devel-tools new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-devel-tools @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-gui b/srcpkgs/python3-pyqt6-gui new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-gui @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-gui-devel b/srcpkgs/python3-pyqt6-gui-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-gui-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-network b/srcpkgs/python3-pyqt6-network new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-network @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-network-devel b/srcpkgs/python3-pyqt6-network-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-network-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-opengl-widgets b/srcpkgs/python3-pyqt6-opengl-widgets new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-opengl-widgets @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-opengl-widgets-devel b/srcpkgs/python3-pyqt6-opengl-widgets-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-opengl-widgets-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-printsupport b/srcpkgs/python3-pyqt6-printsupport new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-printsupport @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-printsupport-devel b/srcpkgs/python3-pyqt6-printsupport-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-printsupport-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-quick3d b/srcpkgs/python3-pyqt6-quick3d new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-quick3d @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-quick3d-devel b/srcpkgs/python3-pyqt6-quick3d-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-quick3d-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-sql b/srcpkgs/python3-pyqt6-sql new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-sql @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-sql-devel b/srcpkgs/python3-pyqt6-sql-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-sql-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-svg b/srcpkgs/python3-pyqt6-svg new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-svg @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-svg-devel b/srcpkgs/python3-pyqt6-svg-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-svg-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-test b/srcpkgs/python3-pyqt6-test new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-test @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-test-devel b/srcpkgs/python3-pyqt6-test-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-test-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-tools b/srcpkgs/python3-pyqt6-tools new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-tools @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-tools-devel b/srcpkgs/python3-pyqt6-tools-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-tools-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-widgets b/srcpkgs/python3-pyqt6-widgets new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-widgets @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-widgets-devel b/srcpkgs/python3-pyqt6-widgets-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-widgets-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-xml b/srcpkgs/python3-pyqt6-xml new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-xml @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-xml-devel b/srcpkgs/python3-pyqt6-xml-devel new file mode 120000 index 00000000000000..dd603d682349ff --- /dev/null +++ b/srcpkgs/python3-pyqt6-xml-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6/patches/pyproject-cross.patch b/srcpkgs/python3-pyqt6/patches/pyproject-cross.patch new file mode 100644 index 00000000000000..eba520ffc6acbf --- /dev/null +++ b/srcpkgs/python3-pyqt6/patches/pyproject-cross.patch @@ -0,0 +1,20 @@ +Index: PyQt6-6.1.0/project.py +=================================================================== +--- PyQt6-6.1.0.orig/project.py ++++ PyQt6-6.1.0/project.py +@@ -49,6 +49,15 @@ class PyQt(PyQtProject): + # QtNfc, QtPositioning, QtLocation, QtRemoteObjects, QtSensors, + # QtSerialPort, QtTextToSpeech, QtWebChannel, QtWebSockets + ++ def run_command(self, args, *, fatal=True): ++ """ Run a command and display the output if requested. """ ++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE") ++ builddir = os.environ.get("XBPS_BUILDDIR") ++ if qemu_machine and args[0].startswith(os.path.join(builddir, "PyQt6")): ++ qemu = "qemu-{}-static".format(qemu_machine) ++ args.insert(0, qemu) ++ super().run_command(args, fatal=fatal) ++ + def apply_user_defaults(self, tool): + """ Set default values where needed. """ + diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template new file mode 100644 index 00000000000000..78dd4ed3b16aaa --- /dev/null +++ b/srcpkgs/python3-pyqt6/template @@ -0,0 +1,341 @@ +# Template file for 'python3-pyqt6' +pkgname=python3-pyqt6 +version=6.1.1 +revision=1 +wrksrc=PyQt6-$version +build_style=sip-build +build_helper=qemu +configure_args="--confirm-license --dbus $XBPS_CROSS_BASE/usr/include/dbus-1.0" +hostmakedepends="qt6-base-devel qt6-declarative-devel qt6-tools-devel + qt6-quick3d-devel qt6-shadertools-devel qt6-svg-devel python3-dbus + python3-PyQt-builder pkg-config" +makedepends="qt6-base-devel qt6-declarative-devel qt6-tools-devel + qt6-quick3d-devel qt6-shadertools-devel qt6-svg-devel python3-dbus-devel" +depends="python3-pyqt6-sip" +short_desc="Python 3 bindings for Qt6" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-only" +homepage="https://www.riverbankcomputing.com/software/pyqt/" +distfiles="$PYPI_SITE/P/PyQt6/PyQt6-$version.tar.gz" +checksum=8775244fa73f94bfe8ae7672b624e2a903a22bc35d7ea42dd830949e2f9e43c7 +lib32disabled=yes +patch_args=-Np1 + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi + +# Split like qt6, but keep qt6-core in main pkg +# python3-pyqt6-core_package() { +# lib32disabled=yes +# depends="python3-pyqt6-sip>=${version}_${revision}" +# short_desc="${short_desc} - Core" +# pkg_install() { +# vmove "${py3_sitelib}/*.dist-info" +# vmove "${py3_sitelib}/PyQt6/__init__.py" +# vmove "${py3_sitelib}/PyQt6/QtCore.*" +# } +# } + +python3-pyqt6-core-devel_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision} + qt6-base-devel python3-devel sip" + short_desc="${short_desc} - core development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtCore" + } +} + +python3-pyqt6-dbus_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision} python3-dbus" + short_desc="${short_desc} - DBus" + pkg_install() { + vmove "${py3_sitelib}/dbus" + vmove "${py3_sitelib}/PyQt6/QtDBus.*" + } +} + +python3-pyqt6-dbus-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-dbus>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision}" + short_desc="${short_desc} - DBus - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtDBus" + } +} + +python3-pyqt6-tools_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Tools" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtDesigner.*" + vmove "${py3_sitelib}/PyQt6/QtHelp.*" + vmove usr/lib/qt6/plugins/designer + } +} + +python3-pyqt6-tools-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-tools>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision}" + short_desc="${short_desc} - Tools - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtDesigner" + vmove "${py3_sitelib}/PyQt6/bindings/QtHelp" + } +} + +python3-pyqt6-gui_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - GUI" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtGui.*" + vmove "${py3_sitelib}/PyQt6/QtOpenGL.*" + } +} + +python3-pyqt6-gui-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-gui>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision}" + short_desc="${short_desc} - GUI - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtGui" + vmove "${py3_sitelib}/PyQt6/bindings/QtOpenGL" + } +} + +python3-pyqt6-network_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Network" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtNetwork.*" + } +} + +python3-pyqt6-network-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-network>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision}" + short_desc="${short_desc} - Network" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtNetwork" + } +} + +python3-pyqt6-opengl-widgets_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - OpenGL Widgets" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtOpenGLWidgets.*" + } +} + +python3-pyqt6-opengl-widgets-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-opengl-widgets>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision}" + short_desc="${short_desc} - OpenGL Widgets - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtOpenGLWidgets" + } +} + +python3-pyqt6-printsupport_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Print Support" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtPrintSupport.*" + } +} + +python3-pyqt6-printsupport-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-printsupport>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision}" + short_desc="${short_desc} - Print Support - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtPrintSupport" + } +} + +python3-pyqt6-declarative_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Declarative" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtQml.*" + vmove "${py3_sitelib}/PyQt6/QtQuick.*" + vmove "${py3_sitelib}/PyQt6/QtQuickWidgets.*" + vmove usr/lib/qt6/plugins/PyQt6 + } +} + +python3-pyqt6-declarative-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-declarative>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision}" + short_desc="${short_desc} - Declarative - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtQml" + vmove "${py3_sitelib}/PyQt6/bindings/QtQuick" + vmove "${py3_sitelib}/PyQt6/bindings/QtQuickWidgets" + } +} + +python3-pyqt6-quick3d_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Quick3D" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtQuick3D.*" + } +} + +python3-pyqt6-quick3d-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-quick3d>=${version}_${revision} + python3-pyqt6-declarative-devel>=${version}_${revision}" + short_desc="${short_desc} - Quick3D - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtQuick3D" + } +} + +python3-pyqt6-sql_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - SQL" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtSql.*" + } +} + +python3-pyqt6-sql-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-sql>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision}" + short_desc="${short_desc} - SQL - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtSql" + } +} + +python3-pyqt6-svg_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - svg" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtSvg.*" + vmove "${py3_sitelib}/PyQt6/QtSvgWidgets.*" + } +} + +python3-pyqt6-svg-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-svg>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision}" + short_desc="${short_desc} - svg - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtSvg" + vmove "${py3_sitelib}/PyQt6/bindings/QtSvgWidgets" + } +} + +python3-pyqt6-test_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Test" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtTest.*" + } +} + +python3-pyqt6-test-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-test>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision}" + short_desc="${short_desc} - Test - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtTest" + } +} + +python3-pyqt6-widgets_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Widgets" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtWidgets.*" + } +} + +python3-pyqt6-widgets-devel_package() { + lib32disabled=yes + depends="python3-pyqt6-widgets>=${version}_${revision} + python3-pyqt6-gui-devel>=${version}_${revision}" + short_desc="${short_desc} - Widgets" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtWidgets" + } +} + +python3-pyqt6-xml_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - Xml" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtXml.*" + } +} + +python3-pyqt6-xml-devel_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision}" + short_desc="${short_desc} - Xml - development files" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtXml" + } +} + +python3-pyqt6-devel-tools_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development tools" + pkg_install() { + vmove usr/bin + vmove "${py3_sitelib}/PyQt6/lupdate" + vmove "${py3_sitelib}/PyQt6/uic" + } +} + +python3-pyqt6-devel_package() { + lib32disabled=yes + depends=" + python3-pyqt6-core-devel>=${version}_${revision} + python3-pyqt6-dbus-devel>=${version}_${revision} + python3-pyqt6-tools-devel>=${version}_${revision} + python3-pyqt6-gui-devel>=${version}_${revision} + python3-pyqt6-network-devel>=${version}_${revision} + python3-pyqt6-opengl-widgets-devel>=${version}_${revision} + python3-pyqt6-printsupport-devel>=${version}_${revision} + python3-pyqt6-declarative-devel>=${version}_${revision} + python3-pyqt6-quick3d-devel>=${version}_${revision} + python3-pyqt6-sql-devel>=${version}_${revision} + python3-pyqt6-svg-devel>=${version}_${revision} + python3-pyqt6-test-devel>=${version}_${revision} + python3-pyqt6-widgets-devel>=${version}_${revision} + python3-pyqt6-xml-devel>=${version}_${revision} + python3-pyqt6-devel-tools>=${version}_${revision}" + build_style=meta + short_desc="${short_desc} - development files" +} From 625ea36f7232f9a5ece403929ba453a996532690 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, 30 May 2021 23:54:51 +0700 Subject: [PATCH 4/6] New package: python3-pyqt6-charts-6.1.1 --- srcpkgs/python3-pyqt6-charts-devel | 1 + srcpkgs/python3-pyqt6-charts/template | 26 ++++++++++++++++++++++++++ srcpkgs/python3-pyqt6-charts/update | 2 ++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/python3-pyqt6-charts-devel create mode 100644 srcpkgs/python3-pyqt6-charts/template create mode 100644 srcpkgs/python3-pyqt6-charts/update diff --git a/srcpkgs/python3-pyqt6-charts-devel b/srcpkgs/python3-pyqt6-charts-devel new file mode 120000 index 00000000000000..21a5afd07fc89e --- /dev/null +++ b/srcpkgs/python3-pyqt6-charts-devel @@ -0,0 +1 @@ +python3-pyqt6-charts \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-charts/template b/srcpkgs/python3-pyqt6-charts/template new file mode 100644 index 00000000000000..17a6c1334a96d1 --- /dev/null +++ b/srcpkgs/python3-pyqt6-charts/template @@ -0,0 +1,26 @@ +# Template file for 'python3-pyqt6-charts' +pkgname=python3-pyqt6-charts +version=6.1.1 +revision=1 +wrksrc=PyQt6_Charts-$version +build_style=sip-build +hostmakedepends="qt6-charts-devel python3-pyqt6-widgets-devel + python3-PyQt-builder pkg-config" +makedepends="qt6-charts-devel python3-pyqt6-widgets-devel" +depends="python3-pyqt6" +short_desc="Qt6 bindings for Charts - Python 3" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-only" +homepage="https://www.riverbankcomputing.com/software/pyqtchart/" +distfiles="$PYPI_SITE/P/PyQt6-Charts/PyQt6_Charts-${version}.tar.gz" +checksum=258416a5c8148cc824dede64b37ede08f14e1f90ef7e3c11e411b1b03268fee2 +lib32disabled=yes + +python3-pyqt6-charts-devel_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" + short_desc+=" - development files" + pkg_install() { + vmove ${py3_sitelib}/PyQt6/bindings + } +} diff --git a/srcpkgs/python3-pyqt6-charts/update b/srcpkgs/python3-pyqt6-charts/update new file mode 100644 index 00000000000000..783ec1b7e7ba8b --- /dev/null +++ b/srcpkgs/python3-pyqt6-charts/update @@ -0,0 +1,2 @@ +site=https://pypi.org/simple/PyQt6-Charts +pattern='PyQt6_Charts-\K([\d.]+)(?=.tar.gz)' From 31adadc9db1fc10766729c92e0716749aa558068 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, 31 May 2021 14:40:07 +0700 Subject: [PATCH 5/6] New package: python3-pyqt6-3d-6.1.1 --- srcpkgs/python3-pyqt6-3d-devel | 1 + srcpkgs/python3-pyqt6-3d/template | 26 ++++++++++++++++++++++++++ srcpkgs/python3-pyqt6-3d/update | 2 ++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/python3-pyqt6-3d-devel create mode 100644 srcpkgs/python3-pyqt6-3d/template create mode 100644 srcpkgs/python3-pyqt6-3d/update diff --git a/srcpkgs/python3-pyqt6-3d-devel b/srcpkgs/python3-pyqt6-3d-devel new file mode 120000 index 00000000000000..129722a79e7bcc --- /dev/null +++ b/srcpkgs/python3-pyqt6-3d-devel @@ -0,0 +1 @@ +python3-pyqt6-3d \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-3d/template b/srcpkgs/python3-pyqt6-3d/template new file mode 100644 index 00000000000000..3986b2a419346a --- /dev/null +++ b/srcpkgs/python3-pyqt6-3d/template @@ -0,0 +1,26 @@ +# Template file for 'python3-pyqt6-3d' +pkgname=python3-pyqt6-3d +version=6.1.1 +revision=1 +wrksrc=PyQt6_3D-$version +build_style=sip-build +hostmakedepends="python3-pyqt6-gui-devel qt6-3d-devel + python3-PyQt-builder pkg-config" +makedepends="python3-pyqt6-gui-devel qt6-3d-devel" +depends="python3-pyqt6" +short_desc="Qt6 bindings for 3D - Python 3" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-only" +homepage="https://www.riverbankcomputing.com/software/pyqt3d/" +distfiles="$PYPI_SITE/P/PyQt6-3D/PyQt6_3D-${version}.tar.gz" +checksum=f0277c04ac62f065cdd3f740a2149d260a5909e51df9fbb63e5ed83cebbe44f4 +lib32disabled=yes + +python3-pyqt6-3d-devel_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" + short_desc+=" - development files" + pkg_install() { + vmove ${py3_sitelib}/PyQt6/bindings + } +} diff --git a/srcpkgs/python3-pyqt6-3d/update b/srcpkgs/python3-pyqt6-3d/update new file mode 100644 index 00000000000000..6877724b1356f0 --- /dev/null +++ b/srcpkgs/python3-pyqt6-3d/update @@ -0,0 +1,2 @@ +site=https://pypi.org/simple/PyQt6-3D +pattern='PyQt6_3D-\K([\d.]+)(?=.tar.gz)' From 18e136d87428b27650d8d68459acc78467dde861 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, 31 May 2021 15:20:07 +0700 Subject: [PATCH 6/6] New package: python3-pyqt6-networkauth-6.1.1 --- srcpkgs/python3-pyqt6-networkauth-devel | 1 + srcpkgs/python3-pyqt6-networkauth/template | 26 ++++++++++++++++++++++ srcpkgs/python3-pyqt6-networkauth/update | 2 ++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/python3-pyqt6-networkauth-devel create mode 100644 srcpkgs/python3-pyqt6-networkauth/template create mode 100644 srcpkgs/python3-pyqt6-networkauth/update diff --git a/srcpkgs/python3-pyqt6-networkauth-devel b/srcpkgs/python3-pyqt6-networkauth-devel new file mode 120000 index 00000000000000..0d76b4e1cd2d2d --- /dev/null +++ b/srcpkgs/python3-pyqt6-networkauth-devel @@ -0,0 +1 @@ +python3-pyqt6-networkauth \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-networkauth/template b/srcpkgs/python3-pyqt6-networkauth/template new file mode 100644 index 00000000000000..e5142193c69e0d --- /dev/null +++ b/srcpkgs/python3-pyqt6-networkauth/template @@ -0,0 +1,26 @@ +# Template file for 'python3-pyqt6-networkauth' +pkgname=python3-pyqt6-networkauth +version=6.1.1 +revision=1 +wrksrc=PyQt6_NetworkAuth-$version +build_style=sip-build +hostmakedepends="python3-pyqt6-network-devel qt6-networkauth-devel + python3-PyQt-builder pkg-config" +makedepends="python3-pyqt6-network-devel qt6-networkauth-devel" +depends="python3-pyqt6" +short_desc="Qt6 bindings for NetworkAuth - Python 3" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-only" +homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/" +distfiles="$PYPI_SITE/P/PyQt6-NetworkAuth/PyQt6_NetworkAuth-${version}.tar.gz" +checksum=1590118cef920adcef55022246994d5dfcc64cb7504bdd17eac92ffeb4a21dbe +lib32disabled=yes + +python3-pyqt6-networkauth-devel_package() { + lib32disabled=yes + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" + short_desc+=" - development files" + pkg_install() { + vmove ${py3_sitelib}/PyQt6/bindings + } +} diff --git a/srcpkgs/python3-pyqt6-networkauth/update b/srcpkgs/python3-pyqt6-networkauth/update new file mode 100644 index 00000000000000..2e83411a72ecbf --- /dev/null +++ b/srcpkgs/python3-pyqt6-networkauth/update @@ -0,0 +1,2 @@ +site=https://pypi.org/simple/PyQt6-NetworkAuth +pattern='PyQt6_NetworkAuth-\K([\d.]+)(?=.tar.gz)'