From 7b5934635d48ae01b924eb12042024b61f21c226 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Wed, 1 Jan 2020 04:15:34 +0100
Subject: 20200101.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 python/python-xlib/python-xlib.SlackBuild |  8 ----
 python/python-xlib/setup.patch            | 61 -------------------------------
 2 files changed, 69 deletions(-)
 delete mode 100644 python/python-xlib/setup.patch

(limited to 'python/python-xlib')

diff --git a/python/python-xlib/python-xlib.SlackBuild b/python/python-xlib/python-xlib.SlackBuild
index 0ea9263b3a..e395a2b91e 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
-- 
cgit v1.2.3