| 1 |
commit: 464ad0f13bea2b3b3802347b1b47db2701d3ddeb |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 4 12:03:34 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 4 13:08:41 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464ad0f1 |
| 7 |
|
| 8 |
dev-libs/xalan-c: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/2223 |
| 11 |
|
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/xalan-c/files/1.10.0-as-needed.patch | 78 ---------------------- |
| 15 |
.../xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch | 50 -------------- |
| 16 |
2 files changed, 128 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/xalan-c/files/1.10.0-as-needed.patch b/dev-libs/xalan-c/files/1.10.0-as-needed.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 60fa962..00000000 |
| 21 |
--- a/dev-libs/xalan-c/files/1.10.0-as-needed.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,78 +0,0 @@ |
| 24 |
-diff -uprN xml-xalan/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in |
| 25 |
---- xml-xalan/c/src/xalanc/Makefile.in 2007-03-31 14:54:16.106346968 -0400 |
| 26 |
-+++ xml-xalan/c/src/xalanc/Makefile.in 2007-03-31 14:57:37.159195728 -0400 |
| 27 |
-@@ -172,7 +172,7 @@ XalanExe: lib "//'$(LOADSAMP)(${BATCH_X |
| 28 |
- |
| 29 |
- "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o |
| 30 |
- ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ |
| 31 |
-- ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@ |
| 32 |
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) |
| 33 |
- ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp |
| 34 |
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< |
| 35 |
- |
| 36 |
-@@ -180,7 +180,7 @@ testXSLT: lib "//'$(LOADSAMP)(${BATCH_T |
| 37 |
- |
| 38 |
- "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o |
| 39 |
- ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ |
| 40 |
-- ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@ |
| 41 |
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) |
| 42 |
- ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp |
| 43 |
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< |
| 44 |
- |
| 45 |
-@@ -190,7 +190,7 @@ XalanExe: lib $(XSL_BIN_DIR)/Xalan |
| 46 |
- |
| 47 |
- $(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o |
| 48 |
- ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ |
| 49 |
-- ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_PARAMETERS) |
| 50 |
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(OTHER_LINK_PARAMETERS) |
| 51 |
- ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp |
| 52 |
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< |
| 53 |
- endif |
| 54 |
-@@ -199,7 +199,7 @@ testXSLT: lib $(XSL_BIN_DIR)/testXSLT |
| 55 |
- |
| 56 |
- $(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o |
| 57 |
- ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ |
| 58 |
-- ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_PARAMETERS) |
| 59 |
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(OTHER_LINK_PARAMETERS) |
| 60 |
- ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp |
| 61 |
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< |
| 62 |
- |
| 63 |
-@@ -207,7 +207,7 @@ testXPath: lib $(XSL_BIN_DIR)/testXPath |
| 64 |
- |
| 65 |
- $(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o |
| 66 |
- ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \ |
| 67 |
-- ${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@ $(OTHER_LINK_PARAMETERS) |
| 68 |
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $(OTHER_LINK_PARAMETERS) |
| 69 |
- ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp |
| 70 |
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< |
| 71 |
- |
| 72 |
-@@ -220,7 +220,7 @@ locale: |
| 73 |
- |
| 74 |
- ${BATCH_TARGET}: $(ALL_OBJECTS) |
| 75 |
- @echo Building ${BATCH_TARGET} |
| 76 |
-- $(MAKE_SHARED) $(ALLLIBS) $^ -o $@ |
| 77 |
-+ $(MAKE_SHARED) $^ -o $@ $(ALLLIBS) |
| 78 |
- |
| 79 |
- else |
| 80 |
- |
| 81 |
-@@ -230,7 +230,7 @@ locale: |
| 82 |
- $(MAKE) -C Utils $@ |
| 83 |
- |
| 84 |
- $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS) |
| 85 |
-- $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMERES) |
| 86 |
-+ $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(ALLLIBS) $(OTHER_LINK_LIB_PARAMERES) |
| 87 |
- ifeq ($(PLATFORM), OS390) |
| 88 |
- mv *.x ${XSL_LIB_DIR} |
| 89 |
- else |
| 90 |
-diff -uprN xml-xalan/c/src/xalanc/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/MsgCreator/Makefile.in |
| 91 |
---- xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in 2007-03-31 15:10:07.927334556 -0400 |
| 92 |
-+++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in 2007-03-31 15:10:35.038804580 -0400 |
| 93 |
-@@ -29,7 +29,7 @@ MSG_CREATOR_SRC=$(XALANCROOT)/src/xalanc |
| 94 |
- |
| 95 |
- $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS) |
| 96 |
- ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \ |
| 97 |
-- ${EXTRA_LINK_OPTIONS} $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS) |
| 98 |
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS) |
| 99 |
- |
| 100 |
- $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp |
| 101 |
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< |
| 102 |
|
| 103 |
diff --git a/dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch b/dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch |
| 104 |
deleted file mode 100644 |
| 105 |
index e08ef96..00000000 |
| 106 |
--- a/dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch |
| 107 |
+++ /dev/null |
| 108 |
@@ -1,50 +0,0 @@ |
| 109 |
---- XalanDOMString.cpp 2008-03-21 09:50:39.000000000 +0100 |
| 110 |
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2008-03-21 09:51:06.000000000 +0100 |
| 111 |
-@@ -26,6 +26,7 @@ |
| 112 |
- |
| 113 |
- |
| 114 |
- #include <cstdlib> |
| 115 |
-+#include <cstring> |
| 116 |
- |
| 117 |
- |
| 118 |
- |
| 119 |
---- FormatterToHTML.cpp 2008-03-21 09:56:31.000000000 +0100 |
| 120 |
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2008-03-21 09:56:54.000000000 +0100 |
| 121 |
-@@ -26,6 +26,7 @@ |
| 122 |
- |
| 123 |
- |
| 124 |
- #include <cassert> |
| 125 |
-+#include <cstring> |
| 126 |
- |
| 127 |
- |
| 128 |
- |
| 129 |
---- ElemNumber.cpp 2008-03-21 10:09:56.000000000 +0100 |
| 130 |
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp 2008-03-21 10:10:15.000000000 +0100 |
| 131 |
-@@ -14,6 +14,7 @@ |
| 132 |
- * limitations under the License. |
| 133 |
- */ |
| 134 |
- #include "ElemNumber.hpp" |
| 135 |
-+#include <cstring> |
| 136 |
- |
| 137 |
- |
| 138 |
- |
| 139 |
---- DirectoryEnumerator.hpp 2008-03-21 10:19:13.000000000 +0100 |
| 140 |
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2008-03-21 10:19:41.000000000 +0100 |
| 141 |
-@@ -36,6 +36,7 @@ |
| 142 |
- |
| 143 |
- #include <functional> |
| 144 |
- #include <iterator> |
| 145 |
-+#include <cstring> |
| 146 |
- |
| 147 |
- |
| 148 |
- #include "xercesc/framework/MemoryManager.hpp" |
| 149 |
---- XalanExe.cpp 2008-03-21 12:11:08.000000000 +0100 |
| 150 |
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp 2008-03-21 12:11:44.000000000 +0100 |
| 151 |
-@@ -19,6 +19,7 @@ |
| 152 |
- |
| 153 |
- |
| 154 |
- #include <cstdlib> |
| 155 |
-+#include <cstring> |
| 156 |
- #if defined(XALAN_CLASSIC_IOSTREAMS) |
| 157 |
- #include <iostream.h> |
| 158 |
- #else |
Archives