From 2375694d7aaa36675e3d137300165c81301cf96b Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Thu, 24 Nov 2005 03:45:18 +0000 Subject: [PATCH] swaped out visibility patch, applied for all archs now Package-Manager: portage-2.0.53_rc7 --- www-client/mozilla-firefox/ChangeLog | 6 ++++- www-client/mozilla-firefox/Manifest | 5 +++-- .../files/1.5/firefox-1.1-visibility.patch | 22 +++++++++++++++++++ .../mozilla-firefox-1.5_rc3-r1.ebuild | 11 +++++----- 4 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 www-client/mozilla-firefox/files/1.5/firefox-1.1-visibility.patch diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index ed4eaf867427..ce6dc06c6753 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.107 2005/11/21 00:17:58 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.108 2005/11/24 03:45:18 anarchy Exp $ + + 24 Nov 2005; +files/1.5/firefox-1.1-visibility.patch, + mozilla-firefox-1.5_rc3-r1.ebuild: + swaped out patch for visibility, using on all archs *mozilla-firefox-1.5_rc3-r1 (21 Nov 2005) diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index 417edec5704f..6526655b755f 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -1,4 +1,5 @@ -MD5 f027a27b7b98a6ff8d89e66eb8d83098 ChangeLog 36557 +MD5 700fcbd77de6239d7ffaf5d56f7ae5eb ChangeLog 36726 +MD5 cc5756b8c7af5c88b248b86c73fc5c8d files/1.5/firefox-1.1-visibility.patch 930 MD5 7847d262e628dcac303586fe02f2e8c4 files/1.5/firefox-cairo-canvas.patch 446 MD5 91661761f2f232b08b74f5adc4f1eff0 files/1.5/firefox-nopangoxft.patch 839 MD5 362f9e0b0f25b964f7120b68fb629ee0 files/1.5/firefox-visibility.patch 689 @@ -41,4 +42,4 @@ MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564 MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734 -MD5 699f23f5022ea1b7d3b16ac41cc0fe05 mozilla-firefox-1.5_rc3-r1.ebuild 8788 +MD5 a9b9132aef328d7a91afec2cb2ec3c35 mozilla-firefox-1.5_rc3-r1.ebuild 8824 diff --git a/www-client/mozilla-firefox/files/1.5/firefox-1.1-visibility.patch b/www-client/mozilla-firefox/files/1.5/firefox-1.1-visibility.patch new file mode 100644 index 000000000000..e0665fe742b4 --- /dev/null +++ b/www-client/mozilla-firefox/files/1.5/firefox-1.1-visibility.patch @@ -0,0 +1,22 @@ +Index: configure +=================================================================== +RCS file: /cvsroot/mozilla/configure,v +retrieving revision 1.1443 +diff -u -p -6 -r1.1443 configure +--- configure 2 Jun 2005 04:00:20 -0000 1.1443 ++++ configure 6 Jun 2005 07:34:06 -0000 +@@ -7303,13 +7303,13 @@ else + int foo_default = 1; + EOF + ac_cv_visibility_pragma=no + if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then + if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then + if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then +- ac_cv_visibility_pragma=yes ++ ac_cv_visibility_pragma=no + fi + fi + fi + rm -f conftest.cs + + fi diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5_rc3-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5_rc3-r1.ebuild index 77c0292004b2..8ade3292dfd3 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-1.5_rc3-r1.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-1.5_rc3-r1.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/www-client/mozilla-firefox/mozilla-firefox-1.5_rc3-r1.ebuild,v 1.1 2005/11/21 00:17:58 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5_rc3-r1.ebuild,v 1.2 2005/11/24 03:45:18 anarchy Exp $ unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 MOZ_FREETYPE2="no" # Need to disable for newer .. remove here and in mozconfig @@ -54,10 +54,9 @@ src_unpack() { # (26 Jun 2003) use alpha && epatch ${FILESDIR}/1.5/mozilla-1.3-alpha-stubs.patch - # amd64 visibility patch - if [[ ${ARCH} == amd64 ]] && [[ $(gcc-major-version) -ge 3 ]]; then - epatch ${FILESDIR}/1.5/firefox-visibility.patch - fi + # addresses visibility issues on ppc and amd64 + # will not hurt to apply on other archs as well. + epatch ${FILESDIR}/1.5/firefox-1.1-visibility.patch # hppa patches from Ivar # (22 Dec 2004) @@ -84,7 +83,7 @@ src_unpack() { # cairo-canvas patch, only needed to build against system cairo # epatch ${FILESDIR}/1.5/firefox-cairo-canvas.patch - # fedora patch + # patch from fedora to stop crashing with gnome-vfs epatch ${FILESDIR}/firefox-1.1-uriloader.patch #################################### -- 2.26.2