diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2009-11-25 09:43:12 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2009-11-25 09:43:12 +0000 |
| commit | 02a2abfa7e6e07bee5852aeb90be7f402e62bc02 (patch) | |
| tree | 94123d08fd53257719021d95d4f9641a0d0cee62 /app-office/openoffice | |
| parent | amd64 stable, bug #281855 (diff) | |
| download | gentoo-2-02a2abfa7e6e07bee5852aeb90be7f402e62bc02.tar.gz gentoo-2-02a2abfa7e6e07bee5852aeb90be7f402e62bc02.tar.bz2 gentoo-2-02a2abfa7e6e07bee5852aeb90be7f402e62bc02.zip | |
Fix build with sys-devel/patch-2.6, thanks to Anthony Low <shinji@pikopiko.org> for the fix. Closes bug #293385
(Portage version: 2.2_rc51/cvs/Linux i686)
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/files/ooo-build-patchver.diff | 17 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.1.1.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 6acfd4150ad7..0a329818b22c 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.496 2009/10/29 11:43:23 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.497 2009/11/25 09:43:12 suka Exp $ + + 25 Nov 2009; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.1.1.ebuild, +files/ooo-build-patchver.diff: + Fix build with sys-devel/patch-2.6, thanks to Anthony Low + <shinji@pikopiko.org> for the fix. Closes bug #293385 29 Oct 2009; Andreas Proschofsky <suka@gentoo.org> files/gentoo-3.1.1.diff: diff --git a/app-office/openoffice/files/ooo-build-patchver.diff b/app-office/openoffice/files/ooo-build-patchver.diff new file mode 100644 index 000000000000..946df53eda3a --- /dev/null +++ b/app-office/openoffice/files/ooo-build-patchver.diff @@ -0,0 +1,17 @@ +diff -Nrup ooo-build-3.1.1.4.old/patches/apply.pl.in ooo-build-3.1.1.4/patches/apply.pl.in +--- ooo-build-3.1.1.4.old/patches/apply.pl.in 2009-08-05 12:20:53.000000000 +0000 ++++ ooo-build-3.1.1.4/patches/apply.pl.in 2009-11-21 19:55:48.000000000 +0000 +@@ -920,8 +920,11 @@ sub is_old_patch_version() + + open ($Patch, "@GNUPATCH@ --version|") || die "Can't run patch: $!"; + $ver_line = <$Patch>; +- $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n"; +- if ($1 >= 2 && $2 >= 5 && $3 >= 9) { ++ $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || ++ $ver_line =~ m/\s+(\d+)\.(\d+)/ || ++ $ver_line =~ m/\s+(\d+)/ || ++ die "Can't get patch version\n"; ++ if ($1 > 2 || ($1 == 2 && ($2 > 5 || ($2 == 5 && $3 >= 9)))) { + $is_old = 0; + } + diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild index 2ff30ce7d45e..050196d6e73d 100644 --- a/app-office/openoffice/openoffice-3.1.1.ebuild +++ b/app-office/openoffice/openoffice-3.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.17 2009/10/28 15:53:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.18 2009/11/25 09:43:12 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -240,6 +240,7 @@ src_prepare() { epatch "${FILESDIR}/gentoo-${PV}.diff" epatch "${FILESDIR}/gentoo-pythonpath.diff" epatch "${FILESDIR}/ooo-env_log.diff" + epatch "${FILESDIR}/ooo-build-patchver.diff" cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die |