summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHunter Sezen <orbea@riseup.net>2019-07-20 22:43:53 +0200
committerRobby Workman <rworkman@slackbuilds.org>2021-04-17 23:55:22 -0500
commit94a86f158f3372d9426c1d3ebd35781b42c7de63 (patch)
tree9127779743d0c0a493af80c728d3a0744f591628
parent9fbae2c0e628d7f949bd134c878987a1e06b1ff0 (diff)
downloadslackbuilds-94a86f158f3372d9426c1d3ebd35781b42c7de63.tar.gz
python/python-xlib: Removed not needed hack.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--python/python-xlib/python-xlib.SlackBuild8
-rw-r--r--python/python-xlib/setup.patch61
2 files changed, 0 insertions, 69 deletions
diff --git a/python/python-xlib/python-xlib.SlackBuild b/python/python-xlib/python-xlib.SlackBuild
index 52f6b400b8..96330a6f28 100644
--- a/python/python-xlib/python-xlib.SlackBuild
+++ b/python/python-xlib/python-xlib.SlackBuild
@@ -38,14 +38,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 {} \;
-# Partially revert: fixup metadata
-# Revert: setup: check setuptools is recent enough to support `setup.cfg`
-# https://github.com/python-xlib/python-xlib/commit/22a8e1929ad58b8168bcf5d931e8f6067ebdec0a
-# https://github.com/python-xlib/python-xlib/commit/376b4739cedc4eee32e60e7b158d20ed18dfddc1
-# https://github.com/python-xlib/python-xlib/issues/106
-sed -i 's/\r$//g' setup.py
-patch -p1 < $CWD/setup.patch
-
python setup.py install --root $PKG
# Python 3 support.
diff --git a/python/python-xlib/setup.patch b/python/python-xlib/setup.patch
deleted file mode 100644
index 47be163a34..0000000000
--- a/python/python-xlib/setup.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 71bdb08..b425618 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,17 +1,25 @@
- # Distutils script for python-xlib
-
--from pkg_resources import parse_requirements
--from setuptools import (__version__ as setuptools_version, setup)
-+from setuptools import setup
-
--
--# Check setuptools is recent enough to support `setup.cfg`.
--setuptools_require = next(parse_requirements('setuptools>=30.3.0'))
--assert setuptools_version in setuptools_require, '{} is required'.format(setuptools_require)
-+import Xlib
-
-
- setup(
-+ name='python-xlib',
-+ version=Xlib.__version_string__,
-+
-+ description='Python X Library',
-+ download_url='https://github.com/python-xlib/python-xlib/releases',
-+ url='https://github.com/python-xlib/python-xlib',
-+ license='LGPLv2+',
-+
-+ author='Peter Liljenberg',
-+ author_email='petli@ctrl-c.liu.se',
-+
- install_requires=['six>=1.10.0'],
- setup_requires=['setuptools-scm'],
-+
- packages=[
- 'Xlib',
- 'Xlib.ext',
-@@ -20,4 +28,22 @@ setup(
- 'Xlib.support',
- 'Xlib.xobject'
- ],
-+
-+ keywords='xlib x11 x windows',
-+ classifiers=[
-+ 'Development Status :: 5 - Production/Stable',
-+ 'Environment :: X11 Applications',
-+ 'Intended Audience :: Developers',
-+ 'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
-+ 'Operating System :: OS Independent',
-+ 'Programming Language :: Python :: 2.7',
-+ 'Programming Language :: Python :: 3',
-+ 'Programming Language :: Python :: 3.3',
-+ 'Programming Language :: Python :: 3.4',
-+ 'Programming Language :: Python :: 3.5',
-+ 'Programming Language :: Python :: Implementation :: CPython',
-+ 'Topic :: Software Development :: Libraries :: Python Modules',
-+ 'Topic :: Software Development :: Libraries',
-+ 'Topic :: Software Development :: User Interfaces',
-+ ],
- )
---
-2.22.0