From 4e5c7d5a5c34c097d3bf3bfea8252c7fa0964636 Mon Sep 17 00:00:00 2001 From: paranoidgabe Date: Wed, 28 May 2014 13:02:23 -0700 Subject: [PATCH 1/5] added patch --- buildlibxml.py.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 buildlibxml.py.patch diff --git a/buildlibxml.py.patch b/buildlibxml.py.patch new file mode 100644 index 000000000..a2921e63a --- /dev/null +++ b/buildlibxml.py.patch @@ -0,0 +1,20 @@ +--- ../lxml/buildlibxml.py Tue May 27 12:50:48 2014 ++++ ./buildlibxml.py Tue May 27 14:37:05 2014 +@@ -24,7 +24,7 @@ + # use pre-built libraries on Windows + + def download_and_extract_zlatkovic_binaries(destdir): +- url = 'ftp://ftp.zlatkovic.com/pub/libxml/' ++ url = 'ftp://xmlsoft.org/libxml2/win32/' + libs = dict( + libxml2 = None, + libxslt = None, +@@ -34,7 +34,7 @@ + for fn in ftp_listdir(url): + for libname in libs: + if fn.startswith(libname): +- assert libs[libname] is None, 'duplicate listings?' ++ #assert libs[libname] is None, 'duplicate listings?' + assert fn.endswith('.win32.zip') + libs[libname] = fn + From 13991d3164b5988a33d71a943682e4184be5b6ba Mon Sep 17 00:00:00 2001 From: paranoidgabe Date: Wed, 28 May 2014 13:19:28 -0700 Subject: [PATCH 2/5] fixed broken url --- buildlibxml.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildlibxml.py b/buildlibxml.py index 8b8836521..03c7bbd4a 100644 --- a/buildlibxml.py +++ b/buildlibxml.py @@ -24,7 +24,7 @@ # use pre-built libraries on Windows def download_and_extract_zlatkovic_binaries(destdir): - url = 'ftp://ftp.zlatkovic.com/pub/libxml/' + url = 'ftp://xmlsoft.org/libxml2/win32/' libs = dict( libxml2 = None, libxslt = None, @@ -34,7 +34,7 @@ def download_and_extract_zlatkovic_binaries(destdir): for fn in ftp_listdir(url): for libname in libs: if fn.startswith(libname): - assert libs[libname] is None, 'duplicate listings?' + #assert libs[libname] is None, 'duplicate listings?' assert fn.endswith('.win32.zip') libs[libname] = fn From 1ef56774f161f68956f1b0e0e0787efbe1370a9a Mon Sep 17 00:00:00 2001 From: paranoidgabe Date: Wed, 28 May 2014 14:27:22 -0700 Subject: [PATCH 3/5] fixed broken msi build --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index d47db4fce..2f4b60750 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.4dev +3.4 From 19505d4d11829a74d58dab882675dcee51319b28 Mon Sep 17 00:00:00 2001 From: paranoidgabe Date: Wed, 28 May 2014 14:30:08 -0700 Subject: [PATCH 4/5] fixed broken msi build --- setup.py | 2 +- version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b2438fc24..cc0b84f8d 100644 --- a/setup.py +++ b/setup.py @@ -173,7 +173,7 @@ def build_packages(files): setup( name = "lxml", - version = versioninfo.version(), + version = "3.4", author="lxml dev team", author_email="lxml-dev@lxml.de", maintainer="lxml dev team", diff --git a/version.txt b/version.txt index 2f4b60750..d47db4fce 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.4 +3.4dev From d4372b92e84cd9113193bc534632a92282a2fcd4 Mon Sep 17 00:00:00 2001 From: paranoidgabe Date: Mon, 2 Jun 2014 13:31:34 -0700 Subject: [PATCH 5/5] Fix --- buildlibxml.py.rej | 34 ++++++++++++++++++++++++++++++++++ setup.py | 2 +- version.txt | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 buildlibxml.py.rej diff --git a/buildlibxml.py.rej b/buildlibxml.py.rej new file mode 100644 index 000000000..69953b4cb --- /dev/null +++ b/buildlibxml.py.rej @@ -0,0 +1,34 @@ +*************** +*** 24,30 **** + # use pre-built libraries on Windows + + def download_and_extract_zlatkovic_binaries(destdir): +- url = 'ftp://ftp.zlatkovic.com/pub/libxml/' + libs = dict( + libxml2 = None, + libxslt = None, +--- 24,30 ---- + # use pre-built libraries on Windows + + def download_and_extract_zlatkovic_binaries(destdir): ++ url = 'ftp://xmlsoft.org/libxml2/win32/' + libs = dict( + libxml2 = None, + libxslt = None, +*************** +*** 34,40 **** + for fn in ftp_listdir(url): + for libname in libs: + if fn.startswith(libname): +- assert libs[libname] is None, 'duplicate listings?' + assert fn.endswith('.win32.zip') + libs[libname] = fn + +--- 34,40 ---- + for fn in ftp_listdir(url): + for libname in libs: + if fn.startswith(libname): ++ #assert libs[libname] is None, 'duplicate listings?' + assert fn.endswith('.win32.zip') + libs[libname] = fn + diff --git a/setup.py b/setup.py index cc0b84f8d..b2438fc24 100644 --- a/setup.py +++ b/setup.py @@ -173,7 +173,7 @@ def build_packages(files): setup( name = "lxml", - version = "3.4", + version = versioninfo.version(), author="lxml dev team", author_email="lxml-dev@lxml.de", maintainer="lxml dev team", diff --git a/version.txt b/version.txt index d47db4fce..2f4b60750 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.4dev +3.4