Commit 42f3b144 authored by Mike Gabriel's avatar Mike Gabriel

Drop patches: 017_nx-X11_update-autotools-helper-files.full.patch,…

Drop patches: 017_nx-X11_update-autotools-helper-files.full.patch, 018_nx-X11_update-libtool-ltmain-script.full.patch, 019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files that are not used at build time.
parent 86f96b06
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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))
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
014_nxcompshad_makefile-uninstall+autoconf.full.patch 014_nxcompshad_makefile-uninstall+autoconf.full.patch
015_nxproxy_makefile-uninstall.full+lite.patch 015_nxproxy_makefile-uninstall.full+lite.patch
016_nx-X11_install-location.full.patch 016_nx-X11_install-location.full.patch
017_nx-X11_update-autotools-helper-files.full.patch
018_nx-X11_update-libtool-ltmain-script.full.patch
019_nx-X11_expat-build-against-system-libxmltok.full.patch
024_fix-make-clean.full.patch 024_fix-make-clean.full.patch
024_fix-make-clean.full+lite.patch 024_fix-make-clean.full+lite.patch
025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment