public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/
@ 2016-09-04 13:10 David Seifert
  0 siblings, 0 replies; only message in thread
From: David Seifert @ 2016-09-04 13:10 UTC (permalink / raw
  To: gentoo-commits

commit:     464ad0f13bea2b3b3802347b1b47db2701d3ddeb
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep  4 12:03:34 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 13:08:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464ad0f1

dev-libs/xalan-c: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2223

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/xalan-c/files/1.10.0-as-needed.patch      | 78 ----------------------
 .../xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch     | 50 --------------
 2 files changed, 128 deletions(-)

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
deleted file mode 100644
index 60fa962..00000000
--- a/dev-libs/xalan-c/files/1.10.0-as-needed.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -uprN xml-xalan/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
---- xml-xalan/c/src/xalanc/Makefile.in	2007-03-31 14:54:16.106346968 -0400
-+++ xml-xalan/c/src/xalanc/Makefile.in	2007-03-31 14:57:37.159195728 -0400
-@@ -172,7 +172,7 @@ XalanExe: lib  "//'$(LOADSAMP)(${BATCH_X
- 
- "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
-+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
- ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp                       
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -180,7 +180,7 @@ testXSLT: lib  "//'$(LOADSAMP)(${BATCH_T
- 
- "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
-+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
- ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp                       
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -190,7 +190,7 @@ XalanExe: lib  $(XSL_BIN_DIR)/Xalan
- 
- $(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
-+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
- ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- endif
-@@ -199,7 +199,7 @@ testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
- 
- $(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
-+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
- ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -207,7 +207,7 @@ testXPath: lib  $(XSL_BIN_DIR)/testXPath
- 
- $(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
-+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS)	$(OTHER_LINK_PARAMETERS)
- ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -220,7 +220,7 @@ locale:        
- 
- ${BATCH_TARGET}: $(ALL_OBJECTS)
- 	@echo Building ${BATCH_TARGET}
--	$(MAKE_SHARED) $(ALLLIBS) $^ -o $@
-+	$(MAKE_SHARED) $^ -o $@ $(ALLLIBS)
- 
- else
- 
-@@ -230,7 +230,7 @@ locale:	
- 	$(MAKE) -C Utils $@
- 
- $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
--	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMERES)
-+	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(ALLLIBS) $(OTHER_LINK_LIB_PARAMERES)
- ifeq ($(PLATFORM), OS390)
- 	mv *.x  ${XSL_LIB_DIR}        
- else
-diff -uprN xml-xalan/c/src/xalanc/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/MsgCreator/Makefile.in
---- xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2007-03-31 15:10:07.927334556 -0400
-+++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2007-03-31 15:10:35.038804580 -0400
-@@ -29,7 +29,7 @@ MSG_CREATOR_SRC=$(XALANCROOT)/src/xalanc
- 
- $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
--	${EXTRA_LINK_OPTIONS}  $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS)
-+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS)
- 	
- $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<

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
deleted file mode 100644
index e08ef96..00000000
--- a/dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- XalanDOMString.cpp	2008-03-21 09:50:39.000000000 +0100
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp	2008-03-21 09:51:06.000000000 +0100
-@@ -26,6 +26,7 @@
- 
- 
- #include <cstdlib>
-+#include <cstring>
- 
- 
- 
---- FormatterToHTML.cpp	2008-03-21 09:56:31.000000000 +0100
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp	2008-03-21 09:56:54.000000000 +0100
-@@ -26,6 +26,7 @@
- 
- 
- #include <cassert>
-+#include <cstring>
- 
- 
-
---- ElemNumber.cpp	2008-03-21 10:09:56.000000000 +0100
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp	2008-03-21 10:10:15.000000000 +0100
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- #include "ElemNumber.hpp"
-+#include <cstring>
- 
- 
- 
---- DirectoryEnumerator.hpp	2008-03-21 10:19:13.000000000 +0100
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp	2008-03-21 10:19:41.000000000 +0100
-@@ -36,6 +36,7 @@
- 
- #include <functional>
- #include <iterator>
-+#include <cstring>
- 
- 
- #include "xercesc/framework/MemoryManager.hpp"
---- XalanExe.cpp	2008-03-21 12:11:08.000000000 +0100
-+++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp	2008-03-21 12:11:44.000000000 +0100
-@@ -19,6 +19,7 @@
- 
- 
- #include <cstdlib>
-+#include <cstring>
- #if defined(XALAN_CLASSIC_IOSTREAMS)
- #include <iostream.h>
- #else


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-09-04 13:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-04 13:10 [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/ David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox