[arch-commits] Commit in pyside6/repos/extra-x86_64 (6 files)
Antonio Rojas
arojas at gemini.archlinux.org
Sun Apr 17 10:58:39 UTC 2022
Date: Sunday, April 17, 2022 @ 10:58:38
Author: arojas
Revision: 442865
archrelease: copy trunk to extra-x86_64
Added:
pyside6/repos/extra-x86_64/PKGBUILD
(from rev 442864, pyside6/trunk/PKGBUILD)
pyside6/repos/extra-x86_64/designer-plugin-install-dir.patch
(from rev 442864, pyside6/trunk/designer-plugin-install-dir.patch)
pyside6/repos/extra-x86_64/fix-build.patch
(from rev 442864, pyside6/trunk/fix-build.patch)
Deleted:
pyside6/repos/extra-x86_64/PKGBUILD
pyside6/repos/extra-x86_64/designer-plugin-install-dir.patch
pyside6/repos/extra-x86_64/fix-includes.patch
-----------------------------------+
PKGBUILD | 170 ++++++++++++++++++------------------
designer-plugin-install-dir.patch | 20 ++--
fix-build.patch | 13 ++
fix-includes.patch | 13 --
4 files changed, 108 insertions(+), 108 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-17 10:58:22 UTC (rev 442864)
+++ PKGBUILD 2022-04-17 10:58:38 UTC (rev 442865)
@@ -1,85 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=pyside6
-pkgname=(shiboken6 pyside6)
-_qtver=6.2.4
-_clangver=13.0.1
-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)
-_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
- fix-includes.patch)
-sha256sums=('d9680ff298ee8b01a68de20911c60da04568a0918b3062d4c571ef170b4603ff'
- '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0'
- 'eee89b0ad67ac97724ea59a2d94225f3a348c194c01c58b34a757c00f42ce2d2')
-options=(debug)
-
-prepare() {
- patch -d $_pkgfn -p1 < designer-plugin-install-dir.patch # Fix designer plugin install dir
- patch -d $_pkgfn -p1 < fix-includes.patch
-}
-
-build() {
- cmake -B build -S $_pkgfn -G Ninja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DBUILD_TESTS=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python
- 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"
- 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-multimedia: QtMultimedia bindings'
- 'qt6-serialport: QtSerialPort 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
-}
Copied: pyside6/repos/extra-x86_64/PKGBUILD (from rev 442864, pyside6/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-17 10:58:38 UTC (rev 442865)
@@ -0,0 +1,85 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=pyside6
+pkgname=(shiboken6 pyside6)
+_qtver=6.3.0
+_clangver=13.0.1
+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)
+_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
+ fix-build.patch)
+sha256sums=('9d808d617c8daa2fe074f9a481478dc923a9799b5c89f6c5af38ece111ed57e2'
+ '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0'
+ '34ea90b4576991bffa0a79349c9f0d80f9d6eafd6f519d86f5dc92dfe4f8ceb4')
+options=(debug)
+
+prepare() {
+ patch -d $_pkgfn -p1 < designer-plugin-install-dir.patch # Fix designer plugin install dir
+ patch -d $_pkgfn -p1 < fix-build.patch # https://bugreports.qt.io/browse/PYSIDE-1890
+}
+
+build() {
+ cmake -B build -S $_pkgfn -G Ninja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_TESTS=OFF \
+ -DPYTHON_EXECUTABLE=/usr/bin/python
+ 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"
+ 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-multimedia: QtMultimedia bindings'
+ 'qt6-serialport: QtSerialPort 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 2022-04-17 10:58:22 UTC (rev 442864)
+++ designer-plugin-install-dir.patch 2022-04-17 10:58:38 UTC (rev 442865)
@@ -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 442864, pyside6/trunk/designer-plugin-install-dir.patch)
===================================================================
--- designer-plugin-install-dir.patch (rev 0)
+++ designer-plugin-install-dir.patch 2022-04-17 10:58:38 UTC (rev 442865)
@@ -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")
Copied: pyside6/repos/extra-x86_64/fix-build.patch (from rev 442864, pyside6/trunk/fix-build.patch)
===================================================================
--- fix-build.patch (rev 0)
+++ fix-build.patch 2022-04-17 10:58:38 UTC (rev 442865)
@@ -0,0 +1,13 @@
+diff --git a/sources/pyside6/PySide6/__init__.py.in b/sources/pyside6/PySide6/__init__.py.in
+index d8439985d..5788ca57d 100644
+--- a/sources/pyside6/PySide6/__init__.py.in
++++ b/sources/pyside6/PySide6/__init__.py.in
+@@ -123,7 +123,7 @@ def _find_all_qt_modules():
+ location = Path(__file__).resolve().parent
+
+ # Note: We should _not_ call this function while still building, but use the existing value!
+- in_build = location.parents[1].name == "build"
++ in_build = location.parents[2].name == "build"
+ if in_build:
+ return __all__
+
Deleted: fix-includes.patch
===================================================================
--- fix-includes.patch 2022-04-17 10:58:22 UTC (rev 442864)
+++ fix-includes.patch 2022-04-17 10:58:38 UTC (rev 442865)
@@ -1,13 +0,0 @@
-diff --git a/sources/pyside6/libpyside/feature_select.cpp b/sources/pyside6/libpyside/feature_select.cpp
-index 9459e1ca9..c9f166107 100644
---- a/sources/pyside6/libpyside/feature_select.cpp
-+++ b/sources/pyside6/libpyside/feature_select.cpp
-@@ -44,7 +44,7 @@
-
- #include <shiboken.h>
- #include <sbkfeature_base.h>
--#include <signature_p.h>
-+#include <signature/signature_p.h>
-
- //////////////////////////////////////////////////////////////////////////////
- //
More information about the arch-commits
mailing list