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 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 + 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/version.txt b/version.txt index d47db4fce..2f4b60750 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.4dev +3.4