Date: Friday, November 25, 2022 @ 08:15:17
Author: arojas
Revision: 462358
upgpkg: pyside6 6.4.1-2: Use upstream build fix
Added:
pyside6/trunk/pysidebug-2127.patch
Modified:
pyside6/trunk/PKGBUILD
----------------------+
PKGBUILD | 15 +++++++++------
pysidebug-2127.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-25 05:34:28 UTC (rev 462357)
+++ PKGBUILD 2022-11-25 08:15:17 UTC (rev 462358)
@@ -6,7 +6,7 @@
_qtver=6.4.1
_clangver=14.0.6
pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
arch=(x86_64)
url='https://www.qt.io'
license=(LGPL)
@@ -16,13 +16,16 @@
qt6-webchannel qt6-webengine qt6-websockets qt6-shadertools
qt6-speech qt6-httpserver)
_pkgfn=pyside-setup-opensource-src-$_qtver
source=(https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-$pkgver-src/${_pkgfn}.tar.xz
- designer-plugin-install-dir.patch)
+ designer-plugin-install-dir.patch
+ pysidebug-2127.patch)
sha256sums=('807954ce284e1137475f78faf3bcf0ae9d17ec3690d1a43d09c98e973a3d556b'
- '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0')
+ '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0'
+ '54e5968cf36083c454cfc86453122276c865203b846db153a276e69a0a8a7121')
options=(debug)
prepare() {
patch -d $_pkgfn -p1 < designer-plugin-install-dir.patch # Fix designer
plugin install dir
+ patch -d $_pkgfn -p1 < pysidebug-2127.patch # Fix build
}
build() {
@@ -29,9 +32,7 @@
cmake -B build -S $_pkgfn -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=None \
- -DBUILD_TESTS=OFF \
- -DMINIMUM_PYTHON_VERSION="(3,10)" \
- -DMAXIMUM_PYTHON_VERSION="(3,20)"
+ -DBUILD_TESTS=OFF
PYTHONPATH="$PWD"/build/sources \
cmake --build build
}
@@ -45,6 +46,7 @@
# Install egg-info
export PATH="/usr/lib/qt6/bin:$PATH"
+ export SETUPTOOLS_USE_DISTUTILS=stdlib
cd $_pkgfn
python setup.py egg_info --build-type=shiboken6
_pythonpath=`python -c "from sysconfig import get_path;
print(get_path('platlib'))"`
@@ -75,6 +77,7 @@
# Install egg-info
export PATH="/usr/lib/qt6/bin:$PATH"
+ export SETUPTOOLS_USE_DISTUTILS=stdlib
cd $_pkgfn
python setup.py egg_info --build-type=pyside6
_pythonpath=`python -c "from sysconfig import get_path;
print(get_path('platlib'))"`
Added: pysidebug-2127.patch
===================================================================
--- pysidebug-2127.patch (rev 0)
+++ pysidebug-2127.patch 2022-11-25 08:15:17 UTC (rev 462358)
@@ -0,0 +1,33 @@
+From 34e8eb569b865259055558384f91b7eeb4e27958 Mon Sep 17 00:00:00 2001
+From: Christian Tismer <[email protected]>
+Date: Thu, 24 Nov 2022 10:24:58 +0100
+Subject: Fix a cmake-only build
+
+pyminver was computed by cmake and evaluated by parser.py .
+A recent refactoring extracted a computed string in a
+wrong way.
+
+Change-Id: Ia8264294ad0e050863ea912a9fee15792bed8f10
+Pick-to: 6.4
+Fixes: PYSIDE-2127
+Fixes: PYSIDE-2128
+Reviewed-by: Friedemann Kleint <[email protected]>
+---
+ .../shibokenmodule/files.dir/shibokensupport/signature/parser.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git
a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
+index be82a4f92..66d79ad27 100644
+---
a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
++++
b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
+@@ -69,7 +69,7 @@ def _get_flag_enum_option():
+ flag = getattr(sys, sysname)
+ if not isinstance(flag, int):
+ flag = True
+- p = f"\n *** Python is at version {'.'.join(map(str, pyminver))} now."
++ p = f"\n *** Python is at version {'.'.join(map(str, pyminver or
(0,)))} now."
+ # PYSIDE-1797: Emit a warning when we may remove pep384_issue33738.cpp
+ if pyminver and pyminver >= (3, 8):
+ warnings.warn(f"{p} The file pep384_issue33738.cpp should be removed
ASAP! ***")
+--
+cgit v1.2.1
