[patch] patch which changes wxsvg to use external expat

wxsvg-1.0_beta7-expat.patch (text/plain), 4.10 KB, created by Arttu Valo on 2008-12-03 12:35:21 UTC

diff -r -u wxsvg-1.0b7.old/configure wxsvg-1.0b7/configure
--- wxsvg-1.0b7.old/configure	2008-12-03 14:05:17.000000000 +0200
+++ wxsvg-1.0b7/configure	2008-12-03 14:07:11.000000000 +0200
@@ -21385,7 +21385,7 @@
 
 
 
-                                                                                                                                  ac_config_files="$ac_config_files Makefile include/Makefile include/wxXML/Makefile include/wxSVG/Makefile src/xml/Makefile src/xml/expat/Makefile src/Makefile src/agg/Makefile src/cairo/Makefile src/libart/Makefile src/freetype/Makefile svgview/Makefile svgui/Makefile"
+                                                                                                                                  ac_config_files="$ac_config_files Makefile include/Makefile include/wxXML/Makefile include/wxSVG/Makefile src/xml/Makefile src/Makefile src/agg/Makefile src/cairo/Makefile src/libart/Makefile src/freetype/Makefile svgview/Makefile svgui/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -21980,7 +21980,6 @@
   "include/wxXML/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/wxXML/Makefile" ;;
   "include/wxSVG/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/wxSVG/Makefile" ;;
   "src/xml/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xml/Makefile" ;;
-  "src/xml/expat/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xml/expat/Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/agg/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/agg/Makefile" ;;
   "src/cairo/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cairo/Makefile" ;;
diff -r -u wxsvg-1.0b7.old/configure.in wxsvg-1.0b7/configure.in
--- wxsvg-1.0b7.old/configure.in	2008-12-03 14:05:17.000000000 +0200
+++ wxsvg-1.0b7/configure.in	2008-12-03 14:07:19.000000000 +0200
@@ -128,7 +128,6 @@
   include/wxXML/Makefile
   include/wxSVG/Makefile
   src/xml/Makefile
-  src/xml/expat/Makefile
   src/Makefile
   src/agg/Makefile
   src/cairo/Makefile
diff -r -u wxsvg-1.0b7.old/src/xml/Makefile.am wxsvg-1.0b7/src/xml/Makefile.am
--- wxsvg-1.0b7.old/src/xml/Makefile.am	2008-12-03 14:05:17.000000000 +0200
+++ wxsvg-1.0b7/src/xml/Makefile.am	2008-12-03 14:08:05.000000000 +0200
@@ -1,7 +1,5 @@
-SUBDIRS = expat
-
 noinst_LTLIBRARIES = libwxxml.la
 libwxxml_la_SOURCES = xml.cpp xmlhelpr.cpp
-libwxxml_la_LIBADD = expat/libexpat.la
+libwxxml_la_LIBADD = /usr/GENTOO_LIBDIR/libexpat.la
 
-INCLUDES = -I$(top_builddir)/include/wxXML
\ No newline at end of file
+INCLUDES = -I$(top_builddir)/include/wxXML
diff -r -u wxsvg-1.0b7.old/src/xml/Makefile.in wxsvg-1.0b7/src/xml/Makefile.in
--- wxsvg-1.0b7.old/src/xml/Makefile.in	2008-12-03 14:05:17.000000000 +0200
+++ wxsvg-1.0b7/src/xml/Makefile.in	2008-12-03 14:07:50.000000000 +0200
@@ -116,11 +116,10 @@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
-SUBDIRS = expat
 
 noinst_LTLIBRARIES = libwxxml.la
 libwxxml_la_SOURCES = xml.cpp xmlhelpr.cpp
-libwxxml_la_LIBADD = expat/libexpat.la
+libwxxml_la_LIBADD = /usr/GENTOO_LIBDIR/libexpat.la
 
 INCLUDES = -I$(top_builddir)/include/wxXML
 subdir = src/xml
@@ -129,7 +128,7 @@
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 
 libwxxml_la_LDFLAGS =
-libwxxml_la_DEPENDENCIES = expat/libexpat.la
+libwxxml_la_DEPENDENCIES = /usr/GENTOO_LIBDIR/libexpat.la
 am_libwxxml_la_OBJECTS = xml.lo xmlhelpr.lo
 libwxxml_la_OBJECTS = $(am_libwxxml_la_OBJECTS)
 
diff -r -u wxsvg-1.0b7.old/wxSVG.dev wxsvg-1.0b7/wxSVG.dev
--- wxsvg-1.0b7.old/wxSVG.dev	2008-12-03 14:05:17.000000000 +0200
+++ wxsvg-1.0b7/wxSVG.dev	2008-12-03 14:05:59.000000000 +0200
@@ -1839,26 +1839,6 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit182]
-FileName=src\xml\expat\xmlrole.c
-CompileCpp=0
-Folder=wxSVG
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c xmlrole.c -o xmlrole.o $(CFLAGS)
-
-[Unit183]
-FileName=src\xml\expat\xmltok.c
-CompileCpp=0
-Folder=wxSVG
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c xmltok.c -o xmltok.o $(CFLAGS)
-
 [Unit185]
 FileName=src\xml\xmlhelpr.cpp
 CompileCpp=1