Fix building without java and libxslt >=1.1.5, closes bug #106174

Package-Manager: portage-2.0.52-r1

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index e7e9081079eee760823cc66435feffa8daef989e..8f5c9cd6fd1733676408b8949d2f806426c849ad 100644 (file)
--- 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.139 2005/09/17 14:16:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.140 2005/09/24 05:36:47 suka Exp $
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.5/build-new-xslt.diff, openoffice-ximian-1.3.16.ebuild:
+  Fix building without java and libxslt >=1.1.5, closes bug #106174
 
   17 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
   files/1.1.5/gentoo-1.3.16.patch:

diff --git a/app-office/openoffice-ximian/files/1.1.5/build-new-xslt.diff b/app-office/openoffice-ximian/files/1.1.5/build-new-xslt.diff
new file mode 100644 (file)
index 0000000..972ac90
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.5/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.16.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
index f5af159f740420bac29a54da565422d80b966a2a..d06da44ecde49f709ed17f649ef9aa4323d6aa59 100644 (file)
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.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.16.ebuild,v 1.1 2005/09/17 07:33:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild,v 1.2 2005/09/24 05:36:47 suka Exp $
 
 # Notes:
 #
@@ -131,7 +131,7 @@ pkg_setup() {
 
 set_languages () {
 
-       strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
+       strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb nn pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
        if [ -n "${LINGUAS}" ] ; then
                # use the leftmost value
                temp_lang=( ${LINGUAS} )
@@ -171,7 +171,9 @@ set_languages () {
                        ;;
                sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
                        ;;
-               no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
+               nn ) OOLANGNO=79; OOLANGNAME=NORNYN; OOLFULLNAME="Norwegian"
+                       ;;
+               nb ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
                        ;;
                pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
                        ;;
@@ -268,6 +270,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
+
        #Workaround for bug #73940, may break debug use flag on ppc
        if use ppc; then
                epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4980eb42e3ade01b08d044f5ffc682bffca324b4..02944682651d53433d65a713833a6985cd3a6fd7 100644 (file)
--- 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.124 2005/09/19 19:38:47 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.125 2005/09/24 05:41:22 suka Exp $
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.5/build-new-xslt.diff, openoffice-1.1.5.ebuild:
+  Fix building without java and libxslt >=1.1.5, closes bug #106174
 
   19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   openoffice-1.1.5.ebuild:

diff --git a/app-office/openoffice/files/1.1.5/build-new-xslt.diff b/app-office/openoffice/files/1.1.5/build-new-xslt.diff
new file mode 100644 (file)
index 0000000..972ac90
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/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.5.ebuild b/app-office/openoffice/openoffice-1.1.5.ebuild
index 4ffbe23adf79c1241de3fe371042b3c731ef6111..4113c69d5160b9f64a86b26169177091c188c167 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.5.ebuild
+++ b/app-office/openoffice/openoffice-1.1.5.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.5.ebuild,v 1.3 2005/09/19 19:38:47 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.5.ebuild,v 1.4 2005/09/24 05:41:22 suka Exp $
 
 # Notes:
 #
@@ -111,7 +111,7 @@ pkg_setup() {
 
 set_languages () {
 
-       strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
+       strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb nn pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
        if [ -n "${LINGUAS}" ] ; then
                # use the leftmost value
                temp_lang=( ${LINGUAS} )
@@ -151,7 +151,9 @@ set_languages () {
                        ;;
                sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
                        ;;
-               no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
+               nn ) OOLANGNO=79; OOLANGNAME=NORNYN; OOLFULLNAME="Norwegian"
+                       ;;
+               nb ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
                        ;;
                pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
                        ;;
@@ -255,6 +257,9 @@ src_unpack() {
                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
                epatch ${FILESDIR}/${PV}/nptl.patch