From 97cc09c14f68c7c9fd76fadba7706d097c401780 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Mon, 16 May 2005 19:30:24 +0000 Subject: Fix building on amd64 with gcc4 (patch from Debian) Package-Manager: portage-2.0.51.21-r1 --- www-client/mozilla/ChangeLog | 6 +- www-client/mozilla/Manifest | 43 ++++++++----- www-client/mozilla/files/mozilla-1.7.8-amd64.patch | 71 ++++++++++++++++++++++ www-client/mozilla/mozilla-1.7.8-r1.ebuild | 5 +- 4 files changed, 107 insertions(+), 18 deletions(-) create mode 100644 www-client/mozilla/files/mozilla-1.7.8-amd64.patch (limited to 'www-client') diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog index 620b7c159802..1d2506762a2d 100644 --- a/www-client/mozilla/ChangeLog +++ b/www-client/mozilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/mozilla # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.34 2005/05/15 19:47:20 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.35 2005/05/16 19:30:24 azarah Exp $ + + 16 May 2005; Martin Schlemmer + +files/mozilla-1.7.8-amd64.patch, mozilla-1.7.8-r1.ebuild: + Fix building on amd64 with gcc4 (patch from Debian) *mozilla-1.7.8-r1 (15 May 2005) diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest index 1a1d7ac39782..0b6f77a6f3fe 100644 --- a/www-client/mozilla/Manifest +++ b/www-client/mozilla/Manifest @@ -1,25 +1,36 @@ -MD5 cb84bb1fcf747a9a7bee1fbe7f371b71 mozilla-1.7.8.ebuild 11680 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 0661e5505c2e2f9450e711bdd49c93c0 ChangeLog 44675 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 ca52ee97a0837b94cf063424aae9b30c ChangeLog 44507 -MD5 53d14a9228c7bf21d7a00b8e56b07db2 mozilla-1.7.8-r1.ebuild 11953 +MD5 ff3a7e270c6684576f53c1af2c7db3fc mozilla-1.7.8-r1.ebuild 12046 +MD5 cb84bb1fcf747a9a7bee1fbe7f371b71 mozilla-1.7.8.ebuild 11680 MD5 ce8c1522b5c8f461803f65da7617a908 mozilla-1.7.7.ebuild 11608 MD5 fd216e315fc89227a48a1883715a1ca0 mozilla-1.7.7-r2.ebuild 11685 +MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105 +MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-mozilla-1.7.8 203 +MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020 +MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-mozilla-1.7.8-r1 203 +MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706 +MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360 +MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 -MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651 +MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310 +MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931 +MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135 MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7 203 -MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7-r2 203 -MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706 +MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 -MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 -MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953 -MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360 -MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-mozilla-1.7.8-r1 203 -MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931 +MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7-r2 203 MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673 -MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-mozilla-1.7.8 203 -MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105 -MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310 -MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153 -MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328 +MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350 +MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFCiPY21ZcsMnZjRyIRAmbPAJ0fhYOL8VJ9I1y0zYXTfwpDpinuNwCeMZHD +ByG/lgCgQNw3El5r8K+whrA= +=MlsX +-----END PGP SIGNATURE----- diff --git a/www-client/mozilla/files/mozilla-1.7.8-amd64.patch b/www-client/mozilla/files/mozilla-1.7.8-amd64.patch new file mode 100644 index 000000000000..96215fb292d5 --- /dev/null +++ b/www-client/mozilla/files/mozilla-1.7.8-amd64.patch @@ -0,0 +1,71 @@ +--- gfx/src/freetype/nsFreeType.cpp 7 Feb 2004 15:22:30 -0000 1.24 ++++ mozilla/gfx/src/freetype/nsFreeType.cpp 4 Mar 2005 19:59:53 -0000 +@@ -96,7 +96,7 @@ + // Define the FreeType2 functions we resolve at run time. + // see the comment near nsFreeType2::DoneFace() for more info + // +-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f ++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f)) + FtFuncList nsFreeType2::FtFuncs [] = { + {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE}, + {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE}, +--- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 1 Sep 2004 23:31:03 -0000 1.7.20.1 ++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 4 Mar 2005 19:59:57 -0000 +@@ -834,8 +834,8 @@ + void + nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param) + { +- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16; +- PRUint16 value = PRUint32(param) & 0x0000FFFF; ++ PRUint16 name = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16; ++ PRUint16 value = NS_PTR_TO_INT32(param) & 0x0000FFFF; + + switch (name) { + case MAX_CONNECTIONS: +--- widget/src/gtk2/nsDragService.cpp 30 Oct 2003 01:48:41 -0000 1.5 ++++ mozilla/widget/src/gtk2/nsDragService.cpp 4 Mar 2005 20:00:01 -0000 +@@ -838,7 +838,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + listTarget->target = g_strdup(gMimeListType); + listTarget->flags = 0; +- listTarget->info = (guint)listAtom; ++ listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom)); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with id %ld\n", + listTarget->target, listAtom)); +@@ -877,7 +877,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + listTarget->target = g_strdup(gTextUriListType); + listTarget->flags = 0; +- listTarget->info = (guint)listAtom; ++ listTarget->info = (guint)NS_PTR_TO_INT32(listAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with \ + id %ld\n", listTarget->target, listAtom)); +@@ -914,7 +914,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + target->target = g_strdup(flavorStr); + target->flags = 0; +- target->info = (guint)atom; ++ target->info = (guint)NS_PTR_TO_INT32(atom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("adding target %s with id %ld\n", + target->target, atom)); +@@ -931,7 +931,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + plainTarget->target = g_strdup(kTextMime); + plainTarget->flags = 0; +- plainTarget->info = (guint)plainAtom; ++ plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with \ + id %ld\n", plainTarget->target, plainAtom)); +@@ -948,7 +948,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + urlTarget->target = g_strdup(gMozUrlType); + urlTarget->flags = 0; +- urlTarget->info = (guint)urlAtom; ++ urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with \ + id %ld\n", urlTarget->target, urlAtom)); diff --git a/www-client/mozilla/mozilla-1.7.8-r1.ebuild b/www-client/mozilla/mozilla-1.7.8-r1.ebuild index 4d4f6856f428..780b5b85315c 100644 --- a/www-client/mozilla/mozilla-1.7.8-r1.ebuild +++ b/www-client/mozilla/mozilla-1.7.8-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/mozilla-1.7.8-r1.ebuild,v 1.1 2005/05/15 19:47:20 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.8-r1.ebuild,v 1.2 2005/05/16 19:30:24 azarah Exp $ unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit multilib @@ -85,6 +85,9 @@ src_unpack() { # Fix building with gcc4 epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch + # Fix building on amd64 with gcc4 (patch from Debian) + epatch ${FILESDIR}/${P}-amd64.patch + # Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257 # Mozilla crashes under some rare cases when plugin.default_plugin_disabled # is true. This patch fixes that. Backported by hansmi@gentoo.org. -- cgit v1.2.3-65-gdbad