From: Andreas Proschofsky <suka@gentoo.org>
Date: Sun, 20 Nov 2005 19:27:15 +0000 (+0000)
Subject: Also add build fix for new libxslt to 1.1.4-r1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3df430d8082a197d2648066ea29d83360d7ed142;p=gentoo.git

Also add build fix for new libxslt to 1.1.4-r1
Package-Manager: portage-2.0.53_rc7
---

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 10208e44777b..d5e5b3dfe3b3 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.154 2005/11/16 06:19:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.155 2005/11/20 19:27:15 suka Exp $
+
+  20 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/build-new-xslt.diff, openoffice-1.1.4-r1.ebuild:
+  Also add build fix for new libxslt to 1.1.4-r1
 
   16 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 45ed7daf7b3f..20a493161a39 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,5 +1,6 @@
-MD5 cd6454d5e6f5251c712b9ed4d814bca7 ChangeLog 33857
+MD5 2028d1a080a66f4ff191da67b3a4f15b ChangeLog 34024
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
@@ -38,6 +39,6 @@ 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 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
 MD5 a692cb616c3d2887beb403a4ad3e08f8 openoffice-2.0.0.ebuild 7142
diff --git a/app-office/openoffice/files/1.1.4/build-new-xslt.diff b/app-office/openoffice/files/1.1.4/build-new-xslt.diff
new file mode 100644
index 000000000000..972ac902af21
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/build-new-xslt.diff
@@ -0,0 +1,20 @@
+--- officecfg/util/resource.xsl.orig	2005-09-23 14:00:56.000000000 +0200
++++ officecfg/util/resource.xsl	2005-09-23 14:02:14.000000000 +0200
+@@ -84,7 +84,8 @@
+     </xsl:template>
+ 
+     <!-- match all elements that could possibly contain info elements -->
+-    <xsl:template match="info/desc[@xml:lang=$locale]|info/label[@xml:lang=$locale]">
++    <xsl:template match="info/desc|info/label">
++    <xsl:if test="@xml:lang=$locale">
+ 
+         <!-- print TPF's path to current node -->
+         <xsl:for-each select="ancestor-or-self::*">
+@@ -108,6 +109,7 @@
+ 
+         <xsl:apply-templates/>
+ 
++    </xsl:if>
+     </xsl:template>
+ 
+ </xsl:transform>
diff --git a/app-office/openoffice/openoffice-1.1.4-r1.ebuild b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
index cab6d2885c17..836891b89896 100644
--- a/app-office/openoffice/openoffice-1.1.4-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4-r1.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-1.1.4-r1.ebuild,v 1.8 2005/08/23 21:13:48 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.9 2005/11/20 19:27:15 suka Exp $
 
 # Notes:
 #
@@ -257,6 +257,8 @@ src_unpack() {
 	if use ppc; then
 		epatch ${FILESDIR}/${PV}/STLport-vector.patch
 	fi
+	#Allow building with libxslt >= 1.1.15
+	use java || epatch ${FILESDIR}/${PV}/build-new-xslt.diff
 
 	#Fixes for nptl
 	if use nptl; then