[arch-commits] Commit in python-kivy/trunk (PKGBUILD py38.patch)

[Felix Yan]

    Date: Wednesday, December 16, 2020 @ 19:09:15
  Author: felixonmars
Revision: 776897

upgpkg: python-kivy 2.0.0-1

Modified:
  python-kivy/trunk/PKGBUILD
Deleted:
  python-kivy/trunk/py38.patch

------------+
 PKGBUILD   |   20 +++++++++-----------
 py38.patch |   16 ----------------
 2 files changed, 9 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-16 18:55:27 UTC (rev 776896)
+++ PKGBUILD	2020-12-16 19:09:15 UTC (rev 776897)
@@ -4,8 +4,8 @@
 # Contributor: mid-kid <esteve.varela at gmail.com>
 
 pkgname=python-kivy
-pkgver=1.11.1
-pkgrel=3
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A software library for rapid development of hardware-accelerated multitouch applications."
 arch=('x86_64')
 url="https://kivy.org/"
@@ -15,10 +15,8 @@
 checkdepends=('python-pytest' 'python-coverage' 'python-gobject' 'xorg-server-xvfb' 'opencv' 'python-pyenchant'
               'git' 'mtdev' 'xclip' 'xsel' 'gtk3' 'gst-plugins-base'
               'gst-plugins-good' 'gst-libav' 'python-dbus')
-source=("https://pypi.io/packages/source/K/Kivy/Kivy-$pkgver.tar.gz"
-        py38.patch)
-sha512sums=('d6b34668d9ad9196edcb9a8307d6659868a8f72580018d873bc6e91823461c853c3c92758c0c3013b25faa177dd62ab5d12671411822112b13a9610e4eda3eb0'
-            'a128a81d3f7124339feb65c93eff6023174ae67db31b5eb3787046c906b03fd155e768d0342d0e8df1a3d2c739e3a90d3d31d8f43d8cb15ffdf5aba97ceda593')
+source=("https://pypi.io/packages/source/K/Kivy/Kivy-$pkgver.tar.gz")
+sha512sums=('dd91feddaf8477093a0e12bd94a265e1b6eaeccc08f6a1908cba8b89fd388dbd803ef98975d9c4c3d4d0f335da5df247f2773f1bcb14e54ee0506c8a7e9a369d')
 
 # For better metadata
 export KIVY_USE_SETUPTOOLS=1
@@ -26,18 +24,18 @@
 export LC_CTYPE=en_US.UTF-8
 
 prepare() {
-  # Remove max cython version limit
-  sed -i 's/,<={max_version}//' Kivy-$pkgver/setup.py # Kivy-$pkgver/kivy/tools/packaging/cython_cfg.py
-  patch -d Kivy-$pkgver/kivy -p1 -i ../../py38.patch
+  cd Kivy-$pkgver
+  # Do not use certifi
+  sed -i '/import certifi/d;s|certifi.where()|"/etc/ssl/certs/ca-certificates.crt"|' kivy/tests/test_urlrequest.py
 }
 
 build() {
-  cd "$srcdir"/Kivy-$pkgver
+  cd Kivy-$pkgver
   python setup.py build
 }
 
 check() {
-  cd "$srcdir"/Kivy-$pkgver
+  cd Kivy-$pkgver
   python setup.py build_ext --inplace
   xvfb-run -s "-screen 0 1280x720x24 -ac +extension GLX" pytest kivy/tests
 }

Deleted: py38.patch
===================================================================
--- py38.patch	2020-12-16 18:55:27 UTC (rev 776896)
+++ py38.patch	2020-12-16 19:09:15 UTC (rev 776897)
@@ -1,16 +0,0 @@
-diff --git a/weakmethod.py.orig b/weakmethod.py
-index 4638abf..54bdc1b 100644
---- a/weakmethod.py.orig
-+++ b/weakmethod.py
-@@ -53,7 +53,10 @@ if sys.version > '3':
-             '''Returns True if the referenced callable was a bound method and
-             the instance no longer exists. Otherwise, return False.
-             '''
--            return self.proxy is not None and not bool(dir(self.proxy))
-+            try:
-+                return self.proxy is not None and not bool(dir(self.proxy))
-+            except ReferenceError:
-+                return True
- 
-         def __eq__(self, other):
-             try: