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

[Antonio Rojas]

    Date: Sunday, April 17, 2022 @ 10:58:22
  Author: arojas
Revision: 442864

Update to 6.3.0

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

-----------------+
 PKGBUILD        |   13 +++++++------
 fix-build.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-17 10:36:55 UTC (rev 442863)
+++ PKGBUILD	2022-04-17 10:58:22 UTC (rev 442864)
@@ -3,7 +3,7 @@
 
 pkgbase=pyside6
 pkgname=(shiboken6 pyside6)
-_qtver=6.2.4
+_qtver=6.3.0
 _clangver=13.0.1
 pkgver=${_qtver/-/}
 pkgrel=1
@@ -16,15 +16,16 @@
              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)
-sha256sums=('d9680ff298ee8b01a68de20911c60da04568a0918b3062d4c571ef170b4603ff'
-            '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0')
+        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
-# https://bugreports.qt.io/browse/PYSIDE-1862
-  ln -sr $_pkgfn/sources/shiboken6/libshiboken/signature/signature_p.h -t $_pkgfn/sources/shiboken6/libshiboken/ 
+  patch -d $_pkgfn -p1 < fix-build.patch # https://bugreports.qt.io/browse/PYSIDE-1890
 }
 
 build() {

Added: fix-build.patch
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2022-04-17 10:58:22 UTC (rev 442864)
@@ -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__
+