Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16091/10.4/stable/main/finkinfo/libs
Modified Files:
libxml2-py.patch
Log Message:
Missed syncing this over. Sorry about that.
Index: libxml2-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2-py.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libxml2-py.patch 6 Aug 2012 07:32:35 -0000 1.4
+++ libxml2-py.patch 25 Jul 2013 13:42:19 -0000 1.5
@@ -1,16 +1,7 @@
-diff -Nurd -x'*~' libxml2-2.8.0.orig/python/Makefile.in
libxml2-2.8.0/python/Makefile.in
---- libxml2-2.8.0.orig/python/Makefile.in 2012-05-23 04:56:32.000000000
-0400
-+++ libxml2-2.8.0/python/Makefile.in 2012-08-06 02:59:09.000000000 -0400
-@@ -74,7 +74,7 @@
- am__installdirs = "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(docsdir)" \
- "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"
- LTLIBRARIES = $(python_LTLIBRARIES)
--@WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = $(mylibs)
-+@WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES =
- am__libxml2mod_la_SOURCES_DIST = $(srcdir)/libxml.c $(srcdir)/types.c
- @WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo
- @WITH_PYTHON_TRUE@nodist_libxml2mod_la_OBJECTS = libxml2-py.lo
-@@ -87,7 +87,7 @@
+diff -Nurd -x'*~' libxml2-2.9.1.orig/python/Makefile.in
libxml2-2.9.1/python/Makefile.in
+--- libxml2-2.9.1.orig/python/Makefile.in 2013-04-19 03:36:12.000000000
-0400
++++ libxml2-2.9.1/python/Makefile.in 2013-06-09 05:19:23.000000000 -0400
+@@ -110,7 +110,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libxml2mod_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_PYTHON_TRUE@am_libxml2mod_la_rpath = -rpath $(pythondir)
@@ -19,27 +10,25 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
-@@ -391,8 +391,6 @@
- SUBDIRS = . tests
- INCLUDES = \
- -I$(PYTHON_INCLUDES) \
-- -I$(top_srcdir)/include \
-- -I$(top_builddir)/include \
- -I$(top_builddir)/$(subdir)
-
- docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
-@@ -408,7 +406,7 @@
+@@ -428,14 +428,12 @@
+ libxml2class.txt
- libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module
-avoid-version
- @WITH_PYTHON_TRUE@mylibs = \
--@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la
-+@WITH_PYTHON_TRUE@ -lxml2
+ @WITH_PYTHON_TRUE@AM_CPPFLAGS = \
+-@WITH_PYTHON_TRUE@ -I$(top_builddir)/include \
+-@WITH_PYTHON_TRUE@ -I$(top_srcdir)/include \
+ @WITH_PYTHON_TRUE@ -I$(PYTHON_INCLUDES)
@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
- @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = $(srcdir)/libxml.c $(srcdir)/types.c
-diff -Nurd -x'*~' libxml2-2.8.0.orig/python/setup.py
libxml2-2.8.0/python/setup.py
---- libxml2-2.8.0.orig/python/setup.py 2012-05-23 04:56:44.000000000 -0400
-+++ libxml2-2.8.0/python/setup.py 2012-08-06 02:59:09.000000000 -0400
+ @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h
libxml2-py.c types.c
+ @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS)
$(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
+-@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la
$(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
++@WITH_PYTHON_TRUE@ -lxml2 $(CYGWIN_EXTRA_PYTHON_LIBADD)
$(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
+
+ @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/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
@@ -231,7 +231,7 @@
author = "Daniel Veillard",
author_email = "veill...@redhat.com",
@@ -49,12 +38,12 @@
py_modules=modules,
ext_modules=extens,
ext_package=ext_package,
-diff -Nurd -x'*~' libxml2-2.8.0.orig/python/tests/Makefile.in
libxml2-2.8.0/python/tests/Makefile.in
---- libxml2-2.8.0.orig/python/tests/Makefile.in 2012-05-23
04:56:32.000000000 -0400
-+++ libxml2-2.8.0/python/tests/Makefile.in 2012-08-06 02:59:09.000000000
-0400
-@@ -572,14 +572,21 @@
-
+diff -Nurd -x'*~' libxml2-2.9.1.orig/python/tests/Makefile.in
libxml2-2.9.1/python/tests/Makefile.in
+--- libxml2-2.9.1.orig/python/tests/Makefile.in 2013-04-19
03:36:12.000000000 -0400
++++ libxml2-2.9.1/python/tests/Makefile.in 2013-06-09 05:10:34.000000000
-0400
+@@ -611,14 +611,21 @@
@WITH_PYTHON_TRUE@tests: $(PYTESTS)
+ @WITH_PYTHON_TRUE@ @for f in $(XMLS) ; do test -f $$f || $(LN_S)
$(srcdir)/$$f . ; done
@WITH_PYTHON_TRUE@ @echo "## running Python regression tests"
+@WITH_PYTHON_TRUE@ -@rm -f test.out
@WITH_PYTHON_TRUE@ -@(PYTHONPATH="..:../.libs:$(srcdir)/..:$$PYTHONPATH" ;
\
@@ -77,4 +66,4 @@
+@WITH_PYTHON_TRUE@ @[ ! -s test.out ]
@WITH_PYTHON_FALSE@tests:
- clean:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
------------------------------------------------------------------------------
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
