summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff')
-rw-r--r--app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff39
1 files changed, 0 insertions, 39 deletions
diff --git a/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff b/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff
deleted file mode 100644
index bff02690aa1a..000000000000
--- a/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.12
-diff -u -u -r1.12 makefile.mk
---- filter/source/config/fragments/makefile.mk 8 Sep 2005 21:33:23 -0000 1.12
-+++ filter/source/config/fragments/makefile.mk 25 Oct 2005 18:24:46 -0000
-@@ -147,13 +147,20 @@
- .IF "$(SOLAR_JAVA)"==""
- #cmc, hack to workaround the java build requirement
- MERGE:=python ../tools/merge/pyAltFCFGMerge
-+PACKLANG := $(XSLTPROC)
-+PACKLANG_IN :=
-+PACKLANG_PARAM := --stringparam
-+PACKLANG_XSL :=
- .ELSE
- MERGE := $(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar
- .IF "$(JDK)" == "gcj"
--PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process
- .ELSE
--PACKLANG := $(JAVA) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVA) org.apache.xalan.xslt.Process
- .ENDIF
-+PACKLANG_IN := -IN
-+PACKLANG_PARAM := -PARAM
-+PACKLANG_XSL := -XSL
- .ENDIF
-
- # -----------------------------------------------------------------------------
-@@ -182,7 +191,7 @@
- +@echo Building language packages $(@:b:s/Filter_//) for filters
- +@echo ===================================================================
- +-$(MKDIRHIER) $(@:d)
-- +$(PACKLANG) -IN $< -PARAM lang $(@:d:d:d:d:d:d:d:d:b) > $@
-+ +$(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $< > $@
-
- $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS_PACKED) : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
-