From: Andreas Proschofsky <suka@gentoo.org>
Date: Sun, 20 Nov 2005 19:48:26 +0000 (+0000)
Subject: Also provide the build fix for the new libxslt to 1.3.9-r1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04265c0b0d12b26369d62cb97450ae8773b6e79e;p=gentoo.git

Also provide the build fix for the new libxslt to 1.3.9-r1
Package-Manager: portage-2.0.53_rc7
---

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 06f65cbfa97a..782dea54e398 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.143 2005/11/07 20:01:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.144 2005/11/20 19:48:26 suka Exp $
+
+  20 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/build-new-xslt.diff, openoffice-ximian-1.3.9-r1.ebuild:
+  Also provide the build fix for the new libxslt to 1.3.9-r1
 
   07 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-ximian-1.9.199.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index d6984d4acfa9..d4ea70506018 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,5 +1,6 @@
-MD5 189282812b1879950a63e0249947c6ef ChangeLog 34907
+MD5 2be2059daebdf1991f994960fb765f4b ChangeLog 35093
 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 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
 MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.9.patch 859
@@ -30,5 +31,5 @@ MD5 e84e07ee231b9ceaabacc5556a63f647 files/digest-openoffice-ximian-1.3.9-r1 492
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openoffice-ximian-1.9.199 0
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 a05de7453d373da927b2b9c6cc6c7bbe openoffice-ximian-1.3.16.ebuild 17873
-MD5 2172597e048d38d848b3ee1ffdda7790 openoffice-ximian-1.3.9-r1.ebuild 17912
+MD5 78ae49ad978e18d00d11830ec7dc740f openoffice-ximian-1.3.9-r1.ebuild 18015
 MD5 6dae04bd5081afc57b675e437606b798 openoffice-ximian-1.9.199.ebuild 1358
diff --git a/app-office/openoffice-ximian/files/1.1.4/build-new-xslt.diff b/app-office/openoffice-ximian/files/1.1.4/build-new-xslt.diff
new file mode 100644
index 000000000000..972ac902af21
--- /dev/null
+++ b/app-office/openoffice-ximian/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-ximian/openoffice-ximian-1.3.9-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
index 299d16db42b4..ec86b97b7f05 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-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-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.8 2005/08/23 21:18:38 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.9 2005/11/20 19:48:26 suka Exp $
 
 # Notes:
 #
@@ -268,6 +268,9 @@ src_unpack() {
 	# fix for bug #82385
 	epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch
 
+	#Allow building with libxslt >= 1.1.15
+	use java || epatch ${FILESDIR}/${OO_VER}/build-new-xslt.diff
+
 	# Security fix, bug #88863
 	epatch ${FILESDIR}/${OO_VER}/cws-heapbug_CAN-2005-0941.diff