diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-07-07 07:59:58 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-07-07 07:59:58 +0000 |
| commit | ae50137638c81109be264ee2ea5468823b29ccb6 (patch) | |
| tree | 673f8e2fd20e1871575265dd1d7ec9a02f6031c2 /app-office | |
| parent | old (diff) | |
| download | gentoo-2-ae50137638c81109be264ee2ea5468823b29ccb6.tar.gz gentoo-2-ae50137638c81109be264ee2ea5468823b29ccb6.tar.bz2 gentoo-2-ae50137638c81109be264ee2ea5468823b29ccb6.zip | |
Add a patch to fix text visibility problems when built with gcc 4.2, see bug #184054
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff | 11 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.2.1/swregion-gcc42.diff | 11 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.2.1.ebuild | 3 |
4 files changed, 31 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 3a762d16ac86..cafde7f6e074 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.332 2007/06/22 11:22:42 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.333 2007/07/07 07:59:58 suka Exp $ + + 07 Jul 2007; Andreas Proschofsky <suka@gentoo.org> + +files/2.2.1/swregion-gcc42.diff, files/2.2.1/gentoo-2.2.1.diff, + openoffice-2.2.1.ebuild: + Add a patch to fix text visibility problems when built with gcc 4.2, see bug + #184054 22 Jun 2007; Andreas Proschofsky <suka@gentoo.org> openoffice-2.2.1.ebuild: diff --git a/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff b/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff index 85f600e31780..bb9e6cdf0bd2 100644 --- a/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff +++ b/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff @@ -8,4 +8,15 @@ EOT chmod 755 $1 } +--- patches/src680/apply ++++ patches/src680/apply +@@ -1185,6 +1185,8 @@ + system-db-check.diff, i#65979, hmth + # User ~/.ooo-2.0 as user dir + scp2-user-config-ooo-2.0.diff, pmladek ++# Fix visbility issue with gcc-4.2 ++swregion-gcc42.diff, i#78417, aprosky + + [ DebianBaseOnly ] + SectionOwner => rengelha diff --git a/app-office/openoffice/files/2.2.1/swregion-gcc42.diff b/app-office/openoffice/files/2.2.1/swregion-gcc42.diff new file mode 100644 index 000000000000..55b289ed0354 --- /dev/null +++ b/app-office/openoffice/files/2.2.1/swregion-gcc42.diff @@ -0,0 +1,11 @@ +--- sw/source/core/bastyp/swregion.cxx 16 Sep 2006 20:43:34 -0000 1.4 ++++ sw/source/core/bastyp/swregion.cxx 3 Jul 2007 02:13:13 -0000 +@@ -79,6 +79,7 @@ + { + if( rDel ) + { ++ pData = (SwRect*) pData; + *(pData+nPos) = rRect; + rDel = FALSE; + } + diff --git a/app-office/openoffice/openoffice-2.2.1.ebuild b/app-office/openoffice/openoffice-2.2.1.ebuild index 5ef560598883..0b742cb234c6 100644 --- a/app-office/openoffice/openoffice-2.2.1.ebuild +++ b/app-office/openoffice/openoffice-2.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.7 2007/06/22 11:22:42 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.8 2007/07/07 07:59:58 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -201,6 +201,7 @@ src_unpack() { #Some fixes for our patchset cd ${S} + cp -f ${FILESDIR}/${PV}/swregion-gcc42.diff ${S}/patches/src680 || die epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff epatch ${FILESDIR}/${PV}/ooo-env_log.diff |