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

[Antonio Rojas]

    Date: Wednesday, April 20, 2022 @ 17:13:03
  Author: arojas
Revision: 442973

Use upstream build fix

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-20 17:10:50 UTC (rev 442972)
+++ PKGBUILD	2022-04-20 17:13:03 UTC (rev 442973)
@@ -17,15 +17,15 @@
 _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)
+        pyside6-fix-build.patch::https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=703d975f)
 sha256sums=('9d808d617c8daa2fe074f9a481478dc923a9799b5c89f6c5af38ece111ed57e2'
             '66e895e07d5b01c64a94092353854c946fd7fc445b6181068dca290b5a3887e0'
-            '34ea90b4576991bffa0a79349c9f0d80f9d6eafd6f519d86f5dc92dfe4f8ceb4')
+            'c8aa9518edb792793d30e7ee8b77bfbdc4c408bdb6ac4d208813092cdbf7f6ae')
 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
+  patch -d $_pkgfn -p1 < pyside6-fix-build.patch # https://bugreports.qt.io/browse/PYSIDE-1890
 }
 
 build() {

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2022-04-20 17:10:50 UTC (rev 442972)
+++ fix-build.patch	2022-04-20 17:13:03 UTC (rev 442973)
@@ -1,13 +0,0 @@
-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__
-