Date: Monday, January 9, 2023 @ 19:44:49
Author: arojas
Revision: 466294
archrelease: copy trunk to extra-x86_64
Added:
pyside6/repos/extra-x86_64/PKGBUILD
(from rev 466293, pyside6/trunk/PKGBUILD)
pyside6/repos/extra-x86_64/designer-plugin-install-dir.patch
(from rev 466293, pyside6/trunk/designer-plugin-install-dir.patch)
Deleted:
pyside6/repos/extra-x86_64/PKGBUILD
pyside6/repos/extra-x86_64/designer-plugin-install-dir.patch
pyside6/repos/extra-x86_64/pysidebug-2127.patch
-----------------------------------+
PKGBUILD | 172 +++++++++++++++++-------------------
designer-plugin-install-dir.patch | 20 ++--
pysidebug-2127.patch | 33 ------
3 files changed, 94 insertions(+), 131 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-09 19:44:38 UTC (rev 466293)
+++ PKGBUILD 2023-01-09 19:44:49 UTC (rev 466294)
@@ -1,88 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-
-pkgbase=pyside6
-pkgname=(shiboken6 pyside6)
-_qtver=6.4.1
-_clangver=14.0.6
-pkgver=${_qtver/-/}
-pkgrel=2
-arch=(x86_64)
-url='https://www.qt.io'
-license=(LGPL)
-makedepends=(cmake ninja clang llvm python-setuptools vulkan-headers
python-numpy
- qt6-tools qt6-svg qt6-3d qt6-scxml qt6-datavis3d qt6-charts
qt6-multimedia qt6-quick3d
- qt6-positioning qt6-networkauth qt6-remoteobjects qt6-sensors
qt6-serialport qt6-connectivity
- 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
- pysidebug-2127.patch)
-sha256sums=('807954ce284e1137475f78faf3bcf0ae9d17ec3690d1a43d09c98e973a3d556b'
- '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() {
- cmake -B build -S $_pkgfn -G Ninja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DBUILD_TESTS=OFF
- PYTHONPATH="$PWD"/build/sources \
- cmake --build build
-}
-
-package_shiboken6() {
- pkgdesc='Generates bindings for C++ libraries using CPython source code'
- depends=(clang=$_clangver llvm libxslt qt6-base)
- optdepends=('python: Python bindings')
-
- DESTDIR="$pkgdir" cmake --install build/sources/shiboken6
-
-# 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'))"`
- cp -r shiboken6.egg-info "$pkgdir"/$_pythonpath
-}
-
-package_pyside6() {
- pkgdesc='Enables the use of Qt6 APIs in Python applications'
- depends=(qt6-declarative shiboken6)
- optdepends=('qt6-tools: QtHelp, QtUiTools bindings'
- 'qt6-svg: QtSvg bindings'
- 'qt6-3d: Qt3D bindings'
- 'qt6-quick3d: QtQuick3D bindings'
- 'qt6-scxml: QtScxml bindings'
- 'qt6-datavis3d: QtDataVisualization bindings'
- 'qt6-charts: QtCharts bindings'
- 'qt6-httpserver: QtHttpServer bindings'
- 'qt6-multimedia: QtMultimedia bindings'
- 'qt6-serialport: QtSerialPort bindings'
- 'qt6-speech: QtTextToSpeech bindings'
- 'qt6-webengine: QtWebEngine bindings'
- 'qt6-remoteobjects: QtRemoteObjects bindings'
- 'qt6-sensors: QtSensors bindings'
- 'qt6-websockets: QtWebSockets bindings'
- 'qt6-networkauth: QtNetworkAuth bindings')
-
- DESTDIR="$pkgdir" cmake --install build/sources/pyside6
-
-# 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'))"`
- cp -r PySide6.egg-info "$pkgdir"/$_pythonpath
-
-# Install pyi files
- install -Dm644 "$srcdir"/build/sources/pyside6/PySide6/*.pyi -t
"$pkgdir"/usr/lib/python*/site-packages/PySide6
-}
Copied: pyside6/repos/extra-x86_64/PKGBUILD (from rev 466293,
pyside6/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-09 19:44:49 UTC (rev 466294)
@@ -0,0 +1,84 @@
+# Maintainer: Antonio Rojas <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+
+pkgbase=pyside6
+pkgname=(shiboken6 pyside6)
+_qtver=6.4.2
+_clangver=14.0.6
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(x86_64)
+url='https://www.qt.io'
+license=(LGPL)
+makedepends=(cmake ninja clang llvm python-setuptools vulkan-headers
python-numpy
+ qt6-tools qt6-svg qt6-3d qt6-scxml qt6-datavis3d qt6-charts
qt6-multimedia qt6-quick3d
+ qt6-positioning qt6-networkauth qt6-remoteobjects qt6-sensors
qt6-serialport qt6-connectivity
+ 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)
+sha256sums=('1ec9d0936332efd229650cf10fed36cadddff7a613a2ea6e897de4d504c1b505'
+ '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0')
+options=(debug)
+
+prepare() {
+ patch -d $_pkgfn -p1 < designer-plugin-install-dir.patch # Fix designer
plugin install dir
+}
+
+build() {
+ cmake -B build -S $_pkgfn -G Ninja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_TESTS=OFF
+ PYTHONPATH="$PWD"/build/sources \
+ cmake --build build
+}
+
+package_shiboken6() {
+ pkgdesc='Generates bindings for C++ libraries using CPython source code'
+ depends=(clang=$_clangver llvm libxslt qt6-base)
+ optdepends=('python: Python bindings')
+
+ DESTDIR="$pkgdir" cmake --install build/sources/shiboken6
+
+# 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'))"`
+ cp -r shiboken6.egg-info "$pkgdir"/$_pythonpath
+}
+
+package_pyside6() {
+ pkgdesc='Enables the use of Qt6 APIs in Python applications'
+ depends=(qt6-declarative shiboken6)
+ optdepends=('qt6-tools: QtHelp, QtUiTools bindings'
+ 'qt6-svg: QtSvg bindings'
+ 'qt6-3d: Qt3D bindings'
+ 'qt6-quick3d: QtQuick3D bindings'
+ 'qt6-scxml: QtScxml bindings'
+ 'qt6-datavis3d: QtDataVisualization bindings'
+ 'qt6-charts: QtCharts bindings'
+ 'qt6-httpserver: QtHttpServer bindings'
+ 'qt6-multimedia: QtMultimedia bindings'
+ 'qt6-serialport: QtSerialPort bindings'
+ 'qt6-speech: QtTextToSpeech bindings'
+ 'qt6-webengine: QtWebEngine bindings'
+ 'qt6-remoteobjects: QtRemoteObjects bindings'
+ 'qt6-sensors: QtSensors bindings'
+ 'qt6-websockets: QtWebSockets bindings'
+ 'qt6-networkauth: QtNetworkAuth bindings')
+
+ DESTDIR="$pkgdir" cmake --install build/sources/pyside6
+
+# Install egg-info
+ export PATH="/usr/lib/qt6/bin:$PATH"
+ cd $_pkgfn
+ python setup.py egg_info --build-type=pyside6
+ _pythonpath=`python -c "from sysconfig import get_path;
print(get_path('platlib'))"`
+ cp -r PySide6.egg-info "$pkgdir"/$_pythonpath
+
+# Install pyi files
+ install -Dm644 "$srcdir"/build/sources/pyside6/PySide6/*.pyi -t
"$pkgdir"/usr/lib/python*/site-packages/PySide6
+}
Deleted: designer-plugin-install-dir.patch
===================================================================
--- designer-plugin-install-dir.patch 2023-01-09 19:44:38 UTC (rev 466293)
+++ designer-plugin-install-dir.patch 2023-01-09 19:44:49 UTC (rev 466294)
@@ -1,10 +0,0 @@
-diff --git a/sources/pyside6/plugins/designer/CMakeLists.txt
b/sources/pyside6/plugins/designer/CMakeLists.txt
-index 50074be51..5d6064606 100644
---- a/sources/pyside6/plugins/designer/CMakeLists.txt
-+++ b/sources/pyside6/plugins/designer/CMakeLists.txt
-@@ -53,4 +53,4 @@ target_link_libraries(PySidePlugin PRIVATE
- Qt::Widgets
- ${SHIBOKEN_PYTHON_LIBRARIES})
-
--install(TARGETS PySidePlugin LIBRARY DESTINATION "plugins/designer")
-+install(TARGETS PySidePlugin LIBRARY DESTINATION "lib/qt6/plugins/designer")
Copied: pyside6/repos/extra-x86_64/designer-plugin-install-dir.patch (from rev
466293, pyside6/trunk/designer-plugin-install-dir.patch)
===================================================================
--- designer-plugin-install-dir.patch (rev 0)
+++ designer-plugin-install-dir.patch 2023-01-09 19:44:49 UTC (rev 466294)
@@ -0,0 +1,10 @@
+diff --git a/sources/pyside6/plugins/designer/CMakeLists.txt
b/sources/pyside6/plugins/designer/CMakeLists.txt
+index 50074be51..5d6064606 100644
+--- a/sources/pyside6/plugins/designer/CMakeLists.txt
++++ b/sources/pyside6/plugins/designer/CMakeLists.txt
+@@ -53,4 +53,4 @@ target_link_libraries(PySidePlugin PRIVATE
+ Qt::Widgets
+ ${SHIBOKEN_PYTHON_LIBRARIES})
+
+-install(TARGETS PySidePlugin LIBRARY DESTINATION "plugins/designer")
++install(TARGETS PySidePlugin LIBRARY DESTINATION "lib/qt6/plugins/designer")
Deleted: pysidebug-2127.patch
===================================================================
--- pysidebug-2127.patch 2023-01-09 19:44:38 UTC (rev 466293)
+++ pysidebug-2127.patch 2023-01-09 19:44:49 UTC (rev 466294)
@@ -1,33 +0,0 @@
-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
