[arch-commits] Commit in pyside6/trunk (PKGBUILD fix-includes.patch)

[Antonio Rojas]

    Date: Friday, March 11, 2022 @ 09:42:04
  Author: arojas
Revision: 439410

Merge shiboken6

Added:
  pyside6/trunk/fix-includes.patch
Modified:
  pyside6/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   73 +++++++++++++++++++++++++++++++++------------------
 fix-includes.patch |   13 +++++++++
 2 files changed, 61 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-11 08:33:39 UTC (rev 439409)
+++ PKGBUILD	2022-03-11 09:42:04 UTC (rev 439410)
@@ -1,62 +1,85 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
-pkgname=pyside6
+pkgbase=pyside6
+pkgname=(shiboken6 pyside6)
 _qtver=6.2.3
+_clangver=13.0.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='https://www.qt.io'
 license=(LGPL)
-pkgdesc='Enables the use of Qt6 APIs in Python applications'
-depends=(shiboken6 qt6-declarative)
-makedepends=(cmake ninja python-setuptools vulkan-headers python-numpy
+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)
-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')
 _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
+        fix-includes.patch)
 sha256sums=('70d55e8fe977ffe094bba51119d16d37e0736df8693787110b127a2b4bd00003'
-            '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0')
+            '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/sources/pyside6 -G Ninja \
+  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() {
-  DESTDIR="$pkgdir" cmake --install 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/PySide6/*.pyi -t "$pkgdir"/usr/lib/python*/site-packages/PySide6
+  install -Dm644 "$srcdir"/build/sources/pyside6/PySide6/*.pyi -t "$pkgdir"/usr/lib/python*/site-packages/PySide6
 }

Added: fix-includes.patch
===================================================================
--- fix-includes.patch	                        (rev 0)
+++ fix-includes.patch	2022-03-11 09:42:04 UTC (rev 439410)
@@ -0,0 +1,13 @@
+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>
+ 
+ //////////////////////////////////////////////////////////////////////////////
+ //