diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2006-01-29 18:33:35 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2006-01-29 18:33:35 +0000 |
| commit | 4620d4c2ada7281842fde5a0848bc801829a8f02 (patch) | |
| tree | 5fad0c72dc9e47e7c914cf4dd1c3d69579af56df /www-client | |
| parent | Stable on ppc and amd64 (diff) | |
| download | historical-4620d4c2ada7281842fde5a0848bc801829a8f02.tar.gz historical-4620d4c2ada7281842fde5a0848bc801829a8f02.tar.bz2 historical-4620d4c2ada7281842fde5a0848bc801829a8f02.zip | |
just some cleanup to remove obsolete cruft
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'www-client')
40 files changed, 75 insertions, 2969 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 0325e9fc9b84..f832d13885e5 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,33 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.125 2006/01/13 17:54:07 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.126 2006/01/29 18:33:35 anarchy Exp $ + + 29 Jan 2006; <anarchy@gentoo.org> -files/svg-cairo-0.3.0-fix.patch, + -files/firefox-0.9-init.tar.bz2, -files/mozilla-firefox-1.0.3-prefs.patch, + -files/1.5/firefox-cairo-canvas.patch, + -files/mozilla-firefox-1.0.4-gcc4.patch, + -files/mozilla-firefox-1.0.6-GLSA105396.patch, + -files/mozilla-firefox-1.0.6-gcc4.patch, + -files/mozilla-firefox-1.0-kp_separator.patch, + -files/firefox-1.1-uriloader.patch, + -files/1.5/firefox-1.1-visibility.patch, + -files/1.5/mozilla-firefox-1.1a2-ia64.patch, + -files/mozilla-1.3-alpha-stubs.patch, -files/mozilla-1.7.6-gcc4.patch, + -files/mozilla-1.7.8-amd64.patch, + -files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch, + -files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch, + -files/mozilla-1.7.12-libart-freetype.patch, + -files/mozilla-1.7.12-pango-needs-pangox.patch, + -files/mozilla-1.7.12-rpath.patch, -files/mozilla-rpath-1.patch, + -files/1.5/firefox-nopangoxft.patch, -files/1.5/firefox-visibility.patch, + -files/1.5/mozilla-hppa.patch, -files/1.5/mozilla-1.3-alpha-stubs.patch, + -files/1.5/mozilla-firefox-1.5-gtk.patch, + -files/embedprompter-modal.patch, -files/firefox-gentoo-pkgconfig.patch, + -files/gtk-prompt-service.patch, -files/gtk-tooltips.patch, + -files/icon/deerpark-icon.png, -files/mozilla-hppa.patch, + -files/securebrowserui-iirq.patch, -mozilla-firefox-1.0.7-r2.ebuild, + -mozilla-firefox-1.0.7-r3.ebuild: + just some cleanup to remove obsolete cruft 13 Jan 2006; <plasmaroo@gentoo.org> mozilla-firefox-1.0.7-r4.ebuild: Stable on IA64. diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index a2d62c2ecc3e..b9fdf1300e4e 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -1,51 +1,45 @@ -MD5 c4345cb69afc168335d4ab2732164504 ChangeLog 39703 -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 -MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/1.5/mozilla-1.3-alpha-stubs.patch 4646 -MD5 ff2980bf169954f9b255029e4312b6f8 files/1.5/mozilla-firefox-1.1a2-ia64.patch 2864 -MD5 79c1e7c219dedb67d4e39ca753059b03 files/1.5/mozilla-firefox-1.5-gtk.patch 2621 +MD5 e1c13fda9597865f86078c2f3191b0bf ChangeLog 41145 +RMD160 16ae499f260c5013985af7b65afe9a2fa6b541f8 ChangeLog 41145 +SHA256 97791494803de5b0b8a570d5ea7a5a0c1e60475750891c2f3b4a9106e3b0ce64 ChangeLog 41145 MD5 328c58524dbe1f58eea781194cc7de94 files/1.5/mozilla-firefox-1.5-history.patch 2376 +RMD160 2e6a58c257c5a1455c9440b5d1f3829a2149c970 files/1.5/mozilla-firefox-1.5-history.patch 2376 +SHA256 bad2ff1c2534fb55851fb43bbb1a123511e828eca52e88589f8fbdad42e6a6ef files/1.5/mozilla-firefox-1.5-history.patch 2376 MD5 5d8ef39dd84f5d5a67a7a784e9abcbd0 files/1.5/mozilla-firefox-1.5-mork.patch 1248 -MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/1.5/mozilla-hppa.patch 7863 +RMD160 ccd79f2d2b5850ff630d693a6f17cc42c3a8517c files/1.5/mozilla-firefox-1.5-mork.patch 1248 +SHA256 84c1267c5c09d7cd19531cfad82fb99ebc0d7c76b0fc2bdb2821ee8269e266ad files/1.5/mozilla-firefox-1.5-mork.patch 1248 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32 -MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r2 231 -MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r3 231 -MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r4 231 -MD5 2224f2c5cbbcff7c23969d6b0d4cb75c files/digest-mozilla-firefox-1.5-r9 1503 -MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548 -MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 -MD5 2bd0dd9035dcb875b8340be358347e8d files/firefox-1.1-uriloader.patch 15300 -MD5 aa88a21776616e6b98a28d7d043e033c files/firefox-gentoo-pkgconfig.patch 2304 +RMD160 04828e3567c5dcfa9aad1c8c50941811383bdf99 files/10MozillaFirefox 32 +SHA256 e5ca27ea35d528bd873f1dfe59b15d06cf8e34e1325ca0ccf5b73f7e0307040a files/10MozillaFirefox 32 +MD5 c24bf7e058e8e34c7c18e6ad016be1a0 files/digest-mozilla-firefox-1.0.7-r4 435 +RMD160 bd34b43f06a13099276489d5e6d9798312cbc072 files/digest-mozilla-firefox-1.0.7-r4 435 +SHA256 7069e4786ed5d664ec723035af870d4635777477680aca87fe4feb7243ef581d files/digest-mozilla-firefox-1.0.7-r4 435 +MD5 ac76975af36529e733d44f796335f228 files/digest-mozilla-firefox-1.5-r9 2523 +RMD160 ef9dabe7dcf2fb22a157e1752cb916af36381f95 files/digest-mozilla-firefox-1.5-r9 2523 +SHA256 b9c1744fb2e60beff947875206724a33d928309efb832ae63ec3931f79677450 files/digest-mozilla-firefox-1.5-r9 2523 MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538 +RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 files/firefox.1 2538 +SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7 files/firefox.1 2538 MD5 9afab9469fd1d8af3d674a07ab0a0128 files/gentoo-default-prefs.js 281 -MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520 -MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308 -MD5 f49aab1950ec54d7e8b2a51909dc6a5e files/icon/deerpark-icon.png 2963 +RMD160 0802f29dfa652f3776fc9b685ad6a2a03c7d0b81 files/gentoo-default-prefs.js 281 +SHA256 ec1826aa93ac90b079efca7efb112f232287cc66b7bf515192095da88f62557c files/gentoo-default-prefs.js 281 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 +RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 files/icon/firefox-icon.png 3979 +SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e files/icon/firefox-icon.png 3979 MD5 22c0657f6cced2344a1848a5d0566928 files/icon/mozillafirefox-1.5.desktop 259 +RMD160 7b2c3de5bb2e1d136bd6ecfc968dd9f00db04747 files/icon/mozillafirefox-1.5.desktop 259 +SHA256 3c77e8c9261cfb863b9fdd290122f4f14de5302854bd21a450f85f2da68ca15c files/icon/mozillafirefox-1.5.desktop 259 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168 -MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 -MD5 8e54237e0ff2f2a224ff5b34644b96ec files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch 866 -MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620 +RMD160 5414950bd59f1fbcfadef779b0f048e45b9b282b files/icon/mozillafirefox.desktop 168 +SHA256 7c9fff01a088dc006b04cf5536c3bb73cbde0151f1a12fcc4a7b1217bea9b739 files/icon/mozillafirefox.desktop 168 MD5 c09fc82d7c3c339a4f8ed2bb0834c215 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 481 -MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412 -MD5 d4ba480f8bafa408a67909300780ed4f files/mozilla-1.7.12-pango-needs-pangox.patch 426 -MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 -MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020 -MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 -MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818 -MD5 787437939618daf271673626f6414b15 files/mozilla-firefox-1.0.6-GLSA105396.patch 4049 -MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131 -MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 -MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716 -MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101 -MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 +RMD160 0f71bf56602037d6d4898c8e8180e443db618d5e files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 481 +SHA256 603cb3e687d33b66022823b0ab8f63505049f54528127e061f29681068d30202 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 481 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 +RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160 +SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160 MD5 88a8a7b16c2a9376c68e91be09ea0ba5 mozilla-firefox-1.0.7-r4.ebuild 9847 +RMD160 539d5c3ce8b2d225fa8871fd2722b52506ab5eef mozilla-firefox-1.0.7-r4.ebuild 9847 +SHA256 6dd31547c54e7ddb6e0faca73242aa74a7405ee4c27124a3404fcbbd518536a2 mozilla-firefox-1.0.7-r4.ebuild 9847 MD5 b1b84d68424c69f2433c1bd19b0e9364 mozilla-firefox-1.5-r9.ebuild 8414 +RMD160 304c8a622f8c5ce8f2448a84c957447579326006 mozilla-firefox-1.5-r9.ebuild 8414 +SHA256 8bb3ed75bc2cab9caa527ce428e32ef7bdc97110532d4bd833e8c24f1af0ffed mozilla-firefox-1.5-r9.ebuild 8414 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 deleted file mode 100644 index e0665fe742b4..000000000000 --- a/www-client/mozilla-firefox/files/1.5/firefox-1.1-visibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/files/1.5/firefox-cairo-canvas.patch b/www-client/mozilla-firefox/files/1.5/firefox-cairo-canvas.patch deleted file mode 100644 index fdcb7e7a95b6..000000000000 --- a/www-client/mozilla-firefox/files/1.5/firefox-cairo-canvas.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- content/canvas/src/Makefile.in.orig 2005-08-23 01:46:46.000000000 +0000 -+++ content/canvas/src/Makefile.in 2005-08-23 01:49:49.000000000 +0000 -@@ -77,6 +77,11 @@ - libpixman \ - $(NULL) - -+ifndef MOZ_TREE_CAIRO -+LOCAL_INCLUDES += $(MOZ_CAIRO_CFLAGS) -+EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) -+endif -+ - # XXX some platforms can't handle building - # an empty .a/lib. Remove this dummy.cpp - # whenever w have a rendering context diff --git a/www-client/mozilla-firefox/files/1.5/firefox-nopangoxft.patch b/www-client/mozilla-firefox/files/1.5/firefox-nopangoxft.patch deleted file mode 100644 index 608e803a1083..000000000000 --- a/www-client/mozilla-firefox/files/1.5/firefox-nopangoxft.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2005-08-18 22:41:26.000000000 -0400 -+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 -@@ -40,7 +40,7 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include <pango/pangoxft.h> -+#include <pango/pangocairo.h> - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> -@@ -208,7 +208,7 @@ - } - } - -- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), - mozilla_find_decoder, - NULL, - NULL); diff --git a/www-client/mozilla-firefox/files/1.5/firefox-visibility.patch b/www-client/mozilla-firefox/files/1.5/firefox-visibility.patch deleted file mode 100644 index 698c8770770a..000000000000 --- a/www-client/mozilla-firefox/files/1.5/firefox-visibility.patch +++ /dev/null @@ -1,20 +0,0 @@ - --- configure 2 Mar 2005 16:57:17 -0000 1.1395 -+++ configure 3 Mar 2005 17:50:31 -0000 -@@ -7042,7 +7042,7 @@ - - fi - --if test "$GNU_CC"; then -+if /bin/false; then - echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 - echo "configure:7048: checking for visibility(hidden) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then - -diff -u -r1.1.2.1 gcc_hidden.h ---- nsprpub/config/gcc_hidden.h 15 Dec 2004 05:52:39 -0000 1.1.2.1 -+++ nsprpub/config/gcc_hidden.h 3 Mar 2005 17:51:06 -0000 -@@ -1,2 +1,3 @@ --/* Begin all files as hidden visibility */ -+/* Begin all files as hidden visibility - #pragma GCC visibility push(hidden) -+*/ diff --git a/www-client/mozilla-firefox/files/1.5/mozilla-1.3-alpha-stubs.patch b/www-client/mozilla-firefox/files/1.5/mozilla-1.3-alpha-stubs.patch deleted file mode 100644 index 3aa192be9246..000000000000 --- a/www-client/mozilla-firefox/files/1.5/mozilla-1.3-alpha-stubs.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -Naur mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2001-09-28 15:12:51.000000000 -0500 -+++ mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2003-03-18 09:50:06.000000000 -0600 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,8 +38,6 @@ - - /* Platform specific code to invoke XPCOM methods on native objects */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ -@@ -163,7 +162,11 @@ - "bis $16,$16,$1\n\t" /* load "this" */ - "ldq $2,16($15)\n\t" /* load "methodIndex" */ - "ldq $1,0($1)\n\t" /* load vtable */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ "s8addq $2,$31,$2\n\t" /* vtable index = "methodIndex" * 8 */ -+#else /* not G++ V3 ABI */ - "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#endif /* G++ V3 ABI */ - "addq $1,$2,$1\n\t" - "ldq $27,0($1)\n\t" /* load address of function */ - "jsr $26,($27),0\n\t" /* call virtual function */ -@@ -176,4 +179,3 @@ - "ret $31,($26),1\n\t" - ".end XPTC_InvokeByIndex" - ); -- -diff -Naur mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2001-09-28 15:12:52.000000000 -0500 -+++ mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2003-03-18 09:50:06.000000000 -0600 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,8 +38,6 @@ - - /* Implement shared vtbl methods. */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ -@@ -188,23 +187,45 @@ - * nsresult nsXPTCStubBase::Stub##n() - * Sets register $1 to "methodIndex" and jumps to SharedStub. - */ -+#define STUB_MANGLED_ENTRY(n, symbol) \ -+ "#### Stub"#n" ####" "\n\t" \ -+ ".text" "\n\t" \ -+ ".align 5" "\n\t" \ -+ ".globl " symbol "\n\t" \ -+ ".ent " symbol "\n" \ -+symbol ":" "\n\t" \ -+ ".frame $30,0,$26,0" "\n\t" \ -+ "ldgp $29,0($27)" "\n" \ -+"$" symbol "..ng:" "\n\t" \ -+ ".prologue 1" "\n\t" \ -+ "lda $1,"#n "\n\t" \ -+ "br $31,$SharedStub..ng" "\n\t" \ -+ ".end " symbol -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ ".if "#n" < 10" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase5Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 100" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase6Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 1000" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase7Stub"#n"Ev") "\n\t" \ -+ ".else" "\n\t" \ -+ ".err \"Stub"#n" >= 1000 not yet supported.\"" "\n\t" \ -+ ".endif" \ -+ ); -+ -+#else /* not G++ V3 ABI */ -+ - #define STUB_ENTRY(n) \ - __asm__( \ -- "#### Stub"#n" ####\n" \ --".text\n\t" \ -- ".align 5\n\t" \ -- ".globl Stub"#n"__14nsXPTCStubBase\n\t" \ -- ".ent Stub"#n"__14nsXPTCStubBase\n" \ --"Stub"#n"__14nsXPTCStubBase:\n\t" \ -- ".frame $30,0,$26,0\n\t" \ -- "ldgp $29,0($27)\n" \ --"$Stub"#n"__14nsXPTCStubBase..ng:\n\t" \ -- ".prologue 1\n\t" \ -- "lda $1,"#n"\n\t" \ -- "br $31,$SharedStub..ng\n\t" \ -- ".end Stub"#n"__14nsXPTCStubBase" \ -+ STUB_MANGLED_ENTRY(n, "Stub"#n"__14nsXPTCStubBase") \ - ); - -+#endif /* G++ V3 ABI */ -+ - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ - { \ -@@ -213,4 +234,3 @@ - } - - #include "xptcstubsdef.inc" -- diff --git a/www-client/mozilla-firefox/files/1.5/mozilla-firefox-1.1a2-ia64.patch b/www-client/mozilla-firefox/files/1.5/mozilla-firefox-1.1a2-ia64.patch deleted file mode 100644 index f7d83cecfdf4..000000000000 --- a/www-client/mozilla-firefox/files/1.5/mozilla-firefox-1.1a2-ia64.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- mozilla.orig/extensions/transformiix/source/base/Double.cpp -+++ mozilla/extensions/transformiix/source/base/Double.cpp -@@ -75,14 +75,7 @@ - #define CPU_IS_ARM - #endif - --#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 --/** -- * This version of the macros is safe for the alias optimizations -- * that gcc does, but uses gcc-specific extensions. -- */ -- - typedef union txdpun { -- PRFloat64 d; - struct { - #if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) - PRUint32 lo, hi; -@@ -90,8 +83,14 @@ - PRUint32 hi, lo; - #endif - } s; -+ PRFloat64 d; - } txdpun; - -+#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 -+/** -+ * This version of the macros is safe for the alias optimizations -+ * that gcc does, but uses gcc-specific extensions. -+ */ - #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) - #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) - -@@ -117,20 +116,20 @@ - - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const txdpun nanMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -+ 0xffffffff}; -+const txdpun infMask = {TX_DOUBLE_HI32_EXPMASK, 0}; -+const txdpun negInfMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const txdpun nanMask = {0xffffffff, -+ TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; -+const txdpun infMask = {0, TX_DOUBLE_HI32_EXPMASK}; -+const txdpun negInfMask = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative ---- mozilla.orig/js/src/fdlibm/fdlibm.h -+++ mozilla/js/src/fdlibm/fdlibm.h -@@ -61,7 +61,7 @@ - #define __LITTLE_ENDIAN - #endif - --#if defined(linux) && (defined(__i386__) || defined(__x86_64__) || defined(__ia64)) -+#if defined(linux) && (defined(__i386__) || defined(__x86_64__) || defined(__ia64) || defined(__MIPSEL)) - #define __LITTLE_ENDIAN - #endif - diff --git a/www-client/mozilla-firefox/files/1.5/mozilla-firefox-1.5-gtk.patch b/www-client/mozilla-firefox/files/1.5/mozilla-firefox-1.5-gtk.patch deleted file mode 100644 index e468dc22237a..000000000000 --- a/www-client/mozilla-firefox/files/1.5/mozilla-firefox-1.5-gtk.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- mozilla/widget/src/gtk2/nsWindow.cpp-orig 2005-11-25 21:21:44.539138750 -0600 -+++ mozilla/widget/src/gtk2/nsWindow.cpp 2005-11-25 21:28:57.330186500 -0600 -@@ -148,9 +148,9 @@ - GdkEventVisibility *event); - static gboolean window_state_event_cb (GtkWidget *widget, - GdkEventWindowState *event); --static void style_set_cb (GtkWidget *widget, -- GtkStyle *previous_style, -- gpointer data); -+static void theme_changed_cb (GtkSettings *settings, -+ GParamSpec *pspec, -+ nsWindow *data); - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ -@@ -372,6 +372,10 @@ - mIsDestroyed = PR_TRUE; - mCreated = PR_FALSE; - -+ g_signal_handlers_disconnect_by_func(gtk_settings_get_default(), -+ (gpointer)G_CALLBACK(theme_changed_cb), -+ this); -+ - // ungrab if required - nsCOMPtr<nsIWidget> rollupWidget = do_QueryReferent(gRollupWindow); - if (NS_STATIC_CAST(nsIWidget *, this) == rollupWidget.get()) { -@@ -2434,8 +2438,15 @@ - G_CALLBACK(delete_event_cb), NULL); - g_signal_connect(G_OBJECT(mShell), "window_state_event", - G_CALLBACK(window_state_event_cb), NULL); -- g_signal_connect(G_OBJECT(mShell), "style_set", -- G_CALLBACK(style_set_cb), NULL); -+ g_signal_connect_after(gtk_settings_get_default(), -+ "notify::gtk-theme-name", -+ G_CALLBACK(theme_changed_cb), this); -+ g_signal_connect_after(gtk_settings_get_default(), -+ "notify::gtk-key-theme-name", -+ G_CALLBACK(theme_changed_cb), this); -+ g_signal_connect_after(gtk_settings_get_default(), -+ "notify::gtk-font-name", -+ G_CALLBACK(theme_changed_cb), this); - } - - if (mContainer) { -@@ -3916,11 +3927,9 @@ - - /* static */ - void --style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data) -+theme_changed_cb (GtkSettings *settings, GParamSpec *pspec, nsWindow *data) - { -- nsWindow *window = get_window_for_gtk_widget(widget); -- if (window) -- window->ThemeChanged(); -+ data->ThemeChanged(); - } - - ////////////////////////////////////////////////////////////////////// diff --git a/www-client/mozilla-firefox/files/1.5/mozilla-hppa.patch b/www-client/mozilla-firefox/files/1.5/mozilla-hppa.patch deleted file mode 100644 index d874ae1c4d5c..000000000000 --- a/www-client/mozilla-firefox/files/1.5/mozilla-hppa.patch +++ /dev/null @@ -1,232 +0,0 @@ -diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-12-21 13:37:00.503842544 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-12-21 13:41:49.439917584 +0000 -@@ -167,6 +167,19 @@ - endif - endif - -+# -+# Linux/HPPA/gcc -+# -+ifeq ($(OS_ARCH),Linux) -+ifneq (,$(filter parisc parisc64,$(OS_TEST))) -+#ifeq ($(CC),gcc) # Do not check for gcc since there is only this compiler on linux for hppa -+CPPSRCS := xptcinvoke_pa32.cpp xptcstubs_pa32.cpp -+ASFILES := xptcstubs_asm_parisc_linux.s xptcinvoke_asm_parisc_linux.s -+#endif -+endif -+endif -+ -+ - ###################################################################### - # M68k - ###################################################################### -diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s 1970-01-01 00:00:00.000000000 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s 2004-12-21 13:39:03.390160984 +0000 -@@ -0,0 +1,128 @@ -+ -+ .LEVEL 1.1 -+ .text -+ .align 4 -+ -+framesz: -+ .equ 128 -+ -+; XPTC_InvokeByIndex(nsISuppots* that, PRUint32 methodIndex, -+; PRUint32 paramCount, nsXPTCVariant* params); -+ -+.globl XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, @function -+ -+ -+XPTC_InvokeByIndex: -+ .PROC -+ .CALLINFO FRAME=72, CALLER,SAVE_RP, SAVE_SP, ENTRY_GR=3 -+ .ENTRY -+ -+ ; frame marker takes 48 bytes, -+ ; register spill area takes 8 bytes, -+ ; local stack area takes 72 bytes result in 128 bytes total -+ -+ STW %rp,-20(%sp) -+ STW,MA %r3,128(%sp) -+ -+ LDO -framesz(%r30),%r28 -+ STW %r28,-4(%r30) ; save previous sp -+ STW %r19,-32(%r30) -+ -+ STW %r26,-36-framesz(%r30) ; save argument registers in -+ STW %r25,-40-framesz(%r30) ; in PREVIOUS frame -+ STW %r24,-44-framesz(%r30) ; -+ STW %r23,-48-framesz(%r30) ; -+ -+; B,L .+8,%r2 -+; ADDIL L'invoke_count_bytes-$PIC_pcrel$1+4,%r2,%r1 -+; ; LDO R'invoke_count_bytes-$PIC_pcrel$2+8(%r1),%r1 -+;$PIC_pcrel$1 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$2 -+; MTSP %r31,%sr0 -+ -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26;out=28 -+ BL invoke_count_bytes,%r31 -+ COPY %r31,%r2 -+ -+ CMPIB,>= 0,%r28, .+76 -+ COPY %r30,%r3 ; copy stack ptr to saved stack ptr -+ ADD %r30,%r28,%r30 ; extend stack frame -+ LDW -4(%r3),%r28 ; move frame -+ STW %r28,-4(%r30) -+ LDW -8(%r3),%r28 -+ STW %r28,-8(%r30) -+ LDW -12(%r3),%r28 -+ STW %r28,-12(%r30) -+ LDW -16(%r3),%r28 -+ STW %r28,-16(%r30) -+ LDW -20(%r3),%r28 -+ STW %r28,-20(%r30) -+ LDW -24(%r3),%r28 -+ STW %r28,-24(%r30) -+ LDW -28(%r3),%r28 -+ STW %r28,-28(%r30) -+ LDW -32(%r3),%r28 -+ STW %r28,-32(%r30) -+ -+ LDO -40(%r30),%r26 ; load copy address -+ LDW -44-framesz(%r3),%r25 ; load rest of 2 arguments -+ LDW -48-framesz(%r3),%r24 ; -+ -+ LDW -32(%r30),%r19 ; shared lib call destroys r19; reload -+; B,L .+8,%r2 -+; ADDIL L'invoke_copy_to_stack-$PIC_pcrel$3+4,%r2,%r1 -+; LDO R'invoke_copy_to_stack-$PIC_pcrel$4+8(%r1),%r1 -+;$PIC_pcrel$3 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$4 -+; MTSP %r31,%sr0 -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26 -+ BL invoke_copy_to_stack,%r31 -+ COPY %r31,%r2 -+ -+ LDO -48(%r30),%r20 -+ EXTRW,U,= %r28,31,1,%r22 -+ FLDD 0(%r20),%fr7 ; load double arg 1 -+ EXTRW,U,= %r28,30,1,%r22 -+ FLDW 8(%r20),%fr5L ; load float arg 1 -+ EXTRW,U,= %r28,29,1,%r22 -+ FLDW 4(%r20),%fr6L ; load float arg 2 -+ EXTRW,U,= %r28,28,1,%r22 -+ FLDW 0(%r20),%fr7L ; load float arg 3 -+ -+ LDW -36-framesz(%r3),%r26 ; load ptr to 'that' -+ LDW -40(%r30),%r25 ; load the rest of dispatch argument registers -+ LDW -44(%r30),%r24 -+ LDW -48(%r30),%r23 -+ -+ LDW -36-framesz(%r3),%r20 ; load vtable addr -+ LDW -40-framesz(%r3),%r28 ; load index -+ LDW 0(%r20),%r20 ; follow vtable -+; LDO 0(%r20),%r20 ; offset vtable by 16 bytes (g++: 8, aCC: 16) -+ SH2ADDL %r28,%r20,%r28 ; add 4*index to vtable entry -+ LDW 0(%r28),%r22 ; load vtable entry -+ -+; B,L .+8,%r2 -+; ADDIL L'$$dyncall_external-$PIC_pcrel$5+4,%r2,%r1 -+; LDO R'$$dyncall_external-$PIC_pcrel$6+8(%r1),%r1 -+;$PIC_pcrel$5 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$6 -+; MTSP %r31,%sr0 -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=22-26;out=28; -+ BL $$dyncall,%r31 -+ COPY %r31,%r2 -+ -+ LDW -32(%r30),%r19 -+ COPY %r3,%r30 ; restore saved stack ptr -+ -+ LDW -148(%sp),%rp -+ LDWM -128(%sp),%r3 -+ BV,N (%rp) -+ NOP -+ .EXIT -+ .PROCEND ;in=23,24,25,26; -+ .SIZE XPTC_InvokeByIndex, .-XPTC_InvokeByIndex -+ -diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s 1970-01-01 00:00:00.000000000 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s 2004-12-21 13:39:03.392160680 +0000 -@@ -0,0 +1,73 @@ -+ .LEVEL 1.1 -+ .TEXT -+ .ALIGN 4 -+ -+curframesz: -+ .EQU 128 -+ -+ -+; SharedStub has stack size of 128 bytes -+ -+lastframesz: -+ .EQU 64 -+ -+; the StubN C++ function has a small stack size of 64 bytes -+ -+ -+.globl SharedStub -+ .type SharedStub, @function -+ -+SharedStub: -+ .PROC -+ .CALLINFO CALLER,FRAME=80,SAVE_RP -+ -+ .ENTRY -+ STW %rp,-20(%sp) -+ LDO 128(%sp),%sp -+ -+ STW %r19,-32(%r30) -+ STW %r26,-36-curframesz(%r30) ; save arg0 in previous frame -+ -+ LDO -80(%r30),%r28 -+ FSTD,MA %fr5,8(%r28) ; save darg0 -+ FSTD,MA %fr7,8(%r28) ; save darg1 -+ FSTW,MA %fr4L,4(%r28) ; save farg0 -+ FSTW,MA %fr5L,4(%r28) ; save farg1 -+ FSTW,MA %fr6L,4(%r28) ; save farg2 -+ FSTW,MA %fr7L,4(%r28) ; save farg3 -+ -+ ; Former value of register 26 is already properly saved by StubN, -+ ; but register 25-23 are not because of the arguments mismatch -+ STW %r25,-40-curframesz-lastframesz(%r30) ; save r25 -+ STW %r24,-44-curframesz-lastframesz(%r30) ; save r24 -+ STW %r23,-48-curframesz-lastframesz(%r30) ; save r23 -+ COPY %r26,%r25 ; method index is arg1 -+ LDW -36-curframesz-lastframesz(%r30),%r26 ; self is arg0 -+ LDO -40-curframesz-lastframesz(%r30),%r24 ; normal args is arg2 -+ LDO -80(%r30),%r23 ; floating args is arg3 -+ -+; BL .+8,%r2 -+; ADDIL L'PrepareAndDispatch-$PIC_pcrel$0+4,%r2 -+; LDO R'PrepareAndDispatch-$PIC_pcrel$1+8(%r1),%r1 -+;$PIC_pcrel$0 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$1 -+; MTSP %r31,%sr0 -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=23-26;out=28; -+ BL PrepareAndDispatch, %r31 -+ COPY %r31,%r2 -+ -+ LDW -32(%r30),%r19 -+ -+ LDW -148(%sp),%rp -+ LDO -128(%sp),%sp -+ -+ -+ BV,N (%rp) -+ NOP -+ NOP -+ -+ .EXIT -+ .PROCEND ;in=26;out=28; -+ -+ .SIZE SharedStub, .-SharedStub diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r2 deleted file mode 100644 index 2f469f58a60b..000000000000 --- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5704a8c36de84b408e069afb0c5bc1df firefox-1.0.7-source.tar.bz2 32793876 -MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063 -MD5 8ce88dddf824b90bceb81649cb097310 mozilla-1.7.12-patches-1.2.tar.bz2 108346 diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r3 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r3 deleted file mode 100644 index 2f469f58a60b..000000000000 --- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5704a8c36de84b408e069afb0c5bc1df firefox-1.0.7-source.tar.bz2 32793876 -MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063 -MD5 8ce88dddf824b90bceb81649cb097310 mozilla-1.7.12-patches-1.2.tar.bz2 108346 diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r4 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r4 index 2f469f58a60b..dac517bbf235 100644 --- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r4 +++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r4 @@ -1,3 +1,5 @@ MD5 5704a8c36de84b408e069afb0c5bc1df firefox-1.0.7-source.tar.bz2 32793876 MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063 MD5 8ce88dddf824b90bceb81649cb097310 mozilla-1.7.12-patches-1.2.tar.bz2 108346 +RMD160 a9817e271a903b52bb6eef042c50208dc92162eb mozilla-1.7.12-patches-1.2.tar.bz2 108346 +SHA256 39ef52ad02435d5078aa2bafd13b9197b7c7b14bbdf1fc6149f8e9fea2f5c276 mozilla-1.7.12-patches-1.2.tar.bz2 108346 diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9 index af76259af941..c6a68924cdce 100644 --- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9 +++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9 @@ -6,15 +6,23 @@ MD5 63de76d822b986367f2029f363e8e625 de.xpi 141056 MD5 b1d2189b9248c994999e7e3d82885b31 el.xpi 146943 MD5 655c2d6f95185260fad7f782729da10e es-AR.xpi 146125 MD5 89cbf50f50ddde89a4b1cada2157f51a es-ES.xpi 132461 +RMD160 781a628f8f5424267a42209bbc49f1acdb2448bf es-ES.xpi 132461 +SHA256 56cb4bb4cdd836785bb958e1664251d1d6b141d242d68d241e0192b3fd2b7735 es-ES.xpi 132461 MD5 a04056b74d7541da63a9a3f4e2deef38 fi.xpi 143012 MD5 fa915ddcadecda30ed3e13694f26a779 firefox-1.5-source.tar.bz2 34491496 +RMD160 5e7475846e9c92e36167a384e1e8a3d699b0b62f firefox-1.5-source.tar.bz2 34491496 +SHA256 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b firefox-1.5-source.tar.bz2 34491496 MD5 5a359eedd21c01b5bd3f17830cc69310 fr.xpi 203230 MD5 62767c9e689a4b0abadaf80abb374e2c he.xpi 144976 MD5 08bac8b89fa2bd0740c8e24d30533f47 it.xpi 156712 MD5 1b5f28d3a980c5a92d590219fc337f03 ja.xpi 162438 MD5 15724eb7fb952b2dd90add37d3331ac9 ko.xpi 149473 MD5 c1d99cb89d46d98b825acc5eac3ba668 mozilla-firefox-1.5-patches-1.0.tar.bz2 30485 +RMD160 e7b0d6475d8f3c77846a9a4584df5597e702c8b6 mozilla-firefox-1.5-patches-1.0.tar.bz2 30485 +SHA256 0c84abed2b311b48b8666972798b758d5a5887804d688c672164cbeda52c36be mozilla-firefox-1.5-patches-1.0.tar.bz2 30485 MD5 6e030a4c52bc0144e7de6f2092ba57dc nb-NO.xpi 151770 +RMD160 df19b6fb3a8def33bf1caecf404525413eb7ac60 nb-NO.xpi 151770 +SHA256 a4b8f35a4b487d161ba1b9e1e19052a56218b38206757ca168aef945ae6d8f61 nb-NO.xpi 151770 MD5 92f8b9f0a4aaf3ebfc1b6fb74189ede3 nl.xpi 150929 MD5 1864b9b0c82b9d30018a9537336e56bf pl.xpi 243650 MD5 4ea8f665e814e03474d955f89711d73a pt-BR.xpi 143568 @@ -23,6 +31,10 @@ MD5 f19c6d0e4131d04536f05f5534753c38 ru.xpi 170096 MD5 bdc1cb09937465d5f8d6e3d3666b280d sk.xpi 153991 MD5 a6e5d8d95c795782bd4cf9204f712424 sl.xpi 145205 MD5 704fadd436b1443cf996fe28ea4af017 sv-SE.xpi 154919 +RMD160 5dbb8816f8aaa1141fb02de7dd1099db2ba60cb6 sv-SE.xpi 154919 +SHA256 eb63409a62a54a504615e2c0c133528401c982aef45c9828546405acfc0160d8 sv-SE.xpi 154919 MD5 eff05aaf7f64bb1daa8e3d646237f077 tr.xpi 136159 MD5 2213a8fab73a160366046fdd86eda0cc zh-CN.xpi 136431 MD5 f017d6f4421f9bd306cdcd306def80b5 zh-TW.xpi 128229 +RMD160 772c561fd36ad83e3cef3e4815175e76059f6223 zh-TW.xpi 128229 +SHA256 c3d72c4fb98358fcd8f57038c74a929f3c9a2f1e9f6f44fafe68612a323258ce zh-TW.xpi 128229 diff --git a/www-client/mozilla-firefox/files/embedprompter-modal.patch b/www-client/mozilla-firefox/files/embedprompter-modal.patch deleted file mode 100644 index eb7208c98b45..000000000000 --- a/www-client/mozilla-firefox/files/embedprompter-modal.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: embedding/browser/gtk/src/EmbedPrompter.cpp -=================================================================== -RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp,v -retrieving revision 1.14 -diff -p -u -u -p -U10 -r1.14 EmbedPrompter.cpp ---- embedding/browser/gtk/src/EmbedPrompter.cpp 15 Jan 2005 19:25:25 -0000 1.14 -+++ embedding/browser/gtk/src/EmbedPrompter.cpp 24 Jan 2005 22:27:31 -0000 -@@ -97,20 +97,27 @@ EmbedPrompter::~EmbedPrompter(void) - delete[] mItemList; - } - - nsresult - EmbedPrompter::Create(PromptType aType, GtkWindow* aParentWindow) - { - mWindow = gtk_dialog_new_with_buttons(mTitle.get(), aParentWindow, - GTK_DIALOG_DESTROY_WITH_PARENT, - NULL); - -+ /* only add the dialog to the window group if the parent already has a window group, -+ * so as not to break app's expectations about modal dialogs. -+ */ -+ if (aParentWindow && GTK_WINDOW(aParentWindow)->group) { -+ gtk_window_group_add_window (GTK_WINDOW(aParentWindow)->group, GTK_WINDOW (mWindow)); -+ } -+ - // gtk will resize this for us as necessary - gtk_window_set_default_size(GTK_WINDOW(mWindow), 100, 50); - - // this HBox will contain the icon, and a vbox which contains the - // dialog text and other widgets. - GtkWidget* dialogHBox = gtk_hbox_new(FALSE, 12); - - - // Set up dialog properties according to the GNOME HIG - // (http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-windows) diff --git a/www-client/mozilla-firefox/files/firefox-0.9-init.tar.bz2 b/www-client/mozilla-firefox/files/firefox-0.9-init.tar.bz2 Binary files differdeleted file mode 100644 index c00209c6881b..000000000000 --- a/www-client/mozilla-firefox/files/firefox-0.9-init.tar.bz2 +++ /dev/null diff --git a/www-client/mozilla-firefox/files/firefox-1.1-uriloader.patch b/www-client/mozilla-firefox/files/firefox-1.1-uriloader.patch deleted file mode 100644 index 08c7e9605e46..000000000000 --- a/www-client/mozilla-firefox/files/firefox-1.1-uriloader.patch +++ /dev/null @@ -1,459 +0,0 @@ -Index: uriloader/exthandler/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v -retrieving revision 1.60 -diff -d -u -p -r1.60 Makefile.in ---- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 -+++ uriloader/exthandler/Makefile.in 21 Jul 2005 03:07:39 -0000 -@@ -102,7 +102,7 @@ endif - LOCAL_INCLUDES = -I$(srcdir) - - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) --OSHELPER += nsGNOMERegistry.cpp -+OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp - endif - - ifeq ($(MOZ_WIDGET_TOOLKIT),beos) -Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v -retrieving revision 1.10 -diff -d -u -p -r1.10 nsGNOMERegistry.cpp ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp 16 Oct 2004 13:46:17 -0000 1.10 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 21 Jul 2005 03:07:40 -0000 -@@ -42,7 +42,7 @@ - #include "nsString.h" - #include "nsIComponentManager.h" - #include "nsILocalFile.h" --#include "nsMIMEInfoImpl.h" -+#include "nsMIMEInfoUnix.h" - #include "nsAutoPtr.h" - - #include <glib.h> -@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient; - typedef struct _GnomeProgram GnomeProgram; - typedef struct _GnomeModuleInfo GnomeModuleInfo; - --typedef struct { -+struct GnomeVFSMimeApplication { - char *id; - char *name; - char *command; - /* there is more here, but we don't need it */ --} GnomeVFSMimeApplication; -+}; - - typedef GConfClient * (*_gconf_client_get_default_fn)(); - typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, -@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con - } - - --/* static */ already_AddRefed<nsMIMEInfoBase> -+/* static */ already_AddRefed<nsMIMEInfoUnix> - nsGNOMERegistry::GetFromExtension(const char *aFileExt) - { - if (!gconfLib) -@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const - return GetFromType(mimeType); - } - --/* static */ already_AddRefed<nsMIMEInfoBase> -+/* static */ already_AddRefed<nsMIMEInfoUnix> - nsGNOMERegistry::GetFromType(const char *aMIMEType) - { - if (!gconfLib) -@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char - if (!handlerApp) - return nsnull; - -- nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType); -+ nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType); - NS_ENSURE_TRUE(mimeInfo, nsnull); - -+ mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); -+ - // Get the list of extensions and append then to the mimeInfo. - GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); - for (GList *extension = extensions; extension; extension = extension->next) -@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char - return nsnull; - } - -- gchar *commandPath = g_find_program_in_path(nativeCommand); -+ gchar **argv; -+ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); -+ if (!res) { -+ NS_ERROR("Could not convert helper app command to filesystem encoding"); -+ _gnome_vfs_mime_application_free(handlerApp); -+ return nsnull; -+ } -+ -+ gchar *commandPath = g_find_program_in_path(argv[0]); - - g_free(nativeCommand); -+ g_strfreev(argv); - - if (!commandPath) { -+ NS_WARNING("could not find command in path"); - _gnome_vfs_mime_application_free(handlerApp); - return nsnull; - } -@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char - - _gnome_vfs_mime_application_free(handlerApp); - -- nsMIMEInfoBase* retval; -+ nsMIMEInfoUnix* retval; - NS_ADDREF((retval = mimeInfo)); - return retval; - } -Index: uriloader/exthandler/unix/nsGNOMERegistry.h -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v -retrieving revision 1.3 -diff -d -u -p -r1.3 nsGNOMERegistry.h ---- uriloader/exthandler/unix/nsGNOMERegistry.h 16 Oct 2004 13:46:17 -0000 1.3 -+++ uriloader/exthandler/unix/nsGNOMERegistry.h 21 Jul 2005 03:07:40 -0000 -@@ -35,10 +35,13 @@ - * - * ***** END LICENSE BLOCK ***** */ - -+#ifndef nsGNOMERegistry_h__ -+#define nsGNOMERegistry_h__ -+ - #include "nsIURI.h" - #include "nsCOMPtr.h" - --class nsMIMEInfoBase; -+class nsMIMEInfoUnix; - - class nsGNOMERegistry - { -@@ -52,7 +55,9 @@ class nsGNOMERegistry - static void GetAppDescForScheme(const nsACString& aScheme, - nsAString& aDesc); - -- static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt); -+ static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt); - -- static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType); -+ static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType); - }; -+ -+#endif // nsGNOMERegistry_h__ -Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -=================================================================== -RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 21 Jul 2005 03:07:40 -0000 -@@ -0,0 +1,196 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Red Hat, Inc. -+ * Portions created by the Initial Developer are Copyright (C) 2005 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Christopher Aillon <caillon@redhat.com> (Original author) -+ * -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include "nsMIMEInfoUnix.h" -+#include "prlink.h" -+#include "prmem.h" -+#include <glib.h> -+#include <glib-object.h> -+ -+static PRLibrary *gnomeLib; -+static PRLibrary *vfsLib; -+ -+typedef struct _GnomeProgram GnomeProgram; -+typedef struct _GnomeModuleInfo GnomeModuleInfo; -+ -+typedef enum { -+ GNOME_VFS_OK // there's more but we don't care about them. -+} GnomeVFSResult; -+ -+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) -+ (GnomeVFSMimeApplication *app, -+ GList *uris); -+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); -+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); -+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, -+ const GnomeModuleInfo *, int, -+ char **, const char *, ...); -+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); -+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); -+typedef GnomeProgram * (*_gnome_program_get_fn)(); -+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); -+ -+#define DECL_FUNC_PTR(func) static _##func##_fn _##func -+ -+DECL_FUNC_PTR(gnome_vfs_mime_application_launch); -+DECL_FUNC_PTR(gnome_vfs_mime_application_free); -+DECL_FUNC_PTR(gnome_vfs_mime_application_copy); -+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); -+DECL_FUNC_PTR(gnome_program_init); -+DECL_FUNC_PTR(gnome_program_get); -+DECL_FUNC_PTR(libgnome_module_info_get); -+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); -+ -+static PRLibrary * -+LoadVersionedLibrary(const char* libName, const char* libVersion) -+{ -+ char *platformLibName = PR_GetLibraryName(nsnull, libName); -+ nsCAutoString versionLibName(platformLibName); -+ versionLibName.Append(libVersion); -+ PR_Free(platformLibName); -+ return PR_LoadLibrary(versionLibName.get()); -+} -+ -+static void -+Cleanup() -+{ -+ // Unload all libraries -+ if (gnomeLib) -+ PR_UnloadLibrary(gnomeLib); -+ if (vfsLib) -+ PR_UnloadLibrary(vfsLib); -+ -+ gnomeLib = vfsLib = nsnull; -+} -+ -+static void -+InitGnomeVFS() -+{ -+ static PRBool initialized = PR_FALSE; -+ -+ if (initialized) -+ return; -+ -+ #define ENSURE_LIB(lib) \ -+ PR_BEGIN_MACRO \ -+ if (!lib) { \ -+ Cleanup(); \ -+ return; \ -+ } \ -+ PR_END_MACRO -+ -+ #define GET_LIB_FUNCTION(lib, func, failure) \ -+ PR_BEGIN_MACRO \ -+ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ -+ if (!_##func) { \ -+ failure; \ -+ } \ -+ PR_END_MACRO -+ -+ // Attempt to open libgnome -+ gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ ENSURE_LIB(gnomeLib); -+ -+ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); -+ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); -+ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); -+ -+ // Attempt to open libgnomevfs -+ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ ENSURE_LIB(vfsLib); -+ -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); -+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); -+ -+ // Initialize GNOME, if it's not already initialized. It's not -+ // necessary to tell GNOME about our actual command line arguments. -+ -+ if (!_gnome_program_get()) { -+ char *argv[1] = { "gecko" }; -+ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), -+ 1, argv, NULL); -+ } -+ -+ // Note: after GNOME has been initialized, do not ever unload these -+ // libraries. They register atexit handlers, so if they are unloaded, we'll -+ // crash on exit. -+} -+ -+void -+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) -+{ -+ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { -+ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); -+ -+ mPreferredAction = nsIMIMEInfo::useSystemDefault; -+ -+ const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); -+ if (name) -+ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); -+ } -+} -+ -+nsMIMEInfoUnix::~nsMIMEInfoUnix() -+{ -+ if (mDefaultVFSApplication) -+ _gnome_vfs_mime_application_free(mDefaultVFSApplication); -+} -+ -+nsresult -+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) -+{ -+ NS_ENSURE_ARG_POINTER(aFile); -+ -+ InitGnomeVFS(); -+ -+ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { -+ nsCAutoString nativePath; -+ aFile->GetNativePath(nativePath); -+ -+ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); -+ -+ GList *uris = NULL; -+ uris = g_list_append(uris, uri); -+ -+ GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); -+ -+ g_free(uri); -+ g_list_free(uris); -+ -+ if (result != GNOME_VFS_OK) -+ return NS_ERROR_FAILURE; -+ -+ return NS_OK; -+ } -+ -+ if (!mDefaultApplication) -+ return NS_ERROR_FILE_NOT_FOUND; -+ -+ return LaunchWithIProcess(mDefaultApplication, aFile); -+} -Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h -=================================================================== -RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h -diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 21 Jul 2005 03:07:40 -0000 -@@ -0,0 +1,50 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Red Hat, Inc. -+ * Portions created by the Initial Developer are Copyright (C) 2005 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Christopher Aillon <caillon@redhat.com> (Original author) -+ * -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#ifndef nsMimeInfoUnix_h__ -+#define nsMimeInfoUnix_h__ -+ -+#include "nsMIMEInfoImpl.h" -+ -+struct GnomeVFSMimeApplication; -+ -+class nsMIMEInfoUnix : public nsMIMEInfoImpl -+{ -+public: -+ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} -+ nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {}; -+ -+ virtual ~nsMIMEInfoUnix(); -+ -+ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); -+ -+protected: -+ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); -+ -+ GnomeVFSMimeApplication *mDefaultVFSApplication; -+}; -+ -+#endif // nsMimeInfoUnix_h__ -Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v -retrieving revision 1.58 -diff -d -u -p -r1.58 nsOSHelperAppService.cpp ---- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 -+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 21 Jul 2005 03:07:40 -0000 -@@ -44,6 +44,7 @@ - #include "nsOSHelperAppService.h" - #ifdef MOZ_WIDGET_GTK2 - #include "nsGNOMERegistry.h" -+#include "nsMIMEInfoUnix.h" - #endif - #include "nsISupports.h" - #include "nsString.h" -@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const - - LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get())); - -+#ifdef MOZ_WIDGET_GTK2 -+ // Look in GNOME registry first since it is the preferred method in GNOME, -+ // should trump the mailcap entry -+ LOG(("Looking in GNOME registry\n")); -+ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); -+ if (gnomeInfo) { -+ LOG(("Got MIMEInfo from GNOME registry\n")); -+ return gnomeInfo; -+ } -+#endif -+ - // extract the major and minor types - NS_ConvertASCIItoUTF16 mimeType(aMIMEType); - nsAString::const_iterator start_iter, end_iter, -@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const - mozillaFlags, - PR_TRUE); - -- -- if (handler.IsEmpty() && extensions.IsEmpty() && -- mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { -- // No useful data yet -- --#ifdef MOZ_WIDGET_GTK2 -- LOG(("Looking in GNOME registry\n")); -- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); -- if (gnomeInfo) { -- LOG(("Got MIMEInfo from GNOME registry\n")); -- return gnomeInfo; -- } --#endif -- } -- - if (handler.IsEmpty() && mailcap_description.IsEmpty()) { - DoLookUpHandlerAndDescription(majorType, - minorType, diff --git a/www-client/mozilla-firefox/files/firefox-gentoo-pkgconfig.patch b/www-client/mozilla-firefox/files/firefox-gentoo-pkgconfig.patch deleted file mode 100644 index 4dfe90216ec5..000000000000 --- a/www-client/mozilla-firefox/files/firefox-gentoo-pkgconfig.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- mozilla/config/autoconf.mk.in 2005-08-17 19:17:17.000000000 +0200 -+++ mozilla/config/autoconf.mk.in 2005-11-17 14:23:11.000000000 +0100 -@@ -54,13 +54,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = $(mozappdir)/include - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(mozappdir)/idl - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/mozilla-$(MOZ_APP_NAME) - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - ---- mozilla/build/unix/Makefile.in 2005-07-07 20:24:39.000000000 +0200 -+++ mozilla/build/unix/Makefile.in 2005-11-17 21:41:47.000000000 +0100 -@@ -56,7 +56,7 @@ - NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) - else - FULL_NSPR_CFLAGS=-I$(includedir)/nspr --FULL_NSPR_LIBS=$(subst -L$(libdir),-L$(mozappdir),$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) -+FULL_NSPR_LIBS=$(subst -L$(libdir),,$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) - NSPR_NAME=$(MOZ_APP_NAME)-nspr - NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) - endif -@@ -82,8 +82,9 @@ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%DEFS%|$(_DEFS)|" \ -- -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ -- -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@ -+ -e "s|%FULL_NSPR_LIBS%|-L$(mozappdir)$(FULL_NSPR_LIBS)|" \ -+ -e 's|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|' \ -+ -e 's|\(echo -L.*\)\($$\)|\1 -Wl,-R$(mozappdir)\2|' > $@ - - $(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk - cat $< | sed \ -@@ -96,10 +97,11 @@ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%SUPERWIN_LIBS%|$(SUPERWIN_LIBS)|" \ - -e "s|%DEFS%|$(_DEFS)|" \ -- -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ -- -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ -+ -e "s|%FULL_NSPR_LIBS%|-L\$$\{libdir}$(FULL_NSPR_LIBS)|" \ -+ -e "s|%FULL_NSPR_CFLAGS%|-I\$$\{includedir}/nspr|" \ - -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ -- -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ -+ -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ -+ -e "s|\(^Libs: -L.*\)|\1 -Wl,-R\$$\{libdir}|" > $@ - - libs:: $(MOZ_APP_NAME)-config - chmod 755 $< diff --git a/www-client/mozilla-firefox/files/gtk-prompt-service.patch b/www-client/mozilla-firefox/files/gtk-prompt-service.patch deleted file mode 100644 index a5829b7121d2..000000000000 --- a/www-client/mozilla-firefox/files/gtk-prompt-service.patch +++ /dev/null @@ -1,138 +0,0 @@ -? p -Index: embedding/browser/gtk/src/GtkPromptService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/GtkPromptService.cpp,v -retrieving revision 1.6 -diff -p -u -U10 -r1.6 GtkPromptService.cpp ---- embedding/browser/gtk/src/GtkPromptService.cpp 29 Sep 2003 06:03:48 -0000 1.6 -+++ embedding/browser/gtk/src/GtkPromptService.cpp 26 Oct 2004 14:02:19 -0000 -@@ -68,20 +68,22 @@ GtkPromptService::Alert(nsIDOMWindow* aP - prompter.Run(); - return NS_OK; - } - - NS_IMETHODIMP - GtkPromptService::AlertCheck(nsIDOMWindow* aParent, - const PRUnichar* aDialogTitle, - const PRUnichar* aDialogText, - const PRUnichar* aCheckMsg, PRBool* aCheckValue) - { -+ NS_ENSURE_ARG_POINTER(aCheckValue); -+ - EmbedPrompter prompter; - prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Alert").get()); - prompter.SetMessageText(aDialogText); - prompter.SetCheckMessage(aCheckMsg); - prompter.SetCheckValue(*aCheckValue); - prompter.Create(EmbedPrompter::TYPE_ALERT_CHECK, - GetGtkWindowForDOMWindow(aParent)); - prompter.Run(); - prompter.GetCheckValue(aCheckValue); - return NS_OK; -@@ -102,20 +104,22 @@ GtkPromptService::Confirm(nsIDOMWindow* - return NS_OK; - } - - NS_IMETHODIMP - GtkPromptService::ConfirmCheck(nsIDOMWindow* aParent, - const PRUnichar* aDialogTitle, - const PRUnichar* aDialogText, - const PRUnichar* aCheckMsg, - PRBool* aCheckValue, PRBool* aConfirm) - { -+ NS_ENSURE_ARG_POINTER(aCheckValue); -+ - EmbedPrompter prompter; - prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Confirm").get()); - prompter.SetMessageText(aDialogText); - prompter.SetCheckMessage(aCheckMsg); - prompter.SetCheckValue(*aCheckValue); - prompter.Create(EmbedPrompter::TYPE_CONFIRM_CHECK, - GetGtkWindowForDOMWindow(aParent)); - prompter.Run(); - prompter.GetCheckValue(aCheckValue); - prompter.GetConfirmValue(aConfirm); -@@ -164,24 +168,25 @@ GtkPromptService::ConfirmEx(nsIDOMWindow - NS_IMETHODIMP - GtkPromptService::Prompt(nsIDOMWindow* aParent, const PRUnichar* aDialogTitle, - const PRUnichar* aDialogText, PRUnichar** aValue, - const PRUnichar* aCheckMsg, PRBool* aCheckValue, - PRBool* aConfirm) - { - EmbedPrompter prompter; - prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get()); - prompter.SetMessageText(aDialogText); - prompter.SetTextValue(*aValue); -- if (aCheckMsg) { -+ if (aCheckMsg) - prompter.SetCheckMessage(aCheckMsg); -+ if (aCheckValue) - prompter.SetCheckValue(*aCheckValue); -- } -+ - prompter.Create(EmbedPrompter::TYPE_PROMPT, - GetGtkWindowForDOMWindow(aParent)); - prompter.Run(); - if (aCheckValue) - prompter.GetCheckValue(aCheckValue); - prompter.GetConfirmValue(aConfirm); - if (aConfirm) { - if (*aValue) - nsMemory::Free(*aValue); - prompter.GetTextValue(aValue); -@@ -197,24 +202,25 @@ GtkPromptService::PromptUsernameAndPassw - PRUnichar** aPassword, - const PRUnichar* aCheckMsg, - PRBool* aCheckValue, - PRBool* aConfirm) - { - EmbedPrompter prompter; - prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get()); - prompter.SetMessageText(aDialogText); - prompter.SetUser(*aUsername); - prompter.SetPassword(*aPassword); -- if (aCheckMsg) { -+ if (aCheckMsg) - prompter.SetCheckMessage(aCheckMsg); -+ if (aCheckValue) - prompter.SetCheckValue(*aCheckValue); -- } -+ - prompter.Create(EmbedPrompter::TYPE_PROMPT_USER_PASS, - GetGtkWindowForDOMWindow(aParent)); - prompter.Run(); - if (aCheckValue) - prompter.GetCheckValue(aCheckValue); - prompter.GetConfirmValue(aConfirm); - if (*aConfirm) { - if (*aUsername) - nsMemory::Free(*aUsername); - prompter.GetUser(aUsername); -@@ -231,24 +237,25 @@ GtkPromptService::PromptPassword(nsIDOMW - const PRUnichar* aDialogTitle, - const PRUnichar* aDialogText, - PRUnichar** aPassword, - const PRUnichar* aCheckMsg, - PRBool* aCheckValue, PRBool* aConfirm) - { - EmbedPrompter prompter; - prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get()); - prompter.SetMessageText(aDialogText); - prompter.SetPassword(*aPassword); -- if (aCheckMsg) { -+ if (aCheckMsg) - prompter.SetCheckMessage(aCheckMsg); -+ if (aCheckValue) - prompter.SetCheckValue(*aCheckValue); -- } -+ - prompter.Create(EmbedPrompter::TYPE_PROMPT_PASS, - GetGtkWindowForDOMWindow(aParent)); - prompter.Run(); - if (aCheckValue) - prompter.GetCheckValue(aCheckValue); - prompter.GetConfirmValue(aConfirm); - if (*aConfirm) { - if (*aPassword) - nsMemory::Free(*aPassword); - prompter.GetPassword(aPassword); diff --git a/www-client/mozilla-firefox/files/gtk-tooltips.patch b/www-client/mozilla-firefox/files/gtk-tooltips.patch deleted file mode 100644 index 9d40fdca62b3..000000000000 --- a/www-client/mozilla-firefox/files/gtk-tooltips.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: embedding/browser/gtk/src/EmbedWindow.cpp -=================================================================== -RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp,v -retrieving revision 1.30 -diff -p -u -u -p -r1.30 EmbedWindow.cpp ---- embedding/browser/gtk/src/EmbedWindow.cpp 28 Jul 2004 20:54:50 -0000 1.30 -+++ embedding/browser/gtk/src/EmbedWindow.cpp 26 Oct 2004 13:12:27 -0000 -@@ -383,6 +383,19 @@ EmbedWindow::SetVisibility(PRBool aVisib - - // nsITooltipListener - -+static gint -+tooltips_paint_window(GtkWidget *window) -+{ -+ // draw tooltip style border around the text -+ gtk_paint_flat_box(window->style, window->window, -+ GTK_STATE_NORMAL, GTK_SHADOW_OUT, -+ NULL, window, "tooltip", -+ 0, 0, -+ window->allocation.width, window->allocation.height); -+ -+ return FALSE; -+} -+ - NS_IMETHODIMP - EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, - const PRUnichar *aTipText) -@@ -433,12 +446,15 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoo - // realize the widget - gtk_widget_realize(sTipWindow); - -+ gtk_signal_connect(GTK_OBJECT(sTipWindow), "expose_event", -+ GTK_SIGNAL_FUNC(tooltips_paint_window), NULL); -+ - // set up the label for the tooltip - GtkWidget *label = gtk_label_new(tipString); - // wrap automatically - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_container_add(GTK_CONTAINER(sTipWindow), label); -- gtk_container_set_border_width(GTK_CONTAINER(sTipWindow), 3); -+ gtk_container_set_border_width(GTK_CONTAINER(sTipWindow), 4); - // set the coords for the widget - gtk_widget_set_uposition(sTipWindow, aXCoords + root_x, - aYCoords + root_y); -@@ -446,13 +462,6 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoo - // and show it. - gtk_widget_show_all(sTipWindow); - -- // draw tooltip style border around the text -- gtk_paint_flat_box(sTipWindow->style, sTipWindow->window, -- GTK_STATE_NORMAL, GTK_SHADOW_OUT, -- NULL, GTK_WIDGET(sTipWindow), "tooltip", -- 0, 0, -- sTipWindow->allocation.width, sTipWindow->allocation.height); -- - #ifdef MOZ_WIDGET_GTK - gtk_widget_popup(sTipWindow, aXCoords + root_x, aYCoords + root_y); - #endif /* MOZ_WIDGET_GTK */ diff --git a/www-client/mozilla-firefox/files/icon/deerpark-icon.png b/www-client/mozilla-firefox/files/icon/deerpark-icon.png Binary files differdeleted file mode 100644 index 67e1e8ab902d..000000000000 --- a/www-client/mozilla-firefox/files/icon/deerpark-icon.png +++ /dev/null diff --git a/www-client/mozilla-firefox/files/mozilla-1.3-alpha-stubs.patch b/www-client/mozilla-firefox/files/mozilla-1.3-alpha-stubs.patch deleted file mode 100644 index 3aa192be9246..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.3-alpha-stubs.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -Naur mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2001-09-28 15:12:51.000000000 -0500 -+++ mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2003-03-18 09:50:06.000000000 -0600 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,8 +38,6 @@ - - /* Platform specific code to invoke XPCOM methods on native objects */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ -@@ -163,7 +162,11 @@ - "bis $16,$16,$1\n\t" /* load "this" */ - "ldq $2,16($15)\n\t" /* load "methodIndex" */ - "ldq $1,0($1)\n\t" /* load vtable */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ "s8addq $2,$31,$2\n\t" /* vtable index = "methodIndex" * 8 */ -+#else /* not G++ V3 ABI */ - "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#endif /* G++ V3 ABI */ - "addq $1,$2,$1\n\t" - "ldq $27,0($1)\n\t" /* load address of function */ - "jsr $26,($27),0\n\t" /* call virtual function */ -@@ -176,4 +179,3 @@ - "ret $31,($26),1\n\t" - ".end XPTC_InvokeByIndex" - ); -- -diff -Naur mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2001-09-28 15:12:52.000000000 -0500 -+++ mozilla-alpha-stubs/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2003-03-18 09:50:06.000000000 -0600 -@@ -20,6 +20,7 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * Glen Nakamura <glen@imodulo.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -37,8 +38,6 @@ - - /* Implement shared vtbl methods. */ - --/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -- - #include "xptcprivate.h" - - /* Prototype specifies unmangled function name and disables unused warning */ -@@ -188,23 +187,45 @@ - * nsresult nsXPTCStubBase::Stub##n() - * Sets register $1 to "methodIndex" and jumps to SharedStub. - */ -+#define STUB_MANGLED_ENTRY(n, symbol) \ -+ "#### Stub"#n" ####" "\n\t" \ -+ ".text" "\n\t" \ -+ ".align 5" "\n\t" \ -+ ".globl " symbol "\n\t" \ -+ ".ent " symbol "\n" \ -+symbol ":" "\n\t" \ -+ ".frame $30,0,$26,0" "\n\t" \ -+ "ldgp $29,0($27)" "\n" \ -+"$" symbol "..ng:" "\n\t" \ -+ ".prologue 1" "\n\t" \ -+ "lda $1,"#n "\n\t" \ -+ "br $31,$SharedStub..ng" "\n\t" \ -+ ".end " symbol -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ ".if "#n" < 10" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase5Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 100" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase6Stub"#n"Ev") "\n\t" \ -+ ".elseif "#n" < 1000" "\n\t" \ -+ STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase7Stub"#n"Ev") "\n\t" \ -+ ".else" "\n\t" \ -+ ".err \"Stub"#n" >= 1000 not yet supported.\"" "\n\t" \ -+ ".endif" \ -+ ); -+ -+#else /* not G++ V3 ABI */ -+ - #define STUB_ENTRY(n) \ - __asm__( \ -- "#### Stub"#n" ####\n" \ --".text\n\t" \ -- ".align 5\n\t" \ -- ".globl Stub"#n"__14nsXPTCStubBase\n\t" \ -- ".ent Stub"#n"__14nsXPTCStubBase\n" \ --"Stub"#n"__14nsXPTCStubBase:\n\t" \ -- ".frame $30,0,$26,0\n\t" \ -- "ldgp $29,0($27)\n" \ --"$Stub"#n"__14nsXPTCStubBase..ng:\n\t" \ -- ".prologue 1\n\t" \ -- "lda $1,"#n"\n\t" \ -- "br $31,$SharedStub..ng\n\t" \ -- ".end Stub"#n"__14nsXPTCStubBase" \ -+ STUB_MANGLED_ENTRY(n, "Stub"#n"__14nsXPTCStubBase") \ - ); - -+#endif /* G++ V3 ABI */ -+ - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ - { \ -@@ -213,4 +234,3 @@ - } - - #include "xptcstubsdef.inc" -- diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch deleted file mode 100644 index d5a36c21401d..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2-needs-pangox-and-pangoxft.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- mozilla/configure.in 2005-11-02 21:55:31.000000000 +0200 -+++ mozilla.az/configure.in 2005-11-02 21:53:46.000000000 +0200 -@@ -3249,7 +3249,10 @@ - - if test "$MOZ_ENABLE_GTK2" - then -- PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7) -+ dnl xlfd_from_pango_font_description() in gfx/src/gtk/nsDeviceContextGTK.cpp -+ dnl uses pango_x_font_map_for_display() with or without xft, so we need to -+ dnl add pangox here. -+ PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7 pangox >= 1.1.0) - fi - - if test "$MOZ_ENABLE_XLIB" -@@ -3464,9 +3467,10 @@ - if test "$MOZ_ENABLE_XFT" - then - AC_DEFINE(MOZ_ENABLE_XFT) -- PKG_CHECK_MODULES(MOZ_XFT, xft) - if test "$MOZ_ENABLE_GTK2"; then -- PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) -+ PKG_CHECK_MODULES(MOZ_XFT, xft pangoxft >= 1.1.0) -+ else -+ PKG_CHECK_MODULES(MOZ_XFT, xft) - fi - fi - diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch deleted file mode 100644 index 43fd152a745d..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2005-09-26 20:39:02.000000000 +0200 -+++ mozilla.az/gfx/src/gtk/nsFontMetricsXft.cpp 2005-09-26 20:34:34.000000000 +0200 -@@ -2775,10 +2779,14 @@ FreeGlobals(void) - NS_IF_RELEASE(gFontEncodingProperties); - NS_IF_RELEASE(gCharsetManager); - gCTLEnabled = PR_FALSE; -- if (gPangoContext) -+ if (gPangoContext) { - g_object_unref(gPangoContext); -- if (gPangoAttrList) -+ gPangoContext = nsnull; -+ } -+ if (gPangoAttrList) { - pango_attr_list_unref(gPangoAttrList); -+ gPangoAttrList = nsnull; -+ } - - gFontXftMaps.Clear(); - diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-libart-freetype.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-libart-freetype.patch deleted file mode 100644 index 84392bd4acdf..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.7.12-libart-freetype.patch +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $ - -diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ---- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-03-19 10:36:16.000000000 +0900 -+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-07-04 22:59:19.000000000 +0900 -@@ -155,15 +155,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsDependentString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsDependentString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsDependentString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-pango-needs-pangox.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-pango-needs-pangox.patch deleted file mode 100644 index 6302df259e5e..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.7.12-pango-needs-pangox.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/configure.in 2005-11-02 17:47:07.000000000 +0200 -+++ mozilla.az/configure.in 2005-11-02 17:47:18.000000000 +0200 -@@ -3486,7 +3486,7 @@ - if test "$MOZ_ENABLE_PANGO" - then - AC_DEFINE(MOZ_ENABLE_PANGO) -- PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.5.0) -+ PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.5.0 pangox >= 1.5.0) - - dnl Make sure that the pango version is _actually_ new enough - _SAVE_CFLAGS=$CFLAGS diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-rpath.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-rpath.patch deleted file mode 100644 index 405339578f8b..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.7.12-rpath.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 1/config/rules.mk 2005-07-28 01:45:18.000000000 +0000 -+++ 2/config/rules.mk 2005-07-28 01:45:21.000000000 +0000 -@@ -507,5 +507,10 @@ - # - ifeq ($(OS_ARCH),Linux) - ifdef IS_COMPONENT -+DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER -+OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+else -+DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER -+OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER - endif ---- 1/nsprpub/config/rules.mk 2003-09-16 02:00:28.000000000 +0000 -+++ 2/nsprpub/config/rules.mk 2005-07-30 04:00:21.000000000 +0000 -@@ -87,6 +87,9 @@ - endif - endif - -+DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER -+OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER -+ - # - # This makefile contains rules for building the following kinds of - # libraries: ---- 1/security/coreconf/rules.mk 2005-07-31 16:31:37.000000000 +0000 -+++ 2/security/coreconf/rules.mk 2005-07-31 16:37:27.000000000 +0000 -@@ -349,7 +349,7 @@ - ifdef XP_OS2_VACPP - $(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) - else -- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) -+ $(MKSHLIB) -Wl,-rpath,#RPATH_FIXER -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) - endif - chmod +x $@ - ifeq ($(OS_TARGET),Darwin) ---- 1/security/coreconf/rules.mk 2005-08-01 11:40:54.000000000 +0000 -+++ 2/security/coreconf/rules.mk 2005-08-01 11:50:31.000000000 +0000 -@@ -291,7 +291,7 @@ - ifdef XP_OS2_VACPP - $(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) - else -- $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) -+ $(MKPROG) -Wl,-rpath,#RPATH_FIXER -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) - endif - endif - diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.6-gcc4.patch b/www-client/mozilla-firefox/files/mozilla-1.7.6-gcc4.patch deleted file mode 100644 index 2d0a04949072..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.7.6-gcc4.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 -@@ -43,12 +43,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - extern const NSSOID *NSS_OID_RFC1274_UID; - extern const NSSOID *NSS_OID_RFC1274_EMAIL; - extern const NSSOID *NSS_OID_RFC2247_DC; -diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 -@@ -233,12 +233,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - EOD - ; - -diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 -@@ -55,7 +55,9 @@ - - PR_BEGIN_EXTERN_C - --/* fgmr 19990505 moved these here from oiddata.h */ -+extern const NSSOID nss_builtin_oids[]; -+extern const PRUint32 nss_builtin_oid_count; -+ - extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; - extern const PRUint32 nss_attribute_type_alias_count; - diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.8-amd64.patch b/www-client/mozilla-firefox/files/mozilla-1.7.8-amd64.patch deleted file mode 100644 index 96215fb292d5..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-1.7.8-amd64.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- 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-firefox/files/mozilla-firefox-1.0-kp_separator.patch b/www-client/mozilla-firefox/files/mozilla-firefox-1.0-kp_separator.patch deleted file mode 100644 index 589179158f12..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-firefox-1.0-kp_separator.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/widget/src/gtk2/nsGtkKeyUtils.cpp.original 2004-10-03 20:16:19.884311832 +0200 -+++ mozilla/widget/src/gtk2/nsGtkKeyUtils.cpp 2004-10-03 20:16:31.562536472 +0200 -@@ -280,7 +280,7 @@ - case GDK_KP_Add: - return '+'; - case GDK_KP_Separator: -- return '|'; -+ return ','; - case GDK_KP_Subtract: - return '-'; - case GDK_KP_Decimal: diff --git a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-prefs.patch b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-prefs.patch deleted file mode 100644 index 722f4ab922e2..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.3-prefs.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- mozilla-firefox-1.0.3.orig/browser/app/profile/firefox.js -+++ mozilla-firefox-1.0.3/browser/app/profile/firefox.js -@@ -38,6 +38,9 @@ - // SYNTAX HINTS: dashes are delimiters. Use underscores instead. - // The first character after a period must be alphabetic. - -+// Disable default browser checking. -+pref("browser.shell.checkDefaultBrowser", false); -+ - // pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties"); - pref("general.startup.browser", true); - -@@ -62,8 +65,8 @@ - ); - - // App-specific update preferences --pref("app.update.enabled", true); // Whether or not app updates are enabled --pref("app.update.autoUpdateEnabled", true); // Whether or not background app updates -+pref("app.update.enabled", false); // Whether or not app updates are enabled -+pref("app.update.autoUpdateEnabled", false); // Whether or not background app updates - // are enabled - pref("app.update.url", "chrome://mozapps/locale/update/update.properties"); - pref("app.update.updatesAvailable", false); -@@ -81,7 +84,7 @@ - // .. etc .. - // - pref("extensions.update.enabled", true); --pref("extensions.update.autoUpdateEnabled", true); -+pref("extensions.update.autoUpdateEnabled", false); - pref("extensions.update.url", "chrome://mozapps/locale/extensions/extensions.properties"); - pref("extensions.update.autoUpdate", false); // Automatically download and install - // updates to themes and extensions. -@@ -237,6 +240,9 @@ - pref("network.cookie.cookieBehavior", 0); // cookies enabled - pref("network.cookie.enableForCurrentSessionOnly", false); - -+// Use LANG environment variable to choose locale -+pref("intl.locale.matchOS", true); -+ - // l12n and i18n - pref("intl.accept_languages", "chrome://global/locale/intl.properties"); - // collationOption is only set on linux for japanese. see bug 18338 and 62015 -@@ -327,3 +333,17 @@ - - // plugin finder service - pref("pfs.datasource.url", "chrome://mozapps/locale/plugins/plugins.properties"); -+ -+// enable negotiate extension -+pref("network.negotiate-auth.trusted-uris", "https://"); -+ -+// don't raise windows by default -+pref("mozilla.widget.raise-on-setfocus", false); -+ -+// disable insecure ciphers -+pref("security.enable_ssl2", false); -+ -+pref("security.ssl2.rc2_40", false); -+pref("security.ssl2.rc4_40", false); -+pref("security.ssl3.rsa_rc4_40_md5", false); -+pref("security.ssl3.rsa_rc2_40_md5", false); ---- mozilla-firefox-1.0.3.orig/browser/components/prefwindow/content/pref-advanced.xul -+++ mozilla-firefox-1.0.3/browser/components/prefwindow/content/pref-advanced.xul -@@ -72,9 +72,9 @@ - open="true" persist="open" clearhidden="true" align="left"> - <label>&softwareupdateinfo.label;</label> - <vbox class="indent" align="left"> -- <checkbox id="enableSmartUpdate" -+ <!-- checkbox id="enableSmartUpdate" - label="&enableSmartUpdate.label;" accesskey="&enableSmartUpdate.accesskey;" -- prefstring="app.update.autoUpdateEnabled"/> -+ prefstring="app.update.autoUpdateEnabled"/ --> - <checkbox id="enableExtensionUpdate" - label="&enableExtensionUpdate.label;" accesskey="&enableExtensionUpdate.accesskey;" - prefstring="extensions.update.autoUpdateEnabled"/> diff --git a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.4-gcc4.patch b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.4-gcc4.patch deleted file mode 100644 index 2d0a04949072..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.4-gcc4.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 -@@ -43,12 +43,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - extern const NSSOID *NSS_OID_RFC1274_UID; - extern const NSSOID *NSS_OID_RFC1274_EMAIL; - extern const NSSOID *NSS_OID_RFC2247_DC; -diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 -@@ -233,12 +233,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - EOD - ; - -diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 -@@ -55,7 +55,9 @@ - - PR_BEGIN_EXTERN_C - --/* fgmr 19990505 moved these here from oiddata.h */ -+extern const NSSOID nss_builtin_oids[]; -+extern const PRUint32 nss_builtin_oid_count; -+ - extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; - extern const PRUint32 nss_attribute_type_alias_count; - diff --git a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.6-GLSA105396.patch b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.6-GLSA105396.patch deleted file mode 100644 index 30839e8e4eaf..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.6-GLSA105396.patch +++ /dev/null @@ -1,104 +0,0 @@ -Index: nsStandardURL.cpp -=================================================================== -RCS file: /cvs/mozilla/netwerk/base/src/nsStandardURL.cpp,v -retrieving revision 1.60.16.2 -diff -p -u -1 -2 -r1.60.16.2 nsStandardURL.cpp ---- 1/netwerk/base/src/nsStandardURL.cpp 17 Feb 2005 23:40:53 -0000 1.60.16.2 -+++ 2/netwerk/base/src/nsStandardURL.cpp 9 Sep 2005 16:34:46 -0000 -@@ -403,24 +403,25 @@ nsStandardURL::AppendToBuf(char *buf, PR - // 4- update url segment positions and lengths - nsresult - nsStandardURL::BuildNormalizedSpec(const char *spec) - { - // Assumptions: all member URLSegments must be relative the |spec| argument - // passed to this function. - - // buffers for holding escaped url segments (these will remain empty unless - // escaping is required). - nsCAutoString encUsername; - nsCAutoString encPassword; - nsCAutoString encHost; -+ PRBool useEncHost; - nsCAutoString encDirectory; - nsCAutoString encBasename; - nsCAutoString encExtension; - nsCAutoString encParam; - nsCAutoString encQuery; - nsCAutoString encRef; - - // - // escape each URL segment, if necessary, and calculate approximate normalized - // spec length. - // - PRInt32 approxLen = 3; // includes room for "://" -@@ -440,34 +441,36 @@ nsStandardURL::BuildNormalizedSpec(const - approxLen += encoder.EncodeSegmentCount(spec, mBasename, esc_FileBaseName, encBasename); - approxLen += encoder.EncodeSegmentCount(spec, mExtension, esc_FileExtension, encExtension); - approxLen += encoder.EncodeSegmentCount(spec, mParam, esc_Param, encParam); - approxLen += encoder.EncodeSegmentCount(spec, mQuery, esc_Query, encQuery); - approxLen += encoder.EncodeSegmentCount(spec, mRef, esc_Ref, encRef); - } - - // do not escape the hostname, if IPv6 address literal, mHost will - // already point to a [ ] delimited IPv6 address literal. - // However, perform Unicode normalization on it, as IDN does. - mHostEncoding = eEncoding_ASCII; - if (mHost.mLen > 0) { -+ useEncHost = PR_FALSE; - const nsCSubstring& tempHost = - Substring(spec + mHost.mPos, spec + mHost.mPos + mHost.mLen); - if (IsASCII(tempHost)) - approxLen += mHost.mLen; - else { - mHostEncoding = eEncoding_UTF8; - if (gIDNService && -- NS_SUCCEEDED(gIDNService->Normalize(tempHost, encHost))) -+ NS_SUCCEEDED(gIDNService->Normalize(tempHost, encHost))) { - approxLen += encHost.Length(); -- else { -+ useEncHost = PR_TRUE; -+ } else { - encHost.Truncate(); - approxLen += mHost.mLen; - } - } - } - - // - // generate the normalized URL string - // - mSpec.SetLength(approxLen + 32); - char *buf; - mSpec.BeginWriting(buf); -@@ -483,25 +486,30 @@ nsStandardURL::BuildNormalizedSpec(const - mAuthority.mPos = i; - - // append authority - if (mUsername.mLen > 0) { - i = AppendSegmentToBuf(buf, i, spec, mUsername, &encUsername); - if (mPassword.mLen >= 0) { - buf[i++] = ':'; - i = AppendSegmentToBuf(buf, i, spec, mPassword, &encPassword); - } - buf[i++] = '@'; - } - if (mHost.mLen > 0) { -- i = AppendSegmentToBuf(buf, i, spec, mHost, &encHost); -+ if (useEncHost) { -+ mHost.mPos = i; -+ mHost.mLen = encHost.Length(); -+ i = AppendToBuf(buf, i, encHost.get(), mHost.mLen); -+ } else -+ i = AppendSegmentToBuf(buf, i, spec, mHost); - net_ToLowerCase(buf + mHost.mPos, mHost.mLen); - if (mPort != -1 && mPort != mDefaultPort) { - nsCAutoString portbuf; - portbuf.AppendInt(mPort); - buf[i++] = ':'; - i = AppendToBuf(buf, i, portbuf.get(), portbuf.Length()); - } - } - - // record authority length - mAuthority.mLen = i - mAuthority.mPos; - diff --git a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.6-gcc4.patch b/www-client/mozilla-firefox/files/mozilla-firefox-1.0.6-gcc4.patch deleted file mode 100644 index 8c9eea40b00c..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-firefox-1.0.6-gcc4.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 -@@ -43,12 +43,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - extern const NSSOID *NSS_OID_RFC1274_UID; - extern const NSSOID *NSS_OID_RFC1274_EMAIL; - extern const NSSOID *NSS_OID_RFC2247_DC; -diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 -@@ -233,12 +233,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - EOD - ; - -diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 -@@ -55,7 +55,9 @@ - - PR_BEGIN_EXTERN_C - --/* fgmr 19990505 moved these here from oiddata.h */ -+extern const NSSOID nss_builtin_oids[]; -+extern const PRUint32 nss_builtin_oid_count; -+ - extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; - extern const PRUint32 nss_attribute_type_alias_count; - -diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h ---- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000 -+++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000 -@@ -365,8 +365,9 @@ - * Use these macros to do 64bit safe pointer conversions. - */ - --#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0) --#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x))) -+#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x)) -+#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x)) -+#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x)) - - /* - * These macros allow you to give a hint to the compiler about branch -diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp ---- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:07:51.199832896 +0000 -+++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:13:08.302625944 +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_UINT32(param) & 0xFFFF0000) >> 16; -+ PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF; - - switch (name) { - case MAX_CONNECTIONS: -diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp ---- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:08:57.666728392 +0000 -+++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920 +0000 -@@ -838,7 +838,7 @@ - (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); - listTarget->target = g_strdup(gMimeListType); - listTarget->flags = 0; -- listTarget->info = (guint)listAtom; -+ listTarget->info = GPOINTER_TO_UINT(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 = GPOINTER_TO_UINT(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 = GPOINTER_TO_UINT(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 = GPOINTER_TO_UINT(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 = GPOINTER_TO_UINT(urlAtom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("automatically adding target %s with \ - id %ld\n", urlTarget->target, urlAtom)); - diff --git a/www-client/mozilla-firefox/files/mozilla-hppa.patch b/www-client/mozilla-firefox/files/mozilla-hppa.patch deleted file mode 100644 index d874ae1c4d5c..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-hppa.patch +++ /dev/null @@ -1,232 +0,0 @@ -diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-12-21 13:37:00.503842544 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-12-21 13:41:49.439917584 +0000 -@@ -167,6 +167,19 @@ - endif - endif - -+# -+# Linux/HPPA/gcc -+# -+ifeq ($(OS_ARCH),Linux) -+ifneq (,$(filter parisc parisc64,$(OS_TEST))) -+#ifeq ($(CC),gcc) # Do not check for gcc since there is only this compiler on linux for hppa -+CPPSRCS := xptcinvoke_pa32.cpp xptcstubs_pa32.cpp -+ASFILES := xptcstubs_asm_parisc_linux.s xptcinvoke_asm_parisc_linux.s -+#endif -+endif -+endif -+ -+ - ###################################################################### - # M68k - ###################################################################### -diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s 1970-01-01 00:00:00.000000000 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s 2004-12-21 13:39:03.390160984 +0000 -@@ -0,0 +1,128 @@ -+ -+ .LEVEL 1.1 -+ .text -+ .align 4 -+ -+framesz: -+ .equ 128 -+ -+; XPTC_InvokeByIndex(nsISuppots* that, PRUint32 methodIndex, -+; PRUint32 paramCount, nsXPTCVariant* params); -+ -+.globl XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, @function -+ -+ -+XPTC_InvokeByIndex: -+ .PROC -+ .CALLINFO FRAME=72, CALLER,SAVE_RP, SAVE_SP, ENTRY_GR=3 -+ .ENTRY -+ -+ ; frame marker takes 48 bytes, -+ ; register spill area takes 8 bytes, -+ ; local stack area takes 72 bytes result in 128 bytes total -+ -+ STW %rp,-20(%sp) -+ STW,MA %r3,128(%sp) -+ -+ LDO -framesz(%r30),%r28 -+ STW %r28,-4(%r30) ; save previous sp -+ STW %r19,-32(%r30) -+ -+ STW %r26,-36-framesz(%r30) ; save argument registers in -+ STW %r25,-40-framesz(%r30) ; in PREVIOUS frame -+ STW %r24,-44-framesz(%r30) ; -+ STW %r23,-48-framesz(%r30) ; -+ -+; B,L .+8,%r2 -+; ADDIL L'invoke_count_bytes-$PIC_pcrel$1+4,%r2,%r1 -+; ; LDO R'invoke_count_bytes-$PIC_pcrel$2+8(%r1),%r1 -+;$PIC_pcrel$1 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$2 -+; MTSP %r31,%sr0 -+ -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26;out=28 -+ BL invoke_count_bytes,%r31 -+ COPY %r31,%r2 -+ -+ CMPIB,>= 0,%r28, .+76 -+ COPY %r30,%r3 ; copy stack ptr to saved stack ptr -+ ADD %r30,%r28,%r30 ; extend stack frame -+ LDW -4(%r3),%r28 ; move frame -+ STW %r28,-4(%r30) -+ LDW -8(%r3),%r28 -+ STW %r28,-8(%r30) -+ LDW -12(%r3),%r28 -+ STW %r28,-12(%r30) -+ LDW -16(%r3),%r28 -+ STW %r28,-16(%r30) -+ LDW -20(%r3),%r28 -+ STW %r28,-20(%r30) -+ LDW -24(%r3),%r28 -+ STW %r28,-24(%r30) -+ LDW -28(%r3),%r28 -+ STW %r28,-28(%r30) -+ LDW -32(%r3),%r28 -+ STW %r28,-32(%r30) -+ -+ LDO -40(%r30),%r26 ; load copy address -+ LDW -44-framesz(%r3),%r25 ; load rest of 2 arguments -+ LDW -48-framesz(%r3),%r24 ; -+ -+ LDW -32(%r30),%r19 ; shared lib call destroys r19; reload -+; B,L .+8,%r2 -+; ADDIL L'invoke_copy_to_stack-$PIC_pcrel$3+4,%r2,%r1 -+; LDO R'invoke_copy_to_stack-$PIC_pcrel$4+8(%r1),%r1 -+;$PIC_pcrel$3 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$4 -+; MTSP %r31,%sr0 -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26 -+ BL invoke_copy_to_stack,%r31 -+ COPY %r31,%r2 -+ -+ LDO -48(%r30),%r20 -+ EXTRW,U,= %r28,31,1,%r22 -+ FLDD 0(%r20),%fr7 ; load double arg 1 -+ EXTRW,U,= %r28,30,1,%r22 -+ FLDW 8(%r20),%fr5L ; load float arg 1 -+ EXTRW,U,= %r28,29,1,%r22 -+ FLDW 4(%r20),%fr6L ; load float arg 2 -+ EXTRW,U,= %r28,28,1,%r22 -+ FLDW 0(%r20),%fr7L ; load float arg 3 -+ -+ LDW -36-framesz(%r3),%r26 ; load ptr to 'that' -+ LDW -40(%r30),%r25 ; load the rest of dispatch argument registers -+ LDW -44(%r30),%r24 -+ LDW -48(%r30),%r23 -+ -+ LDW -36-framesz(%r3),%r20 ; load vtable addr -+ LDW -40-framesz(%r3),%r28 ; load index -+ LDW 0(%r20),%r20 ; follow vtable -+; LDO 0(%r20),%r20 ; offset vtable by 16 bytes (g++: 8, aCC: 16) -+ SH2ADDL %r28,%r20,%r28 ; add 4*index to vtable entry -+ LDW 0(%r28),%r22 ; load vtable entry -+ -+; B,L .+8,%r2 -+; ADDIL L'$$dyncall_external-$PIC_pcrel$5+4,%r2,%r1 -+; LDO R'$$dyncall_external-$PIC_pcrel$6+8(%r1),%r1 -+;$PIC_pcrel$5 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$6 -+; MTSP %r31,%sr0 -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=22-26;out=28; -+ BL $$dyncall,%r31 -+ COPY %r31,%r2 -+ -+ LDW -32(%r30),%r19 -+ COPY %r3,%r30 ; restore saved stack ptr -+ -+ LDW -148(%sp),%rp -+ LDWM -128(%sp),%r3 -+ BV,N (%rp) -+ NOP -+ .EXIT -+ .PROCEND ;in=23,24,25,26; -+ .SIZE XPTC_InvokeByIndex, .-XPTC_InvokeByIndex -+ -diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s ---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s 1970-01-01 00:00:00.000000000 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s 2004-12-21 13:39:03.392160680 +0000 -@@ -0,0 +1,73 @@ -+ .LEVEL 1.1 -+ .TEXT -+ .ALIGN 4 -+ -+curframesz: -+ .EQU 128 -+ -+ -+; SharedStub has stack size of 128 bytes -+ -+lastframesz: -+ .EQU 64 -+ -+; the StubN C++ function has a small stack size of 64 bytes -+ -+ -+.globl SharedStub -+ .type SharedStub, @function -+ -+SharedStub: -+ .PROC -+ .CALLINFO CALLER,FRAME=80,SAVE_RP -+ -+ .ENTRY -+ STW %rp,-20(%sp) -+ LDO 128(%sp),%sp -+ -+ STW %r19,-32(%r30) -+ STW %r26,-36-curframesz(%r30) ; save arg0 in previous frame -+ -+ LDO -80(%r30),%r28 -+ FSTD,MA %fr5,8(%r28) ; save darg0 -+ FSTD,MA %fr7,8(%r28) ; save darg1 -+ FSTW,MA %fr4L,4(%r28) ; save farg0 -+ FSTW,MA %fr5L,4(%r28) ; save farg1 -+ FSTW,MA %fr6L,4(%r28) ; save farg2 -+ FSTW,MA %fr7L,4(%r28) ; save farg3 -+ -+ ; Former value of register 26 is already properly saved by StubN, -+ ; but register 25-23 are not because of the arguments mismatch -+ STW %r25,-40-curframesz-lastframesz(%r30) ; save r25 -+ STW %r24,-44-curframesz-lastframesz(%r30) ; save r24 -+ STW %r23,-48-curframesz-lastframesz(%r30) ; save r23 -+ COPY %r26,%r25 ; method index is arg1 -+ LDW -36-curframesz-lastframesz(%r30),%r26 ; self is arg0 -+ LDO -40-curframesz-lastframesz(%r30),%r24 ; normal args is arg2 -+ LDO -80(%r30),%r23 ; floating args is arg3 -+ -+; BL .+8,%r2 -+; ADDIL L'PrepareAndDispatch-$PIC_pcrel$0+4,%r2 -+; LDO R'PrepareAndDispatch-$PIC_pcrel$1+8(%r1),%r1 -+;$PIC_pcrel$0 -+; LDSID (%r1),%r31 -+;$PIC_pcrel$1 -+; MTSP %r31,%sr0 -+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=23-26;out=28; -+ BL PrepareAndDispatch, %r31 -+ COPY %r31,%r2 -+ -+ LDW -32(%r30),%r19 -+ -+ LDW -148(%sp),%rp -+ LDO -128(%sp),%sp -+ -+ -+ BV,N (%rp) -+ NOP -+ NOP -+ -+ .EXIT -+ .PROCEND ;in=26;out=28; -+ -+ .SIZE SharedStub, .-SharedStub diff --git a/www-client/mozilla-firefox/files/mozilla-rpath-1.patch b/www-client/mozilla-firefox/files/mozilla-rpath-1.patch deleted file mode 100644 index 39969cd63ec1..000000000000 --- a/www-client/mozilla-firefox/files/mozilla-rpath-1.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- config/rules.mk.orig 2005-07-28 01:45:18.000000000 +0000 -+++ config/rules.mk 2005-07-28 01:45:21.000000000 +0000 -@@ -507,5 +507,10 @@ - # - ifeq ($(OS_ARCH),Linux) - ifdef IS_COMPONENT -+DSO_LDOPTS += -Wl,-R#RPATH_FIXER -+OS_LDFLAGS += -Wl,-R#RPATH_FIXER - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+else -+DSO_LDOPTS += -Wl,-R#RPATH_FIXER -+OS_LDFLAGS += -Wl,-R#RPATH_FIXER - endif ---- nsprpub/config/rules.mk.orig 2003-09-16 02:00:28.000000000 +0000 -+++ nsprpub/config/rules.mk 2005-07-30 04:00:21.000000000 +0000 -@@ -87,6 +87,9 @@ - endif - endif - -+DSO_LDOPTS += -Wl,-R#RPATH_FIXER -+OS_LDFLAGS += -Wl,-R#RPATH_FIXER -+ - # - # This makefile contains rules for building the following kinds of - # libraries: ---- security/coreconf/rules.mk.orig 2005-07-31 16:31:37.000000000 +0000 -+++ security/coreconf/rules.mk 2005-07-31 16:37:27.000000000 +0000 -@@ -349,7 +349,7 @@ - ifdef XP_OS2_VACPP - $(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) - else -- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) -+ $(MKSHLIB) -Wl,-R#RPATH_FIXER -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) - endif - chmod +x $@ - ifeq ($(OS_TARGET),Darwin) ---- security/coreconf/rules.mk.orig 2005-08-01 11:40:54.000000000 +0000 -+++ security/coreconf/rules.mk 2005-08-01 11:50:31.000000000 +0000 -@@ -291,7 +291,7 @@ - ifdef XP_OS2_VACPP - $(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) - else -- $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) -+ $(MKPROG) -Wl,-R#RPATH_FIXER -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) - endif - endif - diff --git a/www-client/mozilla-firefox/files/securebrowserui-iirq.patch b/www-client/mozilla-firefox/files/securebrowserui-iirq.patch deleted file mode 100644 index 9eecd60b6b5b..000000000000 --- a/www-client/mozilla-firefox/files/securebrowserui-iirq.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: security/manager/boot/src/nsSecureBrowserUIImpl.cpp -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp,v -retrieving revision 1.34.2.2 -diff -p -u -u -p -U10 -r1.34.2.2 nsSecureBrowserUIImpl.cpp ---- security/manager/boot/src/nsSecureBrowserUIImpl.cpp 8 Oct 2004 22:59:03 -0000 1.34.2.2 -+++ security/manager/boot/src/nsSecureBrowserUIImpl.cpp 8 Jan 2005 22:30:09 -0000 -@@ -1278,20 +1278,24 @@ NS_IMETHODIMP nsUIContext::GetInterface( - nsresult rv; - - if (uuid.Equals(NS_GET_IID(nsIPrompt))) { - nsCOMPtr<nsIDOMWindowInternal> internal = do_QueryInterface(mWindow, &rv); - if (NS_FAILED(rv)) return rv; - - nsIPrompt *prompt; - - rv = internal->GetPrompter(&prompt); - *result = prompt; -+ } else if (uuid.Equals(NS_GET_IID(nsIDOMWindow))) { -+ *result = mWindow; -+ NS_ADDREF ((nsISupports*) *result); -+ rv = NS_OK; - } else { - rv = NS_ERROR_NO_INTERFACE; - } - - return rv; - } - - nsresult nsSecureBrowserUIImpl:: - GetNSSDialogs(nsISecurityWarningDialogs **result) - { diff --git a/www-client/mozilla-firefox/files/svg-cairo-0.3.0-fix.patch b/www-client/mozilla-firefox/files/svg-cairo-0.3.0-fix.patch deleted file mode 100644 index 9d1f0d830559..000000000000 --- a/www-client/mozilla-firefox/files/svg-cairo-0.3.0-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -aur mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp ---- mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp 2004-02-10 15:18:09.000000000 -0500 -+++ mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp 2005-02-23 20:25:32.240459288 -0500 -@@ -50,6 +50,7 @@ - #include "nsRenderingContextGTK.h" - #include <gdk/gdkx.h> - #include <cairo.h> -+#include <cairo-xlib.h> - - /** - * \addtogroup cairo_renderer Cairo Rendering Engine -diff -aur mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp mozilla/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp ---- mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp 2004-03-16 16:40:07.000000000 -0500 -+++ mozilla/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp 2005-02-23 20:25:09.538910448 -0500 -@@ -51,6 +51,7 @@ - #include "nsSVGTypeCIDs.h" - #include "nsIComponentManager.h" - #include <cairo.h> -+#include <stdlib.h> - - /** - * \addtogroup gdiplus_renderer Cairo Rendering Engine diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r2.ebuild deleted file mode 100644 index 6bda63ff6b12..000000000000 --- a/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r2.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# 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.0.7-r2.ebuild,v 1.10 2005/10/17 16:18:28 agriffis Exp $ - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -MOZ_FREETYPE2="no" # Need to disable for newer .. remove here and in mozconfig - # when older is removed from tree. -MOZ_PANGO="yes" # Need to enable for newer .. remove here and in mozconfig - # when older is removed from tree. -inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib - -PVER="1.7.12-patches-1.2" -SVGVER="2.3.10p1" - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="http://www.mozilla.org/projects/firefox/" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 - mozsvg? ( - mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2 - http://dev.gentoo.org/~azarah/mozilla/moz_libart_lgpl-${SVGVER}.tar.bz2 - ) - mirror://gentoo/mozilla-${PVER}.tar.bz2 - http://dev.gentoo.org/~azarah/mozilla/mozilla-${PVER}.tar.bz2" - -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" -IUSE="gnome java mozdevelop mozsvg mozcalendar" - -# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2 -# and is required to build with support for cairo. #71504 -RDEPEND="java? ( virtual/jre ) - >=media-libs/libmng-1.0.0 - mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 ) - >=www-client/mozilla-launcher-1.39" - -DEPEND="${RDEPEND} - java? ( >=dev-java/java-config-0.2.0 )" - -S=${WORKDIR}/mozilla - -# Needed by src_compile() and src_install(). -# Would do in pkg_setup but that loses the export attribute, they -# become pure shell variables. -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -export MOZ_PHOENIX=1 - -src_unpack() { - unpack firefox-${PV}-source.tar.bz2 mozilla-${PVER}.tar.bz2 - cd ${S} || die "cd failed" - - if use mozsvg; then - cd ${S}/other-licenses - unpack moz_libart_lgpl-${SVGVER}.tar.bz2 - fi - cd ${S} - - #################################### - # - # patch collection - # - #################################### - - # Need pango-1.10.0 stable - rm -f ${WORKDIR}/patch/03[67]* - epatch ${WORKDIR}/patch - - # Without 03[67]* patches, we need to link to pangoxft - epatch ${FILESDIR}/mozilla-1.7.12-gtk2xft-link-pangoxft.patch - - # Fix scripts that call for /usr/local/bin/perl #51916 - ebegin "Patching smime to call perl from /usr/bin" - sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime - eend $? || die "sed failed" - - # Needed by some of the patches - WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed" -} - -src_compile() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml --enable-extensions=typeaheadfind - - # Other ff-specific settings - mozconfig_use_enable mozdevelop jsd - mozconfig_use_enable mozdevelop xpctools - mozconfig_use_extension mozdevelop venkman - mozconfig_use_enable gnome gnomevfs - mozconfig_use_extension gnome gnomevfs - mozconfig_use_enable mozcalendar calendar - mozconfig_use_enable mozsvg svg - mozconfig_use_enable mozsvg svg-renderer-libart - use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1 - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - #mozconfig_annotate '' --with-user-appdir=.firefox - - # Finalize and report settings - mozconfig_final - - # hardened GCC uses -fstack-protector-all by default, which breaks us - has_hardened && append-flags -fno-stack-protector-all - replace-flags -fstack-protector-all -fstack-protector - - #################################### - # - # Configure and build - # - #################################### - - CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - econf || die - - # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior - # to econf, but the quotes cause configure to fail. - sed -i -e \ - 's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \ - ${S}/config/autoconf.mk \ - ${S}/nsprpub/config/autoconf.mk \ - ${S}/xpfe/global/buildconfig.html - - # Fixup the RPATH - sed -i -e \ - 's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \ - ${S}/config/rules.mk \ - ${S}/nsprpub/config/rules.mk \ - ${S}/security/coreconf/rules.mk \ - ${S}/security/coreconf/rules.mk - - # This removes extraneous CFLAGS from the Makefiles to reduce RAM - # requirements while compiling - edit_makefiles - - emake || die -} - -src_install() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - # Most of the installation happens here - dodir ${MOZILLA_FIVE_HOME} - cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME} || die "Failed to Copy" - - # Create directory structure to support portage-installed extensions. - # See update_chrome() in mozilla-launcher - keepdir ${MOZILLA_FIVE_HOME}/chrome.d - keepdir ${MOZILLA_FIVE_HOME}/extensions.d - cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \ - ${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt || die "Failed to Copy" - - # Create /usr/bin/firefox - install_mozilla_launcher_stub firefox ${MOZILLA_FIVE_HOME} - - # Install icon and .desktop for menu entry - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/firefox-icon.png - - # Fix bug 54179: Install .desktop file into /usr/share/applications - # instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis) - insinto /usr/share/applications - doins ${FILESDIR}/icon/mozillafirefox.desktop - - # Fix icons to look the same everywhere - insinto ${MOZILLA_FIVE_HOME}/icons - doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm - doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm - - #################################### - # - # Install files necessary for applications to build against firefox - # - #################################### - - einfo "Installing includes and idl files..." - dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include - cd ${S}/dist - cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "Failed to Copy" - cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "Failed to Copy" - - # Dirty hack to get some applications using this header running - dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \ - /usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h - - # Compatibility symlink so that applications can still build against firefox - # even though it has moved. To remove this symlink, grep -r MozillaFirefox - # /usr/portage and fix those ebuilds - dosym ${MOZILLA_FIVE_HOME##*/} ${MOZILLA_FIVE_HOME%/*}/MozillaFirefox - - # Fix firefox-config and install it - sed -i -e "s|/usr/$(get_libdir)/firefox-${PV}|${MOZILLA_FIVE_HOME}|g - s|/usr/include/firefox-${PV}|${MOZILLA_FIVE_HOME}/include|g - s|/usr/share/idl/firefox-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g - s|%{idldir}|${MOZILLA_FIVE_HOME}/idl|g - s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}\2|" \ - ${S}/build/unix/firefox-config - exeinto ${MOZILLA_FIVE_HOME} - doexe ${S}/build/unix/firefox-config - - # Fix pkgconfig files and install them - insinto /usr/$(get_libdir)/pkgconfig - for x in ${S}/build/unix/*.pc; do - sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}| - s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include| - s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl| - s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|" ${x} - doins ${x} - done - - # Install env.d snippet, which isn't necessary for running firefox, but - # might be necessary for programs linked against firefox - insinto /etc/env.d - doins ${FILESDIR}/10MozillaFirefox - dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10MozillaFirefox - - # Install docs - dodoc ${S}/{LEGAL,LICENSE} -} - -pkg_postinst() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - # Update the component registry - MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \ - /usr/libexec/mozilla-launcher -register - - # This should be called in the postinst and postrm of all the - # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and - # thunderbird-bin ebuilds. - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - # Update the component registry - MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \ - /usr/libexec/mozilla-launcher -register - - update_mozilla_launcher_symlinks -} diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild deleted file mode 100644 index 4d1d46c1ffe9..000000000000 --- a/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r3.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# 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.0.7-r3.ebuild,v 1.3 2005/10/07 18:54:48 hansmi Exp $ - -unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 -MOZ_FREETYPE2="no" # Need to disable for newer .. remove here and in mozconfig - # when older is removed from tree. -MOZ_PANGO="yes" # Need to enable for newer .. remove here and in mozconfig - # when older is removed from tree. -inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib fdo-mime - -PVER="1.7.12-patches-1.2" -SVGVER="2.3.10p1" - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="http://www.mozilla.org/projects/firefox/" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 - mozsvg? ( - mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2 - http://dev.gentoo.org/~azarah/mozilla/moz_libart_lgpl-${SVGVER}.tar.bz2 - ) - mirror://gentoo/mozilla-${PVER}.tar.bz2 - http://dev.gentoo.org/~azarah/mozilla/mozilla-${PVER}.tar.bz2" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" -IUSE="gnome java mozdevelop mozsvg mozcalendar" - -# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2 -# and is required to build with support for cairo. #71504 -RDEPEND="java? ( virtual/jre ) - >=media-libs/libmng-1.0.0 - mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 ) - >=www-client/mozilla-launcher-1.39" - -DEPEND="${RDEPEND} - java? ( >=dev-java/java-config-0.2.0 )" - -S=${WORKDIR}/mozilla - -# Needed by src_compile() and src_install(). -# Would do in pkg_setup but that loses the export attribute, they -# become pure shell variables. -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -export MOZ_PHOENIX=1 - -src_unpack() { - unpack firefox-${PV}-source.tar.bz2 mozilla-${PVER}.tar.bz2 - cd ${S} || die "cd failed" - - if use mozsvg; then - cd ${S}/other-licenses - unpack moz_libart_lgpl-${SVGVER}.tar.bz2 - fi - cd ${S} - - #################################### - # - # patch collection - # - #################################### - - # Need pango-1.10.0 stable - rm -f ${WORKDIR}/patch/03[67]* - epatch ${WORKDIR}/patch - - # Without 03[67]* patches, we need to link to pangoxft - epatch ${FILESDIR}/mozilla-1.7.12-gtk2xft-link-pangoxft.patch - - # Fix scripts that call for /usr/local/bin/perl #51916 - ebegin "Patching smime to call perl from /usr/bin" - sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime - eend $? || die "sed failed" - - # Fix a compilation issue using the 32-bit userland with 64-bit kernel on - # PowerPC, because with that configuration, mozilla detects a ppc64 system. - # -- hansmi, 2005-10-02 - if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then - sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \ - ${S}/configure.in - sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \ - ${S}/security/coreconf/arch.mk - fi - - # Needed by some of the patches - WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed" -} - -src_compile() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml --enable-extensions=typeaheadfind - - # Other ff-specific settings - mozconfig_use_enable mozdevelop jsd - mozconfig_use_enable mozdevelop xpctools - mozconfig_use_extension mozdevelop venkman - mozconfig_use_enable gnome gnomevfs - mozconfig_use_extension gnome gnomevfs - mozconfig_use_enable mozcalendar calendar - mozconfig_use_enable mozsvg svg - mozconfig_use_enable mozsvg svg-renderer-libart - use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1 - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - #mozconfig_annotate '' --with-user-appdir=.firefox - - # Finalize and report settings - mozconfig_final - - # hardened GCC uses -fstack-protector-all by default, which breaks us - has_hardened && append-flags -fno-stack-protector-all - # remove -fstack-protector because now it borks firefox - CFLAGS=${CFLAGS/-fstack-protector-all/} - CFLAGS=${CFLAGS/-fstack-protector/} - CXXFLAGS=${CXXFLAGS/-fstack-protector-all/} - CXXFLAGS=${CXXFLAGS/-fstack-protector/} - - #################################### - # - # Configure and build - # - #################################### - - CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - econf || die - - # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior - # to econf, but the quotes cause configure to fail. - sed -i -e \ - 's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \ - ${S}/config/autoconf.mk \ - ${S}/nsprpub/config/autoconf.mk \ - ${S}/xpfe/global/buildconfig.html - - # Fixup the RPATH - sed -i -e \ - 's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \ - ${S}/config/rules.mk \ - ${S}/nsprpub/config/rules.mk \ - ${S}/security/coreconf/rules.mk \ - ${S}/security/coreconf/rules.mk - - # This removes extraneous CFLAGS from the Makefiles to reduce RAM - # requirements while compiling - edit_makefiles - - emake || die -} - -src_install() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - # Most of the installation happens here - dodir ${MOZILLA_FIVE_HOME} - cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME} || die "Failed to Copy" - - # Create directory structure to support portage-installed extensions. - # See update_chrome() in mozilla-launcher - keepdir ${MOZILLA_FIVE_HOME}/chrome.d - cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \ - ${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt || die "Failed to Copy" - dodir ${MOZILLA_FIVE_HOME}/extensions - keepdir ${MOZILLA_FIVE_HOME}/extensions.d - cp ${D}${MOZILLA_FIVE_HOME}/defaults/profile/extensions/installed-extensions.txt \ - ${D}${MOZILLA_FIVE_HOME}/extensions.d/0_base-extensions.txt || die "Failed to Copy" - cp ${D}${MOZILLA_FIVE_HOME}/defaults/profile/extensions/Extensions.rdf \ - ${D}${MOZILLA_FIVE_HOME}/extensions/ || die "Failed to Copy" - cp -RL ${D}${MOZILLA_FIVE_HOME}/defaults/profile/extensions/\{*\} \ - ${D}${MOZILLA_FIVE_HOME}/extensions/ || die "Failed to Copy" - - # Create /usr/bin/firefox - install_mozilla_launcher_stub firefox ${MOZILLA_FIVE_HOME} - - # Install icon and .desktop for menu entry - doicon ${FILESDIR}/icon/firefox-icon.png - domenu ${FILESDIR}/icon/mozillafirefox.desktop - - # Fix icons to look the same everywhere - insinto ${MOZILLA_FIVE_HOME}/icons - doins ${S}/dist/branding/mozicon16.xpm - doins ${S}/dist/branding/mozicon50.xpm - - #################################### - # - # Install files necessary for applications to build against firefox - # - #################################### - - einfo "Installing includes and idl files..." - dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include - cd ${S}/dist - cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "Failed to Copy" - cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "Failed to Copy" - - # Dirty hack to get some applications using this header running - dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \ - /usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h - - # Compatibility symlink so that applications can still build against firefox - # even though it has moved. To remove this symlink, grep -r MozillaFirefox - # /usr/portage and fix those ebuilds - dosym ${MOZILLA_FIVE_HOME##*/} ${MOZILLA_FIVE_HOME%/*}/MozillaFirefox - - # Fix firefox-config and install it - sed -i -e "s|/usr/$(get_libdir)/firefox-${PV}|${MOZILLA_FIVE_HOME}|g - s|/usr/include/firefox-${PV}|${MOZILLA_FIVE_HOME}/include|g - s|/usr/share/idl/firefox-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g - s|%{idldir}|${MOZILLA_FIVE_HOME}/idl|g - s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}\2|" \ - ${S}/build/unix/firefox-config - exeinto ${MOZILLA_FIVE_HOME} - doexe ${S}/build/unix/firefox-config - - # Fix pkgconfig files and install them - insinto /usr/$(get_libdir)/pkgconfig - for x in ${S}/build/unix/*.pc; do - sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}| - s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include| - s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl| - s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|" ${x} - doins ${x} - done - - # Install env.d snippet, which isn't necessary for running firefox, but - # might be necessary for programs linked against firefox - insinto /etc/env.d - doins ${FILESDIR}/10MozillaFirefox - dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10MozillaFirefox - - # Install manpage (from the Fedora package) - doman ${FILESDIR}/firefox.1 - - # Install docs - dodoc ${S}/{LEGAL,LICENSE} -} - -pkg_postinst() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - # Update the component registry - MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \ - /usr/libexec/mozilla-launcher -register - - # This should be called in the postinst and postrm of all the - # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and - # thunderbird-bin ebuilds. - update_mozilla_launcher_symlinks - - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update -} - -pkg_postrm() { - declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} - - # Update the component registry - MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \ - /usr/libexec/mozilla-launcher -register - - update_mozilla_launcher_symlinks - - # Update mimedb if .desktop file has been removed (uninstallation) - [ -f ${ROOT}/usr/share/applications/mozillafirefox.desktop ] \ - || fdo-mime_desktop_database_update -} |
