From 44cec0e5a1655ea4881437e9a75c8b1364d4d882 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Wed, 12 May 2010 12:25:08 +0000 Subject: [PATCH] Fix build with gcc 4.5, bug #317207 Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- app-office/openoffice/ChangeLog | 6 +++++- app-office/openoffice/Manifest | 5 +++-- .../openoffice/files/gcc45-buildfix.patch | 17 +++++++++++++++++ app-office/openoffice/openoffice-3.2.0.ebuild | 3 ++- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 app-office/openoffice/files/gcc45-buildfix.patch diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 8316ff844e54..6e19ec2f1d5e 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.530 2010/05/01 01:01:06 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.531 2010/05/12 12:25:08 suka Exp $ + + 12 May 2010; Andreas Proschofsky + +files/gcc45-buildfix.patch, openoffice-3.2.0.ebuild: + Fix build with gcc 4.5, bug #317207 01 May 2010; Maciej Mrozowski openoffice-3.2.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 4bc42f6b57eb..c1dce3909303 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,5 @@ AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07 +AUX gcc45-buildfix.patch 840 RMD160 fcb6c08ee67b61f60641d641daa329d5fd17772b SHA1 6344952a2d0d9690d4f864b3273713f95068eabd SHA256 2d5b95e94f9b9e95c97876db669aabe523d01194c9f7ce2f0a3ccb9bde9221bc AUX gentoo-3.2.0.diff 1972 RMD160 7c17515819d13c84c73b6361bc2c5fa3bcf26d17 SHA1 8d5df16b03e066e67a536e361b3670bca9651666 SHA256 f622b98d8988e904e6d168cbdc05ec44ae6388178f555d5943959f59282129f1 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212c046a8 SHA1 e8541e791a03836d986d8e0db0d488570bb6ab36 SHA256 90d88d2fb96a0e82afe6b55e77c478ee9b1925e14dfbc998c2af0ef05edfd508 @@ -25,6 +26,6 @@ DIST ooo-build-3.2.0.10.tar.gz 13064810 RMD160 da7a0d18dee79db651fa144e9775511af DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -EBUILD openoffice-3.2.0.ebuild 13404 RMD160 7bbccab830c2ff3f89f8c6f8cb7a31d32239a65b SHA1 7f7f8af8ed746c0d87ce461b0d66c85cd0d56d4a SHA256 e2ac4d55387aa379c5e77b22ca7588fea13695e51ccd107c9ad9e528f38eaeb4 -MISC ChangeLog 108727 RMD160 6c86e957fa2657fba471291a374c10b6346ba1c8 SHA1 74cec745d297f37ee79f5ae77e4044a158eddc3e SHA256 0ec7ac01de0718bc4703564b6266d175c2022ec99156a2f11c7739263ae441f8 +EBUILD openoffice-3.2.0.ebuild 13473 RMD160 3e413c94c4108f40600f4a1e9a30f55973415571 SHA1 1eeb677b730ba29243f9f6543cc2ec0643dc48eb SHA256 5c92ad32088a3c6ffc83ef46a4f2744c69da3660f3c17b64e980a0c0e24c9702 +MISC ChangeLog 108871 RMD160 0bd92d0d59f1033b581441ffb7166cbc328bd193 SHA1 9664861ea57bf404dfac8e693c1eb9353420226e SHA256 00c57d0740a79cfff47505b235c8f941cd7f1a92302c04c8ec526cb4cd1cfa2e MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 diff --git a/app-office/openoffice/files/gcc45-buildfix.patch b/app-office/openoffice/files/gcc45-buildfix.patch new file mode 100644 index 000000000000..7cc3c022072e --- /dev/null +++ b/app-office/openoffice/files/gcc45-buildfix.patch @@ -0,0 +1,17 @@ +--- cppu/inc/uno/lbnames.h.old 2010-02-02 12:49:41.000000000 +0100 ++++ cppu/inc/uno/lbnames.h 2010-03-05 17:13:22.000000000 +0100 +@@ -62,12 +62,12 @@ provoking error here, because PP ignores + #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." + #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4) + #define __CPPU_ENV gcc3 +-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4) ++#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) + #define __CPPU_ENV gcc3 + #elif (__GNUC__ == 3) + #error "Tested gcc 3 version is <= 3.4. Patch uno/lbnames.h to try your gcc 3 version." + #else +-#error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version." ++#error "Supported gcc majors are 2 , 3 and 4 <= 4.5. Unsupported gcc major version." + #endif /* defined (__GNUC__) */ + #endif /* defined (_MSC_VER) */ + diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 5444200e86d0..52f2fe520599 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.23 2010/05/01 01:01:06 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.24 2010/05/12 12:25:08 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -223,6 +223,7 @@ src_prepare() { cp -f "${FILESDIR}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/npwrap-fix-nogtk.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/neon-remove-SSPI-support.diff" "${S}/patches/hotfixes" || die + cp -f "${FILESDIR}/gcc45-buildfix.patch" "${S}/patches/hotfixes" || die #Use flag checks if use java ; then -- 2.26.2