From d4687ecef29d73d5781dd4912ebf88cdcbda7c71 Mon Sep 17 00:00:00 2001 From: Artur Wiebe Date: Wed, 27 Nov 2019 16:42:41 +0100 Subject: python3-lxml: version bump 4.2.4 -> 4.4.2 Signed-off-by: Artur Wiebe Signed-off-by: Michael Olbrich --- .../0001-do-not-use-libdirs-from-xslt-config.patch | 31 ---------------------- patches/lxml-4.2.4/series | 1 - .../0001-do-not-use-libdirs-from-xslt-config.patch | 31 ++++++++++++++++++++++ patches/lxml-4.4.2/series | 1 + rules/python3-lxml.make | 6 ++--- 5 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 patches/lxml-4.2.4/0001-do-not-use-libdirs-from-xslt-config.patch delete mode 100644 patches/lxml-4.2.4/series create mode 100644 patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch create mode 100644 patches/lxml-4.4.2/series diff --git a/patches/lxml-4.2.4/0001-do-not-use-libdirs-from-xslt-config.patch b/patches/lxml-4.2.4/0001-do-not-use-libdirs-from-xslt-config.patch deleted file mode 100644 index c0cea0f16..000000000 --- a/patches/lxml-4.2.4/0001-do-not-use-libdirs-from-xslt-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d20f79d5e0d04a243f8bda8ef49e59f8d3afaf9c Mon Sep 17 00:00:00 2001 -From: Artur Wiebe -Date: Thu, 30 Aug 2018 10:46:22 +0200 -Subject: [PATCH] do not use libdirs from xslt-config - ---- - setupinfo.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/setupinfo.py b/setupinfo.py -index bdac1d0..87feac7 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -292,10 +292,10 @@ def library_dirs(static_library_dirs): - return static_library_dirs - # filter them from xslt-config --libs - result = [] -- possible_library_dirs = flags('libs') -- for possible_library_dir in possible_library_dirs: -- if possible_library_dir.startswith('-L'): -- result.append(possible_library_dir[2:]) -+# possible_library_dirs = flags('libs') -+# for possible_library_dir in possible_library_dirs: -+# if possible_library_dir.startswith('-L'): -+# result.append(possible_library_dir[2:]) - return result - - def include_dirs(static_include_dirs): --- -2.18.0 - diff --git a/patches/lxml-4.2.4/series b/patches/lxml-4.2.4/series deleted file mode 100644 index 13f153f5b..000000000 --- a/patches/lxml-4.2.4/series +++ /dev/null @@ -1 +0,0 @@ -0001-do-not-use-libdirs-from-xslt-config.patch diff --git a/patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch b/patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch new file mode 100644 index 000000000..c0cea0f16 --- /dev/null +++ b/patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch @@ -0,0 +1,31 @@ +From d20f79d5e0d04a243f8bda8ef49e59f8d3afaf9c Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Thu, 30 Aug 2018 10:46:22 +0200 +Subject: [PATCH] do not use libdirs from xslt-config + +--- + setupinfo.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setupinfo.py b/setupinfo.py +index bdac1d0..87feac7 100644 +--- a/setupinfo.py ++++ b/setupinfo.py +@@ -292,10 +292,10 @@ def library_dirs(static_library_dirs): + return static_library_dirs + # filter them from xslt-config --libs + result = [] +- possible_library_dirs = flags('libs') +- for possible_library_dir in possible_library_dirs: +- if possible_library_dir.startswith('-L'): +- result.append(possible_library_dir[2:]) ++# possible_library_dirs = flags('libs') ++# for possible_library_dir in possible_library_dirs: ++# if possible_library_dir.startswith('-L'): ++# result.append(possible_library_dir[2:]) + return result + + def include_dirs(static_include_dirs): +-- +2.18.0 + diff --git a/patches/lxml-4.4.2/series b/patches/lxml-4.4.2/series new file mode 100644 index 000000000..13f153f5b --- /dev/null +++ b/patches/lxml-4.4.2/series @@ -0,0 +1 @@ +0001-do-not-use-libdirs-from-xslt-config.patch diff --git a/rules/python3-lxml.make b/rules/python3-lxml.make index 15de1f253..cf4d0870f 100644 --- a/rules/python3-lxml.make +++ b/rules/python3-lxml.make @@ -11,11 +11,11 @@ # PACKAGES-$(PTXCONF_PYTHON3_LXML) += python3-lxml -PYTHON3_LXML_VERSION := 4.2.4 -PYTHON3_LXML_MD5 := 31239400ca4e130b69993bb3c14204b3 +PYTHON3_LXML_VERSION := 4.4.2 +PYTHON3_LXML_MD5 := 235c1a22d97a174144e76b66ce62ae46 PYTHON3_LXML := lxml-$(PYTHON3_LXML_VERSION) PYTHON3_LXML_SUFFIX := tar.gz -PYTHON3_LXML_URL := https://pypi.python.org/packages/ca/63/139b710671c1655aed3b20c1e6776118c62e9f9311152f4c6031e12a0554/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX)\#md5=$(PYTHON3_LXML_MD5) +PYTHON3_LXML_URL := https://files.pythonhosted.org/packages/source/l/lxml/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX) PYTHON3_LXML_SOURCE := $(SRCDIR)/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX) PYTHON3_LXML_DIR := $(BUILDDIR)/$(PYTHON3_LXML) PYTHON3_LXML_LICENSE := BSD -- cgit v1.2.3