From 4677ba1f22a3a410421c15c8f478a5e0c397c0f8 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Fri, 28 Oct 2005 05:31:45 +0000 Subject: Implement a proper solution for the --without-java issue Package-Manager: portage-2.0.53_rc6 --- app-office/openoffice/files/2.0.0/Filter.xcu | 355 --------------------- .../files/2.0.0/build-beanshell-fix.diff | 8 - .../openoffice/files/2.0.0/buildfix-new-xslt.diff | 41 +++ .../openoffice/files/2.0.0/gentoo-2.0.0.diff | 18 +- .../files/2.0.0/nojava-fix-stringparam.diff | 39 +++ 5 files changed, 89 insertions(+), 372 deletions(-) delete mode 100644 app-office/openoffice/files/2.0.0/Filter.xcu delete mode 100644 app-office/openoffice/files/2.0.0/build-beanshell-fix.diff create mode 100644 app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff create mode 100644 app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff (limited to 'app-office/openoffice/files') diff --git a/app-office/openoffice/files/2.0.0/Filter.xcu b/app-office/openoffice/files/2.0.0/Filter.xcu deleted file mode 100644 index 092f49606388..000000000000 --- a/app-office/openoffice/files/2.0.0/Filter.xcu +++ /dev/null @@ -1,355 +0,0 @@ - - - - - -OpenDocument Database - - - - -HTML Document (%productname% Writer) - - - - -Microsoft Word 95 Template - - - - -Microsoft Word 97/2000/XP Template - - - - -%productname% %formatversion% Text Document - - - - -StarWriter 3.0 Template - - - - -StarWriter 4.0 Template - - - - -StarWriter 5.0 Template - - - - -Text - - - - -Text Encoded - - - - -Ichitaro 8/9/10/11 Template - - - - -%productname% %formatversion% Text Document Template - - - - -OpenDocument Text - - - - -OpenDocument Text Template - - - - -Microsoft Word 2003 XML - - - - -HTML Document - - - - -StarWriter/Web 4.0 Template - - - - -StarWriter/Web 5.0 Template - - - - -Text (%productname% Writer/Web) - - - - -Text Encoded (%productname% Writer/Web) - - - - -%productname% %formatversion% Text Document (%productname% Writer/Web) - - - - -%productname% %formatversion% HTML Template - - - - -HTML Document Template - - - - -%productname% Text (%productname% Writer/Web) - - - - -StarWriter 4.0 Master Document - - - - -StarWriter 5.0 Master Document - - - - -Text Encoded (%productname% Master Document) - - - - -%productname% %formatversion% Text Document - - - - -%productname% %formatversion% Master Document - - - - -OpenDocument Master Document - - - - -OpenDocument Text - - - - -HTML Document (%productname% Calc) - - - - -Microsoft Excel 4.0 Template - - - - -Microsoft Excel 5.0 Template - - - - -Microsoft Excel 95 Template - - - - -Microsoft Excel 97/2000/XP Template - - - - -StarCalc 3.0 Template - - - - -StarCalc 4.0 Template - - - - -StarCalc 5.0 Template - - - - -%productname% %formatversion% Spreadsheet - - - - -Text CSV - - - - -Web Page Query (%productname% Calc) - - - - -%productname% %formatversion% Spreadsheet Template - - - - -OpenDocument Spreadsheet - - - - -OpenDocument Spreadsheet Template - - - - -Microsoft Excel 2003 XML - - - - -StarDraw 3.0 Template - - - - -StarDraw 5.0 Template - - - - -%productname% %formatversion% Drawing - - - - -%productname% %formatversion% Drawing Template - - - - -OpenDocument Drawing - - - - -OpenDocument Drawing Template - - - - -Microsoft PowerPoint 97/2000/XP Template - - - - -StarDraw 3.0 Template (%productname% Impress) - - - - -StarDraw 5.0 Template (%productname% Impress) - - - - -%productname% %formatversion% Drawing (%productname% Impress) - - - - -StarImpress 4.0 Template - - - - -StarImpress 5.0 Template - - - - -StarImpress 5.0 Packed - - - - -%productname% %formatversion% Presentation - - - - -%productname% %formatversion% Presentation Template - - - - -OpenDocument Presentation - - - - -OpenDocument Presentation Template - - - - -OpenDocument Drawing (Impress) - - - - -%productname% %formatversion% Chart - - - - -OpenDocument Chart - - - - -%productname% %formatversion% Formula - - - - -OpenDocument Formula - - - - -HTML Document (%productname% Draw) - - - - -HTML Document (%productname% Impress) - - - - diff --git a/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff b/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff deleted file mode 100644 index 96209f48435d..000000000000 --- a/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- beanshell/prj/build.lst -+++ beanshell/prj/build.lst -@@ -1,4 +1,4 @@ --be beanshell : solenv NULL -+be beanshell : solenv soltools NULL - be beanshell usr1 - all be_mkout NULL - be beanshell nmake - all be_beanshell NULL - diff --git a/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff b/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff new file mode 100644 index 000000000000..26e7fdb5a3eb --- /dev/null +++ b/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff @@ -0,0 +1,41 @@ +--- filter/source/config/fragments/langfilter.xsl.org 2005-10-27 20:38:20.000000000 +0200 ++++ filter/source/config/fragments/langfilter.xsl 2005-10-27 20:38:44.000000000 +0200 +@@ -2,19 +2,35 @@ + + + +- ++ ++ + + + ++ + + +- ++ ++ ++ ++ ++ ++ ++ ++ + + + ++ + + +- ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff index 93653ada7315..06a9ea343f1b 100644 --- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff +++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff @@ -1,15 +1,15 @@ --- patches/OOO_2_0/apply +++ patches/OOO_2_0/apply -@@ -496,6 +496,9 @@ - buildfix-ucb-without-stlport4.diff - buildfix-svx-without-stlport4.diff +@@ -742,6 +742,9 @@ + default-system-fpicker.diff + # Fix for build breakage on PPC + stlport-ppc-buildfix.diff ++# Fix for broken filters without java i#56619 ++nojava-fix-stringparam.diff ++buildfix-new-xslt.diff -+# Fix beanshell dep -+build-beanshell-fix.diff -+ - [ ArkOnly ] - system-db-4.3-use-lpthread.diff - # FIXME this is generally useful -- currently applied here only because + # + # NOTE: 64 bit OOo is work in progress! --- bin/package-ooo +++ bin/package-ooo @@ -124,11 +124,11 @@ 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 new file mode 100644 index 000000000000..bff02690aa1a --- /dev/null +++ b/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff @@ -0,0 +1,39 @@ +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) + -- cgit v1.2.3-65-gdbad