diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-03-28 08:37:55 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-03-28 08:37:55 +0000 |
| commit | 5fd9701e0928b63deaa6ff67b00191e8b3abe88e (patch) | |
| tree | ce262e1b02fbbc9d214ed8a73e9527b5cc7d4ab5 /app-office/openoffice-ximian | |
| parent | add sed to DEPEND. (diff) | |
| download | historical-5fd9701e0928b63deaa6ff67b00191e8b3abe88e.tar.gz historical-5fd9701e0928b63deaa6ff67b00191e8b3abe88e.tar.bz2 historical-5fd9701e0928b63deaa6ff67b00191e8b3abe88e.zip | |
Fix bug #82385 also in older versions
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'app-office/openoffice-ximian')
5 files changed, 32 insertions, 6 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 0e81124448e7..af580f63ffb4 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,11 @@ # 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.114 2005/03/06 10:40:36 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.115 2005/03/28 08:37:55 suka Exp $ + + 28 Mar 2005; Andreas Proschofsky <suka@gentoo.org> + +files/1.1.3/getcompver.awk.patch, openoffice-ximian-1.3.6.ebuild, + openoffice-ximian-1.3.7.ebuild: + Fix bug #82385 also in older versions 06 Mar 2005; Andreas Proschofsky <suka@gentoo.org> files/1.1.4/gentoo-1.3.8.patch, +files/1.1.4/getcompver.awk.patch, diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 7c80fa3c558b..235011b8065d 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,7 +1,7 @@ -MD5 7bb244361a08b72dca07314792a1c00c openoffice-ximian-1.3.6.ebuild 16894 +MD5 db0937049060bf2f60caff12204099e7 openoffice-ximian-1.3.6.ebuild 16968 MD5 4f30b05359128c7f30fc4e3c58c9b324 openoffice-ximian-1.3.8.ebuild 17826 -MD5 cc594a4c819d5f004f0e7dc03b44b5fa openoffice-ximian-1.3.7.ebuild 17838 -MD5 a13d35416f5525df9b6c3e6926d4bd81 ChangeLog 28683 +MD5 9fdc8c3794927565d0c6465f91631120 openoffice-ximian-1.3.7.ebuild 17908 +MD5 90b10ce4b354bcb5a72c5b332654b834 ChangeLog 28880 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502 MD5 0b59100689dae352eeac675e31a4cdec files/digest-openoffice-ximian-1.3.7 502 @@ -17,6 +17,7 @@ MD5 24035033f41d743378e16582c2e51469 files/1.1.3/javafix.patch 1382 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298 MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576 MD5 61dc69767eddbb5ab3ac02822fff6c13 files/1.1.3/gentoo-1.3.7.patch 1449 +MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.3/getcompver.awk.patch 418 MD5 476f1f342d8321113a27e098630a6003 files/1.1.3/xooffice-wrapper-1.3 6091 MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455 MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598 diff --git a/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch b/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch new file mode 100644 index 000000000000..0fbeb07ee3d6 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch @@ -0,0 +1,14 @@ +--- solenv/bin/getcompver.awk.orig 2005-02-22 00:24:46.976743123 +0100 ++++ solenv/bin/getcompver.awk 2005-02-22 00:34:16.624045985 +0100 +@@ -98,6 +98,11 @@ + CCversion = $0 + } + } ++/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ { ++ if ( compiler_matched == 0 ) { ++ CCversion = substr($0, 0, index($0, "-") - 1) ++ } ++} + END { + if ( num == "true" ) { + tokencount = split (CCversion,vertoken,".") diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild index 7fa7bdfd5df7..c6e7df2ff3d1 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.6.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.6.ebuild,v 1.8 2005/01/29 12:21:07 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild,v 1.9 2005/03/28 08:37:55 suka Exp $ # Notes: # @@ -243,6 +243,9 @@ src_unpack() { cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch + # fix for bug #82385 + epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch + if use ppc; then epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch fi diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild index 1d4e715194de..86aba8d71925 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.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.7.ebuild,v 1.18 2005/03/04 20:58:01 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.19 2005/03/28 08:37:55 suka Exp $ # Notes: # @@ -262,6 +262,9 @@ src_unpack() { #Another java problem epatch ${FILESDIR}/${OO_VER}/javafix.patch + # fix for bug #82385 + epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch + # Workaround for bug #73940, may break debug use flag on ppc if use ppc; then epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch |