From: Andreas Proschofsky Date: Sun, 7 Jan 2007 08:57:38 +0000 (+0000) Subject: Disable regcomp on ppc in another try to fix bug #147542 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77ce1219322ee2bd2c1a2d02ae763037155e6ff8;p=gentoo.git Disable regcomp on ppc in another try to fix bug #147542 Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 1422f9e620a1..e9df3a4c3e22 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.282 2007/01/05 08:23:31 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.283 2007/01/07 08:57:38 suka Exp $ + + 07 Jan 2007; Andreas Proschofsky + +files/2.0.4/disable-regcomp-java.diff, + +files/2.0.4/disable-regcomp-python.diff, +files/2.0.4/regcompapply.diff, + openoffice-2.0.4.ebuild: + Disable regcomp on ppc in another try to fix bug #147542 05 Jan 2007; Christian Faulhammer openoffice-2.0.4.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index a45adbd00ac2..7b479ec2d01f 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,14 +1,23 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 SHA1 84f3aa66994463524e53fceac8d6e3fc143f00d1 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.3/gentoo-2.0.3.diff 523 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.3/gentoo-2.0.3.diff 523 +AUX 2.0.4/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19 +MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.0.4/disable-regcomp-java.diff 965 +RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.0.4/disable-regcomp-java.diff 965 +SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19 files/2.0.4/disable-regcomp-java.diff 965 +AUX 2.0.4/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 +MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.0.4/disable-regcomp-python.diff 934 +RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.0.4/disable-regcomp-python.diff 934 +SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.0.4/disable-regcomp-python.diff 934 AUX 2.0.4/gentoo-2.0.4.diff 788 RMD160 933095a0fa6335cca7a16eeb6b81c109ac8110e3 SHA1 61b456274b52724596c569c972c7ea72a04c86fb SHA256 2f4fef7557c61122a7d2897a44f5793acaf7d06cdb2cb6fc0e692fa233980295 MD5 1bbea5010bba67ec6bd7423833857c03 files/2.0.4/gentoo-2.0.4.diff 788 RMD160 933095a0fa6335cca7a16eeb6b81c109ac8110e3 files/2.0.4/gentoo-2.0.4.diff 788 SHA256 2f4fef7557c61122a7d2897a44f5793acaf7d06cdb2cb6fc0e692fa233980295 files/2.0.4/gentoo-2.0.4.diff 788 +AUX 2.0.4/regcompapply.diff 319 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 SHA1 040f1168b6ed6b78d7efa756ade14991299b2eb1 SHA256 6886083c9de0493f0b3a68b8d1f329ed3927360d989ff1d15916f12c7842cadd +MD5 cb8c7bad3c931b6b7990cffd484a4cae files/2.0.4/regcompapply.diff 319 +RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 files/2.0.4/regcompapply.diff 319 +SHA256 6886083c9de0493f0b3a68b8d1f329ed3927360d989ff1d15916f12c7842cadd files/2.0.4/regcompapply.diff 319 DIST OOO_2_0_3-binfilter.tar.bz2 17307831 RMD160 a8bb291789bee4692804f8fc3b32ce204689d7a3 SHA1 fa89f8f7c1414b365b78467dc4007d802e9ffd68 SHA256 eeb478603262ea62bc749f6698512bf0463d66cc2a5669db6ecedeb937577864 DIST OOO_2_0_3-core.tar.bz2 109469286 RMD160 d40a11614ef9d25b6af96485877a347ffb6cefd0 SHA1 2ec6cee1fad05c128eb8c0b4e4ab7d9ca1b2c71f SHA256 0d6889e0426590e58c546ca03d227f266ced7de41bc55bcec7ff6f3cfd238c2d DIST OOO_2_0_3-lang.tar.bz2 64201627 RMD160 f893f84ad3c3526c15eb935163d7d98c201d225d SHA1 7525407d609a40ff1edb2c3b74642fd5e83d7921 SHA256 d9120ed91073ec624e60e604872611ecbde204300762874cf5a673addfda4dd8 @@ -30,14 +39,14 @@ EBUILD openoffice-2.0.3.ebuild 9199 RMD160 7e08f5521bbfef37cbeaa44563b2c34fa94c1 MD5 25f86197e08f8c30d5fa9e15ca75217a openoffice-2.0.3.ebuild 9199 RMD160 7e08f5521bbfef37cbeaa44563b2c34fa94c1073 openoffice-2.0.3.ebuild 9199 SHA256 b4a807483e577f2ad454035352f47bccbfd58fb7646e31ff4d672745429fc44c openoffice-2.0.3.ebuild 9199 -EBUILD openoffice-2.0.4.ebuild 9766 RMD160 41e070dc53bc698a3952f45481c79c252584deb4 SHA1 6dd98624ac58a8c8cb5cf1b43aa95f587cbafd29 SHA256 3c8a51c32b6907a1e05ffd19db23cf35e47ca312f0977de59fe797e3a0ac1289 -MD5 3c6f0a4f7eec1839f53fb8b7fb9868f5 openoffice-2.0.4.ebuild 9766 -RMD160 41e070dc53bc698a3952f45481c79c252584deb4 openoffice-2.0.4.ebuild 9766 -SHA256 3c8a51c32b6907a1e05ffd19db23cf35e47ca312f0977de59fe797e3a0ac1289 openoffice-2.0.4.ebuild 9766 -MISC ChangeLog 58822 RMD160 e7407f7302754378b9b80a6d66b3cd9b2128cfdf SHA1 8951ef080e24339489b1940186231d14eb04b28a SHA256 17137cb5aff4665f743c222f0fea96b5a45e178289d44b18f644257c53b59ddd -MD5 934908de9b30c9992da3a60eb5f461f3 ChangeLog 58822 -RMD160 e7407f7302754378b9b80a6d66b3cd9b2128cfdf ChangeLog 58822 -SHA256 17137cb5aff4665f743c222f0fea96b5a45e178289d44b18f644257c53b59ddd ChangeLog 58822 +EBUILD openoffice-2.0.4.ebuild 9994 RMD160 24b8f716fcf264dffe2f5fff1ded03e888d471e0 SHA1 55e1d83b2759310d1c8c7d0e7815432a1ed29c72 SHA256 b8d3d27aaabadc23d1dc0728431e226e54da82fbfe8184142cb6958e0f3c3719 +MD5 2eed5bf56845e39bad9a52e2129c9dcd openoffice-2.0.4.ebuild 9994 +RMD160 24b8f716fcf264dffe2f5fff1ded03e888d471e0 openoffice-2.0.4.ebuild 9994 +SHA256 b8d3d27aaabadc23d1dc0728431e226e54da82fbfe8184142cb6958e0f3c3719 openoffice-2.0.4.ebuild 9994 +MISC ChangeLog 59079 RMD160 77f7c03d71f432358d0aa8047f820ab6da814627 SHA1 36bf0ac68e5b0f44f1e2446886726b1c9f6fbca0 SHA256 6fe8f328708557fcd43fc78a818cfb4ca0996f226d2dd11a045ae96ca7b881cb +MD5 958dcc7861c6138682f95a8036898fd4 ChangeLog 59079 +RMD160 77f7c03d71f432358d0aa8047f820ab6da814627 ChangeLog 59079 +SHA256 6fe8f328708557fcd43fc78a818cfb4ca0996f226d2dd11a045ae96ca7b881cb ChangeLog 59079 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461 @@ -48,10 +57,3 @@ SHA256 411493117843e817aad3c972ce94b2f9ca92f59a815b20b985e875c32da8cdba files/di MD5 e837d4be9f6b62e483edd69a87b84a45 files/digest-openoffice-2.0.4 2690 RMD160 fe56e14aa7634660083562d9114978cfded8e489 files/digest-openoffice-2.0.4 2690 SHA256 b069f01aacb01cc7136aad7b37f65aee07a3cfc574902972e4b1d48cabcd0890 files/digest-openoffice-2.0.4 2690 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFngvPNQqtfCuFneMRArCzAJ0fmbWI+Q5jO1El2xO6XfpxV37MuACfSCsO -XEnDh3cJVFNMiH6k31mCWkQ= -=UXPN ------END PGP SIGNATURE----- diff --git a/app-office/openoffice/files/2.0.4/disable-regcomp-java.diff b/app-office/openoffice/files/2.0.4/disable-regcomp-java.diff new file mode 100644 index 000000000000..f9a1ff10a483 --- /dev/null +++ b/app-office/openoffice/files/2.0.4/disable-regcomp-java.diff @@ -0,0 +1,12 @@ +Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026 +--- solenv/bin/modules/installer/servicesfile.pm.orig 2006-04-29 11:25:25.000000000 +0200 ++++ solenv/bin/modules/installer/servicesfile.pm 2006-04-29 12:24:45.000000000 +0200 +@@ -471,7 +473,7 @@ + $python_error_occured = 0; + + if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); } +- if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); } ++ if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); } + if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } + + if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; } diff --git a/app-office/openoffice/files/2.0.4/disable-regcomp-python.diff b/app-office/openoffice/files/2.0.4/disable-regcomp-python.diff new file mode 100644 index 000000000000..e63a91f009eb --- /dev/null +++ b/app-office/openoffice/files/2.0.4/disable-regcomp-python.diff @@ -0,0 +1,12 @@ +Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026 +--- solenv/bin/modules/installer/servicesfile.pm.orig 2006-10-23 13:49:24.000000000 +0200 ++++ solenv/bin/modules/installer/servicesfile.pm 2006-10-23 13:50:04.000000000 +0200 +@@ -472,7 +472,7 @@ + + if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); } + if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); } +- if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } ++ if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } + + if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; } + diff --git a/app-office/openoffice/files/2.0.4/regcompapply.diff b/app-office/openoffice/files/2.0.4/regcompapply.diff new file mode 100644 index 000000000000..e01a7a19222b --- /dev/null +++ b/app-office/openoffice/files/2.0.4/regcompapply.diff @@ -0,0 +1,13 @@ +--- patches/src680/apply ++++ patches/src680/apply +@@ -1152,6 +1152,9 @@ + ibm-j9vm.diff, hmth + # Fix for some execstacks in libgcc3_uno.so, i#70845, aprosky + libgcc3_uno_noexecstack.diff ++#try to fix build on ppc ++disable-regcomp-java.diff ++disable-regcomp-python.diff + + [ DebianBaseOnly ] + SectionOwner => rengelha + diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild index d55ad3842ff8..d75946781f3a 100644 --- a/app-office/openoffice/openoffice-2.0.4.ebuild +++ b/app-office/openoffice/openoffice-2.0.4.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.0.4.ebuild,v 1.24 2007/01/05 08:23:31 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.25 2007/01/07 08:57:38 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -183,6 +183,12 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff + if use ppc ; then + cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die + cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die + epatch ${FILESDIR}/${PV}/regcompapply.diff + fi + #Use flag checks use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}