From: Andreas Proschofsky Date: Sat, 24 Sep 2005 05:41:22 +0000 (+0000) Subject: Fix building without java and libxslt >=1.1.5, closes bug #106174 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ef008849bc82b2513481e7fb6f6a31eea84488e;p=gentoo.git 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 e7e9081079ee..8f5c9cd6fd17 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.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 + +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 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 index 000000000000..972ac902af21 --- /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 @@ + + + +- ++ ++ + + + +@@ -108,6 +109,7 @@ + + + ++ + + + 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 f5af159f7404..d06da44ecde4 100644 --- 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 4980eb42e3ad..02944682651d 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.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 + +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 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 index 000000000000..972ac902af21 --- /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 @@ + + + +- ++ ++ + + + +@@ -108,6 +109,7 @@ + + + ++ + + + diff --git a/app-office/openoffice/openoffice-1.1.5.ebuild b/app-office/openoffice/openoffice-1.1.5.ebuild index 4ffbe23adf79..4113c69d5160 100644 --- 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