From 4f740a22eba82ba3736ab487f481dfbd55399f66 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Tue, 25 Oct 2005 05:21:59 +0000 Subject: [PATCH] Temporary fix for the build without java, see bug #110131. Package-Manager: portage-2.0.53_rc6 --- app-office/openoffice/ChangeLog | 7 +- app-office/openoffice/Manifest | 5 +- app-office/openoffice/files/2.0.0/Filter.xcu | 355 ++++++++++++++++++ app-office/openoffice/openoffice-2.0.0.ebuild | 5 +- 4 files changed, 368 insertions(+), 4 deletions(-) create mode 100644 app-office/openoffice/files/2.0.0/Filter.xcu diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index b70e589f219a..e513bef626bd 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # 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.141 2005/10/23 12:42:56 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.142 2005/10/25 05:21:58 suka Exp $ + + 25 Oct 2005; Andreas Proschofsky + +files/2.0.0/Filter.xcu, openoffice-2.0.0.ebuild: + Temporary fix for the build without java, see bug #110131. Real solution + should replace this asap 23 Oct 2005; Andreas Proschofsky openoffice-2.0.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 7ef1e61e0003..ef8153bb51ee 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 d99c048992be4c75aa29c32264b974c2 ChangeLog 31154 +MD5 7df0ae7eca96ca1a616dea9f69501f44 ChangeLog 31362 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,10 +31,11 @@ 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 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 -MD5 803f8ad94f19403199a2ec279c30b133 openoffice-2.0.0.ebuild 6876 +MD5 fa6a80e00004e1c28cc9c03db634caab openoffice-2.0.0.ebuild 7077 diff --git a/app-office/openoffice/files/2.0.0/Filter.xcu b/app-office/openoffice/files/2.0.0/Filter.xcu new file mode 100644 index 000000000000..092f49606388 --- /dev/null +++ b/app-office/openoffice/files/2.0.0/Filter.xcu @@ -0,0 +1,355 @@ + + + + + +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/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild index 58f987502d84..8f7b6de7c45f 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.5 2005/10/23 12:42:56 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.6 2005/10/25 05:21:58 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs @@ -207,6 +207,9 @@ src_install() { insinto /usr/share/fonts/TTF/ doins ${PATCHDIR}/fonts/*.ttf + # Temporary, hacky fix for the filetype problem without java + use !java && cp -pPRf ${FILESDIR}/${PV}/Filter.xcu ${D}/usr/lib/openoffice/share/registry/res/en-US/org/openoffice/TypeDetection/ || die + } pkg_postinst() { -- 2.26.2