aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-10-05 14:26:48 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-10-05 14:26:48 +0200
commitcd631e0bcdb50f95f7e7e42d3741f68579889140 (patch)
treebf29268019e9ee94d3819f5d59b1469814a81e28 /debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch
parente3ba4bdc6ba2b3c0c287994636b651d37cedcfe1 (diff)
downloadnx-libs-cd631e0bcdb50f95f7e7e42d3741f68579889140.tar.gz
nx-libs-cd631e0bcdb50f95f7e7e42d3741f68579889140.tar.bz2
nx-libs-cd631e0bcdb50f95f7e7e42d3741f68579889140.zip
Fix patch file names concerning component nx-X11.
Diffstat (limited to 'debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch')
-rw-r--r--debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch b/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch
new file mode 100644
index 000000000..d32e570a3
--- /dev/null
+++ b/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch
@@ -0,0 +1,43 @@
+Description: Building expat against system's libxmltok library
+ Provide support for building expat against the system's libxmltok library.
+ .
+ Not reported to upstream as this patch is mainly imported for being compliant
+ with Debian policy (lintian error: embedded-library).
+Forwarded: not-needed
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Last-Update: 2011-12-31
+--- a/nx-X11/lib/expat/Imakefile
++++ b/nx-X11/lib/expat/Imakefile
+@@ -19,7 +19,7 @@
+ EXPATSRC = $(EXPATTOP)/lib
+ EXPATINC = $(EXPATTOP)/lib
+
+-INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) -I.
++INCLUDES = -I/usr/include/xmltok -I/usr/local/include/xmltok -I$(EXPATINC) -I$(EXPATTOP) -I.
+
+ /*
+ * Endianness (for short's)
+@@ -31,8 +31,8 @@
+ DEFINES = -DXML_BYTE_ORDER=0 -DX_BYTE_ORDER=$(X_BYTE_ORDER)
+ REQUIREDLIBS=$(LDPRELIBS)
+
+-SRCS = xmlparse.c xmltok.c xmlrole.c
+-OBJS = xmlparse.o xmltok.o xmlrole.o
++#SRCS = xmlparse.c xmltok.c xmlrole.c
++#OBJS = xmlparse.o xmltok.o xmlrole.o
+
+ HEADERS = expat.h
+
+@@ -45,9 +45,9 @@
+
+ DependTarget()
+
+-LinkSourceFile(xmlparse.c,$(EXPATSRC))
+-LinkSourceFile(xmltok.c,$(EXPATSRC))
+-LinkSourceFile(xmlrole.c,$(EXPATSRC))
++#LinkSourceFile(xmlparse.c,$(EXPATSRC))
++#LinkSourceFile(xmltok.c,$(EXPATSRC))
++#LinkSourceFile(xmlrole.c,$(EXPATSRC))
+ LinkSourceFile(expat.h,$(EXPATINC))
+
+