You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
90 lines
3.1 KiB
90 lines
3.1 KiB
Index: configure |
|
--- configure.orig 2006-11-10 11:54:51 +0100 |
|
+++ configure 2006-11-10 22:18:23 +0100 |
|
@@ -24202,11 +24202,11 @@ |
|
|
|
|
|
|
|
-GNOME_PRINT_MODULES_DIR='${libdir}/libgnomeprint/${VERSION}/modules' |
|
+GNOME_PRINT_MODULES_DIR='${libdir}/libgnomeprint/modules' |
|
GNOME_PRINT_MODULES_DIR=$GNOME_PRINT_MODULES_DIR |
|
|
|
|
|
-GNOME_PRINT_DATA_DIR='${datadir}/libgnomeprint/${VERSION}' |
|
+GNOME_PRINT_DATA_DIR='${datadir}/libgnomeprint' |
|
GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR |
|
|
|
|
|
Index: libgnomeprint/Makefile.in |
|
--- libgnomeprint/Makefile.in.orig 2006-11-10 11:54:53 +0100 |
|
+++ libgnomeprint/Makefile.in 2006-11-10 22:18:23 +0100 |
|
@@ -424,7 +424,7 @@ |
|
$(font_sources) \ |
|
$(temp_sources) |
|
|
|
-libgnomeprintincdir = $(includedir)/libgnomeprint-2.2/libgnomeprint |
|
+libgnomeprintincdir = $(includedir)/libgnomeprint |
|
libgnomeprintinc_HEADERS = \ |
|
$(nox_headers) \ |
|
$(font_headers) \ |
|
Index: libgnomeprint/gpa/Makefile.in |
|
--- libgnomeprint/gpa/Makefile.in.orig 2006-11-10 11:54:54 +0100 |
|
+++ libgnomeprint/gpa/Makefile.in 2006-11-10 22:19:12 +0100 |
|
@@ -297,7 +297,7 @@ |
|
\ |
|
gpa-utils.c gpa-utils.h |
|
|
|
-libgpaincdir = $(includedir)/libgnomeprint-2.2/libgnomeprint/private |
|
+libgpaincdir = $(includedir)/libgnomeprint/private |
|
libgpainc_HEADERS = \ |
|
gpa-node.h \ |
|
gpa-utils.h \ |
|
Index: libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in |
|
--- libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in.orig 2005-10-05 18:23:14 +0200 |
|
+++ libgnomeprint/libgnomeprint-2.2-uninstalled.pc.in 2006-11-10 22:18:23 +0100 |
|
@@ -3,7 +3,7 @@ |
|
libdir=@libdir@ |
|
includedir=@includedir@ |
|
|
|
-privateincludedir=${includedir}/libgnomeprint-2.2/libgnomeprint/private |
|
+privateincludedir=${includedir}/libgnomeprint/private |
|
|
|
Name: libgnomeprint-2.2 |
|
Description: libgnomeprint - Printing library for gtk+ based applications |
|
Index: libgnomeprint/libgnomeprint-2.2.pc.in |
|
--- libgnomeprint/libgnomeprint-2.2.pc.in.orig 2005-10-05 18:23:14 +0200 |
|
+++ libgnomeprint/libgnomeprint-2.2.pc.in 2006-11-10 22:19:38 +0100 |
|
@@ -3,11 +3,11 @@ |
|
libdir=@libdir@ |
|
includedir=@includedir@ |
|
|
|
-privateincludedir=${includedir}/libgnomeprint-2.2/libgnomeprint/private |
|
+privateincludedir=${includedir}/libgnomeprint/private |
|
|
|
Name: libgnomeprint-2.2 |
|
Description: libgnomeprint - Printing library for gtk+ based applications |
|
Requires: libart-2.0 glib-2.0 gmodule-no-export-2.0 gobject-2.0 libxml-2.0 pango |
|
Version: @VERSION@ |
|
Libs: -L${libdir} -lgnomeprint-2-2 -lz |
|
-Cflags: -I${includedir}/libgnomeprint-2.2 |
|
+Cflags: -I${includedir} |
|
Index: tests/tools/xmlfix.c |
|
--- tests/tools/xmlfix.c.orig 2006-10-30 12:12:03 +0100 |
|
+++ tests/tools/xmlfix.c 2006-11-10 22:18:23 +0100 |
|
@@ -32,13 +32,9 @@ |
|
exit (-1); |
|
} |
|
|
|
-/* #undef xmlStringText */ |
|
-const xmlChar xmlStringText[] = { 't', 'e', 'x', 't', 0 }; |
|
-/* #undef xmlStringTextNoenc */ |
|
-const xmlChar xmlStringTextNoenc[] = |
|
- { 't', 'e', 'x', 't', 'n', 'o', 'e', 'n', 'c', 0 }; |
|
-/* #undef xmlStringComment */ |
|
-const xmlChar xmlStringComment[] = { 'c', 'o', 'm', 'm', 'e', 'n', 't', 0 }; |
|
+extern const xmlChar xmlStringText[]; |
|
+extern const xmlChar xmlStringTextNoenc[]; |
|
+extern const xmlChar xmlStringComment[]; |
|
|
|
static xmlNodePtr xmlStaticCopyNodeList (xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent); |
|
|
|
|