From 4677ba1f22a3a410421c15c8f478a5e0c397c0f8 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Fri, 28 Oct 2005 05:31:45 +0000 Subject: [PATCH] Implement a proper solution for the --without-java issue Package-Manager: portage-2.0.53_rc6 --- app-office/openoffice/ChangeLog | 9 +- app-office/openoffice/Manifest | 10 +- app-office/openoffice/files/2.0.0/Filter.xcu | 355 ------------------ .../files/2.0.0/build-beanshell-fix.diff | 8 - .../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 ++ app-office/openoffice/openoffice-2.0.0.ebuild | 11 +- 8 files changed, 105 insertions(+), 386 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 diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 9ad42872444b..4b9fa800826a 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.148 2005/10/26 20:32:42 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.149 2005/10/28 05:31:45 suka Exp $ + + 28 Oct 2005; Andreas Proschofsky + files/2.0.0/gentoo-2.0.0.diff, -files/2.0.0/Filter.xcu, + -files/2.0.0/build-beanshell-fix.diff, + +files/2.0.0/buildfix-new-xslt.diff, + +files/2.0.0/nojava-fix-stringparam.diff, openoffice-2.0.0.ebuild: + Implement a proper solution for the --without-java issue 26 Oct 2005; Andreas Proschofsky files/2.0.0/gentoo-2.0.0.diff, openoffice-2.0.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 95d833fa21f9..29f7f5aea4a8 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 c1b9945d3ff933a2f1b27a38bf3cbe26 ChangeLog 32751 +MD5 2c2c6de0ee096ec3e6de4fce31779daa ChangeLog 33071 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 @@ -31,13 +31,13 @@ MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475 -MD5 dad70b7af2b749a7dde536de033f991b files/2.0.0/Filter.xcu 10709 -MD5 f419a0236d3a5c859af1eba4983ec986 files/2.0.0/build-beanshell-fix.diff 242 -MD5 cc64cbbd4664277f904c7728ac1ed404 files/2.0.0/gentoo-2.0.0.diff 944 +MD5 2871ab2688ee93c187ff98445e5ea0ca files/2.0.0/buildfix-new-xslt.diff 1336 +MD5 b07b1f97c76b5a04e6cd714b6621ea55 files/2.0.0/gentoo-2.0.0.diff 937 +MD5 1aff6980adcc3f4704c3ef5959e0f165 files/2.0.0/nojava-fix-stringparam.diff 1682 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 -MD5 189aff586add08cb8e5b97b40bdd95b1 openoffice-2.0.0.ebuild 7205 +MD5 90dbfad1b757e9d6b286796e7e42ca2c openoffice-2.0.0.ebuild 7044 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) + diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild index 1aa7a3af1665..14f646810766 100644 --- a/app-office/openoffice/openoffice-2.0.0.ebuild +++ b/app-office/openoffice/openoffice-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.12 2005/10/26 20:32:42 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.13 2005/10/28 05:31:45 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs @@ -125,7 +125,8 @@ src_unpack() { epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff #Additional and new patches get here - cp -pPRf ${FILESDIR}/${PV}/build-beanshell-fix.diff ${PATCHDIR}/patches/src680 || die + cp -pPRf ${FILESDIR}/${PV}/nojava-fix-stringparam.diff ${PATCHDIR}/patches/src680 || die + cp -pPRf ${FILESDIR}/${PV}/buildfix-new-xslt.diff ${PATCHDIR}/patches/src680 || die #Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo" @@ -212,12 +213,6 @@ src_install() { insinto /usr/share/fonts/TTF/ doins ${PATCHDIR}/fonts/*.ttf - # Temporary, hacky fix for the filetype problem without java - if use !java; then - for i in ${LINGUAS_OOO}; do - cp -pPRf ${FILESDIR}/${PV}/Filter.xcu ${D}/usr/lib/openoffice/share/registry/res/${i}/org/openoffice/TypeDetection/ || die - done - fi } pkg_postinst() { -- 2.26.2