git » pyside2.git » commit 5ebe2d3

Update to 5.15.2.1

author Antonio Rojas
2022-01-14 08:40:21 UTC
committer Antonio Rojas
2022-01-14 08:40:21 UTC
parent 038a7691582cd426c8eba456a148686cb295aba0

Update to 5.15.2.1

PKGBUILD +6 -13
python310.patch +0 -23

diff --git a/PKGBUILD b/PKGBUILD
index 2f14150..9afbc70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 
 pkgname=pyside2
-_qtver=5.15.2
+_qtver=5.15.2.1
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(LGPL)
@@ -34,18 +34,11 @@ conflicts=(python-pyside2)
 provides=(python-pyside2 qt5-python-bindings)
 replaces=(python-pyside2)
 _pkgfqn=pyside-setup-opensource-src-$_qtver
-source=("https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/${_pkgfqn}.tar.xz"
-        python310.patch)
-sha256sums=('b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418'
-            'ae896a09d18ef215243175fce047d8c370ab4a2d77ed0022991ed70bd23a30d0')
-
-prepare() {
-  cd ${_pkgfqn}
-  patch -Np1 -i ../python310.patch
-}
+source=(https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/${_pkgfqn}.tar.gz)
+sha256sums=('91e78e4e3b31ebb0053c2e4f1029703e578615695450c0dd03072248d713b391')
 
 build() {
-  cmake -B build -S ${_pkgfqn}/sources/pyside2 \
+  cmake -B build -S ${_pkgfqn%.*}/sources/pyside2 \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_TESTS=OFF \
     -DPYTHON_EXECUTABLE=/usr/bin/python
@@ -56,7 +49,7 @@ package() {
   DESTDIR="$pkgdir" cmake --install build
 
 # Install egg-info
-  cd $_pkgfqn
+  cd ${_pkgfqn%.*}
   python setup.py egg_info --build-type=pyside2
   _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
   cp -r PySide2.egg-info "$pkgdir"/$_pythonpath
diff --git a/python310.patch b/python310.patch
deleted file mode 100644
index fd70e1c..0000000
--- a/python310.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -upr pyside-setup-opensource-src-5.15.2.orig/build_scripts/config.py pyside-setup-opensource-src-5.15.2/build_scripts/config.py
---- pyside-setup-opensource-src-5.15.2.orig/build_scripts/config.py	2020-11-11 14:51:30.000000000 +0200
-+++ pyside-setup-opensource-src-5.15.2/build_scripts/config.py	2021-12-01 15:36:17.120806984 +0200
-@@ -93,6 +93,7 @@ class Config(object):
-             'Programming Language :: Python :: 3.7',
-             'Programming Language :: Python :: 3.8',
-             'Programming Language :: Python :: 3.9',
-+            'Programming Language :: Python :: 3.10',
-         ]
- 
-         self.setup_script_dir = None
-diff -upr pyside-setup-opensource-src-5.15.2.orig/sources/pyside2/libpyside/feature_select.cpp pyside-setup-opensource-src-5.15.2/sources/pyside2/libpyside/feature_select.cpp
---- pyside-setup-opensource-src-5.15.2.orig/sources/pyside2/libpyside/feature_select.cpp	2020-11-11 14:51:30.000000000 +0200
-+++ pyside-setup-opensource-src-5.15.2/sources/pyside2/libpyside/feature_select.cpp	2021-12-01 15:39:40.356426568 +0200
-@@ -405,6 +405,8 @@ static inline PyObject *SelectFeatureSet
-             if (!SelectFeatureSetSubtype(sub_type, select_id))
-                 break;
-         }
-+        // PYSIDE-1436: Clear all caches for the type and subtypes.
-+        PyType_Modified(type);
-     }
-     return type->tp_dict;
- }