diff options
| -rw-r--r-- | libraries/wxPython4/newer_setuptools.patch | 29 | ||||
| -rw-r--r-- | libraries/wxPython4/wxPython4.SlackBuild | 6 | ||||
| -rw-r--r-- | libraries/wxPython4/wxPython4.info | 6 |
3 files changed, 5 insertions, 36 deletions
diff --git a/libraries/wxPython4/newer_setuptools.patch b/libraries/wxPython4/newer_setuptools.patch deleted file mode 100644 index 8def77882a..0000000000 --- a/libraries/wxPython4/newer_setuptools.patch +++ /dev/null @@ -1,29 +0,0 @@ -based on the upstream commit aa8430ad391d93391988451f43ecedd76ca4dd77 - -diff -Naur wxPython-4.0.7.post2.orig/setup.py wxPython-4.0.7.post2/setup.py ---- wxPython-4.0.7.post2.orig/setup.py 2019-11-12 03:54:31.000000000 +0100 -+++ wxPython-4.0.7.post2/setup.py 2020-11-05 19:00:12.489380000 +0100 -@@ -11,6 +11,7 @@ - - import sys, os - import glob -+import stat - - from setuptools import setup, find_packages - from distutils.command.build import build as orig_build -@@ -306,7 +307,15 @@ - orig_copy_tree = distutils.dir_util.copy_tree - distutils.dir_util.copy_tree = wx_copy_tree - -+# Monkey-patch make_writeable too. Sometimes the link is copied before the -+# target, and the original make_writable will fail on a link to a missing -+# target. -+def wx_make_writable(target): -+ if not os.path.islink(target): -+ os.chmod(target, os.stat(target).st_mode | stat.S_IWRITE) - -+import setuptools.command.build_py -+setuptools.command.build_py.make_writable = wx_make_writable - - #---------------------------------------------------------------------- - diff --git a/libraries/wxPython4/wxPython4.SlackBuild b/libraries/wxPython4/wxPython4.SlackBuild index c47043b4ac..6fdae7c7bd 100644 --- a/libraries/wxPython4/wxPython4.SlackBuild +++ b/libraries/wxPython4/wxPython4.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wxPython4 -# Copyright 2018-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2018-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ PRGNAM=wxPython4 SRCNAM=wxPython -VERSION=${VERSION:-4.0.7.post2} +VERSION=${VERSION:-4.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,8 +73,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/newer_setuptools.patch - python3 setup.py install --root=$PKG mkdir -p $PKG/usr/share/{applications,pixmaps} $PKG/usr/share/icons/hicolor/{16x16,32x32}/apps diff --git a/libraries/wxPython4/wxPython4.info b/libraries/wxPython4/wxPython4.info index 2a3b7a3eb5..1d69d74451 100644 --- a/libraries/wxPython4/wxPython4.info +++ b/libraries/wxPython4/wxPython4.info @@ -1,8 +1,8 @@ PRGNAM="wxPython4" -VERSION="4.0.7.post2" +VERSION="4.1.1" HOMEPAGE="https://wxPython.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/b9/8b/31267dd6d026a082faed35ec8d97522c0236f2e083bf15aff64d982215e1/wxPython-4.0.7.post2.tar.gz" -MD5SUM="e10f59d8e1565b034c4933334ea1eb19" +DOWNLOAD="https://files.pythonhosted.org/packages/b0/4d/80d65c37ee60a479d338d27a2895fb15bbba27a3e6bb5b6d72bb28246e99/wxPython-4.1.1.tar.gz" +MD5SUM="262191ae1c926a58da37fb7a8fabc51e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webkit2gtk pathlib2" |