From fe32da0841cc0b61875cf63be0725319a552033b Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 8 Jul 2020 17:30:57 +0800 Subject: [PATCH] python3-maxminddb: Fix build when using newer setuptools This package fails to build with newer setuptools, because setuptools removed the (deprecated) Features feature in v46.0.0[1]. This adapts a commit[2] to remove the use of this feature. (Changes to code formatting prevent the original commit/patch to be used.) [1]: https://github.com/pypa/setuptools/blob/aff64ae89e00e25fb3868bf528a14c18e7af0cf4/CHANGES.rst#v4600 [2]: https://github.com/maxmind/MaxMind-DB-Reader-python/commit/3aac426e354f91814f6fd0829baee137b0bb093f Signed-off-by: Jeffery To --- lang/python/python3-maxminddb/Makefile | 2 +- ...g-deprecated-Feature-from-setuptools.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 lang/python/python3-maxminddb/patches/001-Stop-using-deprecated-Feature-from-setuptools.patch diff --git a/lang/python/python3-maxminddb/Makefile b/lang/python/python3-maxminddb/Makefile index 00d3340e2..20270ee46 100644 --- a/lang/python/python3-maxminddb/Makefile +++ b/lang/python/python3-maxminddb/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=maxminddb PKG_VERSION:=1.4.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/m/maxminddb/ diff --git a/lang/python/python3-maxminddb/patches/001-Stop-using-deprecated-Feature-from-setuptools.patch b/lang/python/python3-maxminddb/patches/001-Stop-using-deprecated-Feature-from-setuptools.patch new file mode 100644 index 000000000..96e17aa6c --- /dev/null +++ b/lang/python/python3-maxminddb/patches/001-Stop-using-deprecated-Feature-from-setuptools.patch @@ -0,0 +1,33 @@ +Adapted from 3aac426[1] to account for a difference in formatting. + +[1]: https://github.com/maxmind/MaxMind-DB-Reader-python/commit/3aac426e354f91814f6fd0829baee137b0bb093f + +--- a/setup.py ++++ b/setup.py +@@ -9,7 +9,7 @@ from distutils.command.build_ext import + from distutils.errors import (CCompilerError, DistutilsExecError, + DistutilsPlatformError) + +-from setuptools import setup, Extension, Feature ++from setuptools import setup, Extension + + cmdclass = {} + PYPY = hasattr(sys, 'pypy_version_info') +@@ -107,16 +107,7 @@ def find_packages(location): + def run_setup(with_cext): + kwargs = {} + if with_cext: +- if Feature: +- kwargs['features'] = { +- 'extension': +- Feature( +- "optional C implementation", +- standard=True, +- ext_modules=ext_module) +- } +- else: +- kwargs['ext_modules'] = ext_module ++ kwargs['ext_modules'] = ext_module + + setup( + name='maxminddb',