Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17011
Modified Files:
libxml2-py.info libxml2-py.patch
Log Message:
upstream patch to fix compatibility with python26
Index: libxml2-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libxml2-py.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxml2-py.patch 9 Jun 2013 09:56:29 -0000 1.3
+++ libxml2-py.patch 25 Jul 2013 21:41:36 -0000 1.4
@@ -26,6 +26,23 @@
@WITH_PYTHON_TRUE@BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
@WITH_PYTHON_TRUE@dist_python_DATA = \
+diff -Nurd -x'*~' libxml2-2.9.1.orig/python/libxml_wrap.h
libxml2-2.9.1/python/libxml_wrap.h
+--- libxml2-2.9.1.orig/python/libxml_wrap.h 2013-04-01 22:25:28.000000000
-0400
++++ libxml2-2.9.1/python/libxml_wrap.h 2013-07-25 17:35:49.000000000 -0400
+@@ -34,11 +34,11 @@
+ #define PyBytes_AsString PyString_AsString
+ #define PyBytes_AS_STRING PyString_AS_STRING
+ #define PyBytes_GET_SIZE PyString_GET_SIZE
+-
++#endif
++#ifndef PyCapsule_New
+ #define PyCapsule_New PyCObject_FromVoidPtrAndDesc
+ #define PyCapsule_CheckExact PyCObject_Check
+ #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
+-
+ #endif
+ #endif
+
diff -Nurd -x'*~' libxml2-2.9.1.orig/python/setup.py
libxml2-2.9.1/python/setup.py
--- libxml2-2.9.1.orig/python/setup.py 2013-04-19 03:36:20.000000000 -0400
+++ libxml2-2.9.1/python/setup.py 2013-06-09 05:10:34.000000000 -0400
Index: libxml2-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libxml2-py.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxml2-py.info 9 Jun 2013 09:56:29 -0000 1.3
+++ libxml2-py.info 25 Jul 2013 21:41:35 -0000 1.4
@@ -1,7 +1,7 @@
Info2: <<
Package: libxml2-py%type_pkg[python]
Version: 2.9.1
-Revision: 1
+Revision: 2
Maintainer: Daniel Macks <dma...@netspace.org>
Type: python (2.6 2.7)
Depends: libxml2-shlibs (>= %v-1), libiconv, python%type_pkg[python]
@@ -16,7 +16,7 @@
Source: http://xmlsoft.org/sources/libxml2-%v.tar.gz
Source-MD5: 9c0cfef285d5c4a5c80d00904ddab380
PatchFile: %{ni}.patch
-PatchFile-MD5: 37f06f3ddc2691c0766791738404e7da
+PatchFile-MD5: 156b0fa0651cf87301f257223a167173
PatchScript: <<
%{default_script}
<<
@@ -41,6 +41,9 @@
DescPackaging: <<
Patch python module makefiles to use installed libxml2 not locally-built
See: http://bugzilla.gnome.org/show_bug.cgi?id=341290
+
+ Patch python/libxml_wrap.h to support py26. See:
+
https://git.gnome.org/browse/libxml2/commit/?id=722923bc9b788f028e4221c77138fc66735a3113
<<
DescPort: <<
Fix tests target so that it gives cleaner feedback and propagates
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
