* [gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/, ...
@ 2011-02-08 1:31 Jory Pratt
0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2011-02-08 1:31 UTC (permalink / raw
To: gentoo-commits
commit: 70dd89fcabf9be4e1ce038aa77bba4307ab75c9e
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 8 01:30:56 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Feb 8 01:30:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=70dd89fc
update snapshot for xul/ff :)
---
net-libs/xulrunner/Manifest | 6 +-
net-libs/xulrunner/files/system-cairo-fixup.patch | 133 --------------------
.../xulrunner/files/xulrunner-2.0-elf-hack.patch | 29 -----
..._pre.ebuild => xulrunner-2.0_beta12_pre.ebuild} | 6 +-
www-client/firefox/Manifest | 5 +-
.../firefox/files/xulrunner-2.0-elf-hack.patch | 29 -----
...11_pre.ebuild => firefox-4.0_beta12_pre.ebuild} | 4 +-
7 files changed, 6 insertions(+), 206 deletions(-)
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 5f2a62b..663b8a4 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,6 +1,4 @@
-AUX system-cairo-fixup.patch 3300 RMD160 3e6888863f990787f7e59eb8c9afcef546fe1e78 SHA1 1208120150b5bfbaf7c77d4521bab89e34a0dc97 SHA256 f6e47cc92dd032f2bfbd830953e55697c875e0361c08c2575b18694c7f8202ae
-AUX xulrunner-2.0-elf-hack.patch 968 RMD160 a8e4c90c5c8d8b967021b17a66090ebca489e301 SHA1 dc9c8a4b320d645547a1417578c4ba3f4d83faf8 SHA256 aa5e40abcfdcefd8f004ea1704de71016f08ae13ff4edaa223cb6ed02e5e116a
AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
-DIST firefox-4.0b11_pre_e058817c0ab0.source.tar.bz2 64387009 RMD160 22ae0e04f496a5414878d4992370c25be5132516 SHA1 4305097b9c98205da7c68d0b4e6af5231914a648 SHA256 f99b2d1f39280721187d749af9a8dc84888c6cda8516f299a0ed997ba4eee4c7
+DIST firefox-4.0b12_pre_366d47bce128.source.tar.bz2 64457737 RMD160 9f49f6054c4e0830da00e8c32ee20ebb6f100d29 SHA1 44c76278a7ac6f06c990641f855b3efa5fdbd0af SHA256 2d2b8b0756524e87cfacff263bcb41de606bd3968174eb65b87746e1bef3d0fd
DIST xulrunner-2.0-patches-1.1.tar.bz2 50702 RMD160 bd918e4709696ab85c9eb611cd6e09a622487ab8 SHA1 bd7278b7d35503ea561191140d7409c2b4d64903 SHA256 ab171b0e3f36567b0cca859e8d356f34c779d8aca5f9a4bd4449076a311a0ae3
-EBUILD xulrunner-2.0_beta11_pre.ebuild 7984 RMD160 6cc24d3c36e468496e67301a057c7e4729812640 SHA1 1df9a6f4d832d07b8b5b22c607f455118f5370fb SHA256 85d81866bb8795de637e8120f0df3116a9807ba419552a25a619cdda4154c7a3
+EBUILD xulrunner-2.0_beta12_pre.ebuild 7851 RMD160 5f0fc50592d61640652ad45bcb6e9af310818cd9 SHA1 acdeede84ef74e91090e1914aeb9725e29911cfe SHA256 bcb8362894f19c22b6a28e4bdf4e0867db9897a9b91e0df02c3ef6cd9a4b76cf
diff --git a/net-libs/xulrunner/files/system-cairo-fixup.patch b/net-libs/xulrunner/files/system-cairo-fixup.patch
deleted file mode 100644
index ac43a3f..0000000
--- a/net-libs/xulrunner/files/system-cairo-fixup.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-work around new features that are not avaliable in system-cairo on linux
-(romaxa's original patch with modifications to use cairo-tee)
-
-diff --git a/config/system-headers b/config/system-headers
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -81,16 +81,17 @@ pixman.h
- cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
-+cairo-tee.h
- cairo-quartz.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
-diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
---- a/gfx/thebes/gfxASurface.cpp
-+++ b/gfx/thebes/gfxASurface.cpp
-@@ -216,19 +216,21 @@ gfxASurface::Init(cairo_surface_t* surfa
-
- mSurface = surface;
- mSurfaceValid = PR_TRUE;
-
- if (existingSurface) {
- mFloatingRefs = 0;
- } else {
- mFloatingRefs = 1;
-+#ifdef MOZ_TREE_CAIRO
- if (cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR) {
- cairo_surface_set_subpixel_antialiasing(surface, CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
- }
-+#endif
- }
- }
-
- gfxASurface::gfxSurfaceType
- gfxASurface::GetType() const
- {
- if (!mSurfaceValid)
- return (gfxSurfaceType)-1;
-@@ -430,28 +432,34 @@ gfxASurface::FormatFromContent(gfxASurfa
- default:
- return ImageFormatRGB24;
- }
- }
-
- void
- gfxASurface::SetSubpixelAntialiasingEnabled(PRBool aEnabled)
- {
-+#ifdef MOZ_TREE_CAIRO
- if (!mSurfaceValid)
- return;
- cairo_surface_set_subpixel_antialiasing(mSurface,
- aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
-+#endif
- }
-
- PRBool
- gfxASurface::GetSubpixelAntialiasingEnabled()
- {
- if (!mSurfaceValid)
- return PR_FALSE;
-+#ifdef MOZ_TREE_CAIRO
- return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED;
-+#else
-+ return PR_TRUE;
-+#endif
- }
-
- PRInt32
- gfxASurface::BytePerPixelFromFormat(gfxImageFormat format)
- {
- switch (format) {
- case ImageFormatARGB32:
- case ImageFormatRGB24:
-diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
---- a/gfx/thebes/gfxTeeSurface.cpp
-+++ b/gfx/thebes/gfxTeeSurface.cpp
-@@ -32,17 +32,24 @@
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
- #include "gfxTeeSurface.h"
-
-+/* Once cairo in tree is update ensure we remove the ifdef
-+ and just include cairo-tee.h
-+*/
-+#ifdef MOZ_TREE_CAIRO
- #include "cairo.h"
-+#else
-+#include "cairo-tee.h"
-+#endif
-
- gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf)
- {
- Init(csurf, PR_TRUE);
- }
-
- gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount)
- {
-diff --git a/js/src/config/system-headers b/js/src/config/system-headers
---- a/js/src/config/system-headers
-+++ b/js/src/config/system-headers
-@@ -82,16 +82,17 @@ cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
- cairo-quartz.h
-+cairo-tee.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
- exception
diff --git a/net-libs/xulrunner/files/xulrunner-2.0-elf-hack.patch b/net-libs/xulrunner/files/xulrunner-2.0-elf-hack.patch
deleted file mode 100644
index 0093fe1..0000000
--- a/net-libs/xulrunner/files/xulrunner-2.0-elf-hack.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# Parent 94a51a3b64d40175c2d32419cbe467604f183f4d
-Bug 629638 - Build elfhack injected code with a limited set of CFLAGS
-
-diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
---- a/build/unix/elfhack/Makefile.in
-+++ b/build/unix/elfhack/Makefile.in
-@@ -102,16 +102,17 @@ endif
- inject:
- $(NSINSTALL) -D $@
-
- inject/%.c: inject.c | inject
- cp $< $@
-
- GARBAGE_DIRS += inject
-
--inject/%.$(OBJ_SUFFIX): DEFINES += -DBITS=$(if $(HAVE_64BIT_OS),64,32)
--inject/$(CPU)-noinit.$(OBJ_SUFFIX): DEFINES += -DNOINIT
--
- # need this to suppress errors due to /usr/include/linux/byteorder/swab.h
- # on mozilla buildbots
- OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
-
- include $(topsrcdir)/config/rules.mk
-+
-+inject/%.$(OBJ_SUFFIX): DEFINES += -DBITS=$(if $(HAVE_64BIT_OS),64,32)
-+inject/%.$(OBJ_SUFFIX): CFLAGS := -O2 -fno-stack-protector $(filter -m% -I%,$(CFLAGS))
-+inject/$(CPU)-noinit.$(OBJ_SUFFIX): DEFINES += -DNOINIT
-
diff --git a/net-libs/xulrunner/xulrunner-2.0_beta11_pre.ebuild b/net-libs/xulrunner/xulrunner-2.0_beta12_pre.ebuild
similarity index 98%
rename from net-libs/xulrunner/xulrunner-2.0_beta11_pre.ebuild
rename to net-libs/xulrunner/xulrunner-2.0_beta12_pre.ebuild
index 835eb8a..b4ee890 100644
--- a/net-libs/xulrunner/xulrunner-2.0_beta11_pre.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0_beta12_pre.ebuild
@@ -12,7 +12,7 @@ MAJ_FF_PV="4.0"
FF_PV="${PV/${MAJ_XUL_PV}/${MAJ_FF_PV}}" # 3.7_alpha6, 3.6.3, etc.
FF_PV="${FF_PV/_alpha/a}" # Handle alpha for SRC_URI
FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
-CHANGESET="e058817c0ab0"
+CHANGESET="366d47bce128"
PATCH="${PN}-2.0-patches-1.1"
DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
@@ -77,10 +77,6 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
- # Ensure we can use system cairo
- epatch "${FILESDIR}/system-cairo-fixup.patch"
- epatch "${FILESDIR}/xulrunner-2.0-elf-hack.patch"
-
# Allow user to apply any additional patches without modifing ebuild
epatch_user
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 32da199..92901f9 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,7 +1,6 @@
AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438e1f82f220b SHA1 cd5d0ce5162d9fd246360409b1af396b62c1bc6b SHA256 1d6ba1b322ba1bf3ab8e6ef92528bdbc1a2f5cbca3119df3f4380b8b73b5cb05
AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
-AUX xulrunner-2.0-elf-hack.patch 968 RMD160 a8e4c90c5c8d8b967021b17a66090ebca489e301 SHA1 dc9c8a4b320d645547a1417578c4ba3f4d83faf8 SHA256 aa5e40abcfdcefd8f004ea1704de71016f08ae13ff4edaa223cb6ed02e5e116a
DIST firefox-4.0-patches-0.6.tar.bz2 4375 RMD160 b2145e94e4105a467710b4a274e398e1af697d5d SHA1 0280b7ee81d46fad3fdf71c9ac64f3efd979898f SHA256 aed2fd06ca28aa3aee6e78070b2ba051e1648cdde8528b2d94661640c22160ee
-DIST firefox-4.0b11_pre_e058817c0ab0.source.tar.bz2 64387009 RMD160 22ae0e04f496a5414878d4992370c25be5132516 SHA1 4305097b9c98205da7c68d0b4e6af5231914a648 SHA256 f99b2d1f39280721187d749af9a8dc84888c6cda8516f299a0ed997ba4eee4c7
-EBUILD firefox-4.0_beta11_pre.ebuild 9561 RMD160 92351df274481d6c6b6d55d787f2a8bac0e11ad7 SHA1 7241bad13fc424e3e7f29c306c9e5054177314d4 SHA256 2f0fceb388397b96732e69af8343f17f6bf39fd86aa1dd1fa9ea71e11f50ad91
+DIST firefox-4.0b12_pre_366d47bce128.source.tar.bz2 64457737 RMD160 9f49f6054c4e0830da00e8c32ee20ebb6f100d29 SHA1 44c76278a7ac6f06c990641f855b3efa5fdbd0af SHA256 2d2b8b0756524e87cfacff263bcb41de606bd3968174eb65b87746e1bef3d0fd
+EBUILD firefox-4.0_beta12_pre.ebuild 9509 RMD160 c17398cd85c69df4966ca6c6d5db9e8193d2a880 SHA1 7192cff891d882a6e598f0faf545059e33941754 SHA256 9df908dd1bb7d0da99153ee92906fbd3e7b168789c7ffdbff5c59d96cd8ed25e
diff --git a/www-client/firefox/files/xulrunner-2.0-elf-hack.patch b/www-client/firefox/files/xulrunner-2.0-elf-hack.patch
deleted file mode 100644
index 0093fe1..0000000
--- a/www-client/firefox/files/xulrunner-2.0-elf-hack.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# Parent 94a51a3b64d40175c2d32419cbe467604f183f4d
-Bug 629638 - Build elfhack injected code with a limited set of CFLAGS
-
-diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
---- a/build/unix/elfhack/Makefile.in
-+++ b/build/unix/elfhack/Makefile.in
-@@ -102,16 +102,17 @@ endif
- inject:
- $(NSINSTALL) -D $@
-
- inject/%.c: inject.c | inject
- cp $< $@
-
- GARBAGE_DIRS += inject
-
--inject/%.$(OBJ_SUFFIX): DEFINES += -DBITS=$(if $(HAVE_64BIT_OS),64,32)
--inject/$(CPU)-noinit.$(OBJ_SUFFIX): DEFINES += -DNOINIT
--
- # need this to suppress errors due to /usr/include/linux/byteorder/swab.h
- # on mozilla buildbots
- OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
-
- include $(topsrcdir)/config/rules.mk
-+
-+inject/%.$(OBJ_SUFFIX): DEFINES += -DBITS=$(if $(HAVE_64BIT_OS),64,32)
-+inject/%.$(OBJ_SUFFIX): CFLAGS := -O2 -fno-stack-protector $(filter -m% -I%,$(CFLAGS))
-+inject/$(CPU)-noinit.$(OBJ_SUFFIX): DEFINES += -DNOINIT
-
diff --git a/www-client/firefox/firefox-4.0_beta11_pre.ebuild b/www-client/firefox/firefox-4.0_beta12_pre.ebuild
similarity index 99%
rename from www-client/firefox/firefox-4.0_beta11_pre.ebuild
rename to www-client/firefox/firefox-4.0_beta12_pre.ebuild
index dbe0a82..fa166e8 100644
--- a/www-client/firefox/firefox-4.0_beta11_pre.ebuild
+++ b/www-client/firefox/firefox-4.0_beta12_pre.ebuild
@@ -12,7 +12,7 @@ MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
XUL_PV="${MAJ_XUL_PV}${PV/${MAJ_FF_PV}/}" # 1.9.3_alpha6, 1.9.2.3, etc.
FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
-CHANGESET="e058817c0ab0"
+CHANGESET="366d47bce128"
PATCH="${PN}-4.0-patches-0.6"
DESCRIPTION="Firefox Web Browser"
@@ -142,8 +142,6 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
- epatch "${FILESDIR}/xulrunner-2.0-elf-hack.patch"
-
# Allow user to apply any additional patches without modifing ebuild
epatch_user
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/, ...
@ 2011-03-28 19:11 Jory Pratt
0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2011-03-28 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 251e8af35ff4eeb16cc73a2f974a9eb938dd873c
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 19:11:54 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 19:11:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=251e8af3
make gconf support optional
---
net-libs/xulrunner/Manifest | 3 +-
.../files/mozilla-2.0-gconf-config-update.patch | 25 ++++++++++++++++++++
...ulrunner-2.0.ebuild => xulrunner-2.0-r1.ebuild} | 6 ++++-
www-client/firefox/Manifest | 3 +-
.../files/mozilla-2.0-gconf-config-update.patch | 25 ++++++++++++++++++++
...firefox-4.0-r1.ebuild => firefox-4.0-r3.ebuild} | 7 +++--
6 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 35e7fde..7b7b21c 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,5 @@
+AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA256 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
DIST xulrunner-2.0-patches-1.3.tar.bz2 63693 RMD160 aaa6901e5dc94cbe88a2e0b5cfacbf7325ef97d2 SHA1 e3968f710e018b2c0ce017cea3e9152d157cd39b SHA256 f91949ef2cc61d9d7f7ccd242c3b0da730acb99e68a612d6ff3dfa9e7fd2aa25
-EBUILD xulrunner-2.0.ebuild 5472 RMD160 b04bb737d4b6be437982ef5c03f055e2ae0da838 SHA1 c58406dcc7861301834455bce8b3cb1c2378a241 SHA256 f2d74ba33a0aea5e55734418e0335ab10c19a3a7e8c9be87ec38217a6d3be1d0
+EBUILD xulrunner-2.0-r1.ebuild 5606 RMD160 38e5541f3a0be7190cfd2afab97731c05d4bd99f SHA1 50476a55e479eb1432e6f8d648c8f310e596128f SHA256 df2feda76380fef8a5dfa8ddbb0e8ab3a698c06ea3a0c6309a188114d6ef6833
diff --git a/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
new file mode 100644
index 0000000..464e1e1
--- /dev/null
+++ b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5701,16 +5701,21 @@ then
+
+ AC_SUBST(MOZ_ENABLE_GIO)
+ AC_SUBST(MOZ_GIO_CFLAGS)
+ AC_SUBST(MOZ_GIO_LIBS)
+
+ dnl ========================================================
+ dnl = GConf support module
+ dnl ========================================================
++ MOZ_ARG_DISABLE_BOOL(gconf,
++ [ --disable-gconf Disable Gconf support ],
++ MOZ_ENABLE_GCONF=,
++ MOZ_ENABLE_GCONF=force)
++
+ if test "$MOZ_ENABLE_GCONF"
+ then
+ PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+ MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
+ MOZ_ENABLE_GCONF=1
+ ],[
+ if test "$MOZ_ENABLE_GCONF" = "force"
+ then
diff --git a/net-libs/xulrunner/xulrunner-2.0.ebuild b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
similarity index 96%
rename from net-libs/xulrunner/xulrunner-2.0.ebuild
rename to net-libs/xulrunner/xulrunner-2.0-r1.ebuild
index 402b912..10ce611 100644
--- a/net-libs/xulrunner/xulrunner-2.0.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="1.9"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+crashreporter +ipc system-sqlite +webm"
+IUSE="+crashreporter gconf +ipc system-sqlite +webm"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
# More URIs appended below...
@@ -33,6 +33,7 @@ RDEPEND="
>=dev-libs/nss-3.12.9
>=dev-libs/nspr-4.8.7
>=dev-libs/glib-2.26
+ gconf? ( >=gnome-base/gconf-1.2.1:2 )
x11-libs/pango[X]
media-libs/libpng[apng]
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
@@ -65,6 +66,8 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
+ epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch
+
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -126,6 +129,7 @@ src_configure() {
mozconfig_annotate '' --enable-safe-browsing
mozconfig_annotate '' --with-system-png
mozconfig_use_enable system-sqlite
+ mozconfig_use_enable gconf
# Finalize and report settings
mozconfig_final
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c3ec07d..2513aec 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,6 +3,7 @@ AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94ca
AUX icon/firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
AUX icon/firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
+AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA256 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
DIST firefox-4.0-af.xpi 220420 RMD160 ee8e95bbaf9e548082aca0a8029edc4cc6557afd SHA1 3a2da0b247983cdcf20a14faa2e3c1b6e3906264 SHA256 d4062ced61ccb4f1c37ee6c8793675e1c5da4d2a5e91ddf4c2d9f36561353492
DIST firefox-4.0-ak.xpi 222040 RMD160 0ba8ab5ec79abafe126a8045844e4839a772d1e8 SHA1 4979d5ecfdd90a723d95984f57b07ddc6ed2df57 SHA256 4a050f68c9f4c51f89bb946c2aec22b5e81ae6b8a1835f601fc747c692e4dc37
DIST firefox-4.0-ar.xpi 241600 RMD160 d22109a623f83319d64e16bba931bdecc7b71831 SHA1 d4bc970bcb8ccc6c0a5ff6cbcce157727261756e SHA256 be5d98d19c926861dd545bad492043983cd709f409cb88eb1931bd82ca816c79
@@ -80,4 +81,4 @@ DIST firefox-4.0-uk.xpi 260129 RMD160 4a7cda6a1ae6dd31d3b089b05e6bc4f85d0b0a3e S
DIST firefox-4.0-vi.xpi 239966 RMD160 94f90afd4a26b6f9b220a1f096f4259f1c4339ed SHA1 7b5602a5b9e0e67b31b27bc125eb3a62e0c71319 SHA256 9927c8bd3bbd796805bd70eb5a4b37d113715333542b7a262623e0f09b8aa2a6
DIST firefox-4.0-zu.xpi 227605 RMD160 56d91ea40c9983dc28db96af51a18cdd0b22a50d SHA1 a73c237b85bbb17924a2a2fc8499db380caa0f03 SHA256 474dfa2edf6cd692dbc05c9569d263ea326b02d91feb335a1e2e360117f524ae
DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
-EBUILD firefox-4.0-r1.ebuild 8003 RMD160 6d4d7df9b8870dfd1cc957ed1cfef3bfd64c20d8 SHA1 4404cfb21b7d59588a17c0f573b922a2bce2e046 SHA256 8bd2a68ced58bffd0791168e3c7cada64474495e1ae3793dea455ce29ed0e4e4
+EBUILD firefox-4.0-r3.ebuild 8087 RMD160 e13930e8edc9455e20c2d5318f86e98fcf6e65f1 SHA1 5adb8e73464dc5a8c9cb93038c0ca170dddcb6f7 SHA256 e60278f8dcac1fc28e1823d9bb3f61e215d2d7dfbcfb10d87ee3896910e73e48
diff --git a/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch b/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch
new file mode 100644
index 0000000..464e1e1
--- /dev/null
+++ b/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5701,16 +5701,21 @@ then
+
+ AC_SUBST(MOZ_ENABLE_GIO)
+ AC_SUBST(MOZ_GIO_CFLAGS)
+ AC_SUBST(MOZ_GIO_LIBS)
+
+ dnl ========================================================
+ dnl = GConf support module
+ dnl ========================================================
++ MOZ_ARG_DISABLE_BOOL(gconf,
++ [ --disable-gconf Disable Gconf support ],
++ MOZ_ENABLE_GCONF=,
++ MOZ_ENABLE_GCONF=force)
++
+ if test "$MOZ_ENABLE_GCONF"
+ then
+ PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+ MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
+ MOZ_ENABLE_GCONF=1
+ ],[
+ if test "$MOZ_ENABLE_GCONF" = "force"
+ then
diff --git a/www-client/firefox/firefox-4.0-r1.ebuild b/www-client/firefox/firefox-4.0-r3.ebuild
similarity index 98%
rename from www-client/firefox/firefox-4.0-r1.ebuild
rename to www-client/firefox/firefox-4.0-r3.ebuild
index a52bd85..aab2019 100644
--- a/www-client/firefox/firefox-4.0-r1.ebuild
+++ b/www-client/firefox/firefox-4.0-r3.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +ipc system-sqlite +webm"
+IUSE="bindist gconf +ipc system-sqlite +webm"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
# More URIs appended below...
@@ -35,11 +35,11 @@ RDEPEND="
>=dev-libs/nss-3.12.9
>=dev-libs/nspr-4.8.7
>=dev-libs/glib-2.26
- >=gnome-base/gconf-1.2.1:2
+ gconf? ( >=gnome-base/gconf-1.2.1:2 )
media-libs/libpng[apng]
x11-libs/pango[X]
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
- ~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]
+ ~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=,gconf=]
webm? ( media-libs/libvpx
media-libs/alsa-lib )"
@@ -137,6 +137,7 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
+ epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch
epatch "${FILESDIR}"/fix-preferences-gentoo.patch
# Allow user to apply any additional patches without modifing ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/, ...
@ 2011-05-26 11:52 Jory Pratt
0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2011-05-26 11:52 UTC (permalink / raw
To: gentoo-commits
commit: 6cba76e35e10ff8c98bbeadc9a006da4565c197b
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 11:49:02 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu May 26 11:49:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=6cba76e3
Xul/Fx-5.0_beta2 support
---
net-libs/xulrunner/Manifest | 7 +-
.../mozilla-2.0_support_64bit_big_endian.patch | 60 --------------
...-2.0.1-r1.ebuild => xulrunner-5.0_beta2.ebuild} | 18 ++--
www-client/firefox/Manifest | 82 +-------------------
.../files/fix_omnijar_startupcache_breakage.patch | 26 ++++++
...ox-4.0.1-r1.ebuild => firefox-5.0_beta2.ebuild} | 18 ++++-
6 files changed, 57 insertions(+), 154 deletions(-)
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index cee9486..825e183 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,4 @@
-AUX mozilla-2.0_support_64bit_big_endian.patch 1667 RMD160 cba6fa2f23e9ecbb42abe1865f9a7e32472a66d0 SHA1 fe54162cf85d9e86f2d2ed8b0c4e0b8efd11c9f8 SHA256 bc3363cf9dabdadf6595bef72b355a68ff7568cacbdfb3d77eeb8d08c4b45d6c
AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
-DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
-DIST xulrunner-2.0-patches-1.8.tar.bz2 68053 RMD160 58ef5ff8fd037f34232a8acc706a1cb086651940 SHA1 bac72e12bfc1150ed116ba5e930688ec72157671 SHA256 88950bf5bdc34cf96bf79e1e1d2f2a4071e1f9e9d53e52f400c433f2f661b77f
-EBUILD xulrunner-2.0.1-r1.ebuild 5935 RMD160 e7e6c2e2605e2ca5903074ee4b92d9c5534637d9 SHA1 0f063678cb2eb889f9fa03afc526b29bd1841363 SHA256 a9bdca0fc5211cce26e23cec0c14db62ed5000fdecaed2c2973ec96ec808ea4b
+DIST firefox-5.0b2.source.tar.bz2 68883059 RMD160 948509c32a35f224d77eb22ebe3e87b99148754c SHA1 1466717db96c992691b32dba28a32ccefb5d0b9d SHA256 634e963b03ba460617771e19e138ac124894165aebc81afc535c22dbda0766fc
+DIST xulrunner-5.0-patches-0.3.tar.bz2 17651 RMD160 3b7ae9eff944ecfc8daf2b4e5756793a8818f676 SHA1 2bada1fd15efd811666260b82379de4da7ae37ae SHA256 cbca0cfd802095054d6b22648587aee4c83f616a0c9df384c5f2dc6364167715
+EBUILD xulrunner-5.0_beta2.ebuild 5943 RMD160 f83e1514fad8ace31232f5499d20e87b4184f208 SHA1 d19f6b74fa6aca31670b8063c27c9100f9d4cdae SHA256 c15cb53b59cd027f20943b20236d46c441c2fdfa50b917238f5c5b20c403f777
diff --git a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch b/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
deleted file mode 100644
index 5814d81..0000000
--- a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1303461188 -7200
-# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
-# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
-Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \
- platform.cc \
- utils.cc \
- $(NONE)
-
- #
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
- $(srcdir)/yarr/pcre \
- $(NULL)
-
- CPPSRCS += pcre_compile.cpp \
- pcre_exec.cpp \
-
-# HG changeset patch
-# User Luke Wagner <lw@mozilla.com>
-# Date 1299520258 28800
-# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
-# Parent 27e5814815491ebb68e474e453aff6c2ea908c43
-Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
-
-diff --git a/js/src/jsval.h b/js/src/jsval.h
---- a/js/src/jsval.h
-+++ b/js/src/jsval.h
-@@ -342,16 +342,17 @@ typedef union jsval_layout
- JSValueTag tag : 17;
- uint64 payload47 : 47;
- } debugView;
- struct {
- union {
- int32 i32;
- uint32 u32;
- JSWhyMagic why;
-+ jsuword word;
- } payload;
- } s;
- double asDouble;
- void *asPtr;
- } jsval_layout;
- # endif /* JS_BITS_PER_WORD */
- #endif /* defined(IS_LITTLE_ENDIAN) */
-
-
-
diff --git a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild b/net-libs/xulrunner/xulrunner-5.0_beta2.ebuild
similarity index 94%
rename from net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
rename to net-libs/xulrunner/xulrunner-5.0_beta2.ebuild
index 5e743ce..e71e58e 100644
--- a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-5.0_beta2.ebuild
@@ -8,13 +8,13 @@ WANT_AUTOCONF="2.1"
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib autotools python versionator pax-utils prefix
MAJ_XUL_PV="$(get_version_component_range 1-2)" # from mozilla-* branch name
-MAJ_FF_PV="4.0"
+MAJ_FF_PV="5.0"
FF_PV="${PV/${MAJ_XUL_PV}/${MAJ_FF_PV}}" # 3.7_alpha6, 3.6.3, etc.
FF_PV="${FF_PV/_alpha/a}" # Handle alpha for SRC_URI
FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
CHANGESET="e56ecd8b3a68"
-PATCH="${PN}-2.0-patches-1.8"
+PATCH="${PN}-5.0-patches-0.3"
DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
@@ -25,6 +25,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="+crashreporter gconf +ipc system-sqlite +webm"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
# More URIs appended below...
SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
@@ -50,11 +51,15 @@ DEPEND="${RDEPEND}
webm? ( amd64? ( ${ASM_DEPEND} )
x86? ( ${ASM_DEPEND} ) )"
-if [[ ${PV} =~ alpha|beta ]]; then
+if [[ ${PV} =~ alpha ]]; then
# hg snapshot tarball
SRC_URI="${SRC_URI}
http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
S="${WORKDIR}/mozilla-central"
+elif [[ ${PV} =~ beta ]]; then
+ SRC_URI="${SRC_URI}
+ ${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+ S="${WORKDIR}/mozilla-beta"
else
SRC_URI="${SRC_URI}
${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
@@ -71,17 +76,11 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
- #64bit big indian support
- epatch "${FILESDIR}/mozilla-2.0_support_64bit_big_endian.patch"
-
# Allow user to apply any additional patches without modifing ebuild
epatch_user
eprefixify \
- extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
xpcom/build/nsXPCOMPrivate.h \
- xulrunner/installer/Makefile.in \
- xulrunner/app/nsRegisterGREUnix.cpp
# fix double symbols due to double -ljemalloc
sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
@@ -135,6 +134,7 @@ src_configure() {
mozconfig_annotate '' --enable-safe-browsing
mozconfig_annotate '' --with-system-png
mozconfig_annotate '' --enable-system-ffi
+ #mozconfig_annotate '' --enable-chrome-format=jar
mozconfig_use_enable system-sqlite
mozconfig_use_enable gconf
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 5cce947..4cf4eba 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,83 +1,9 @@
AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94cad34d SHA1 ffff69bcff712483d1962ce04a700748fdab24f5 SHA256 7edae5ea1efb042412d02ef00c51f5e55c4499751c240b48c7b07f69cc420d94
+AUX fix_omnijar_startupcache_breakage.patch 888 RMD160 603b41e22c55414e8f707b2b5f1342f377eb2638 SHA1 021ba3b753991e54f3d6b18be903bf4e312642d4 SHA256 937a6e3e366f5faf42ad039c37e237eb9079434028d1c9b63d1fcdf9645f75c9
AUX icon/firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
AUX icon/firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
-DIST firefox-4.0-patches-1.0.tar.bz2 16462 RMD160 46755eac7eb04eb19f79c93af3fd2016289a62a4 SHA1 270afe97a49bc507bc0d1d3159ec23e69e9ec40f SHA256 db5e993bf309c316ca370186c7866a7505cb37ecc729a3449bd0f6538aa2eda0
-DIST firefox-4.0.1-af.xpi 220422 RMD160 ec60332dd0115ae4087778ae45999485dd5e79b0 SHA1 5668120b63f9cafc738b05f66b45e0c0f343a14c SHA256 6b3529b78e6643578d407d454a70bce423742206d13f69bdd97871da9c533688
-DIST firefox-4.0.1-ak.xpi 222042 RMD160 c71d3c421e0297c599f5d6d8f135d12c2ae56b56 SHA1 5479593fc3c3c546f6289dc0634aa887dc30fc9d SHA256 a09ffd1618a1596cb8803a73bcbba74cfc79f8809168576b97fd023bf1c990c8
-DIST firefox-4.0.1-ar.xpi 241601 RMD160 d875b31df6568e7a0903684b5c68952241ae3d7c SHA1 11ddcb8f9139dbcdf898e691a4cbdf1841563755 SHA256 f2d19b19c1d817d935bbe3df0531ae9ff95a801109c65e1230f4f3bae60a0662
-DIST firefox-4.0.1-ast.xpi 218123 RMD160 7d3a3aae95c7e08ce40698e6e0972b84727260e2 SHA1 ed90f29f1ce4ebf001d8d3f2624f1f1c24a79b2c SHA256 3763a902e7db3f0ed40e5168edc98d0ad9357f78e7406051eba94d3c066b0388
-DIST firefox-4.0.1-be.xpi 231346 RMD160 bceabe55c0e4e638685673ced45e286d164b1c99 SHA1 5b76b18dd1514ba2d01ffe31a6799563ced54806 SHA256 edb4b777f2b36937b8f48662e8cf5c1a709e742205c3adcf4460d34b3c51ff56
-DIST firefox-4.0.1-bg.xpi 254933 RMD160 e9b139d0b77661a652d3700a84ee9d50a19b1088 SHA1 301505683fe4263919a803a33018cb17bf725dd9 SHA256 3edb2a3f1fab20d51ce57ee8b31beadadc40a1de0f9fe693f42e0e5f16f83db0
-DIST firefox-4.0.1-bn-BD.xpi 263230 RMD160 12ab0ab28c67bd2ab239813108f3c29b3b3feb74 SHA1 80cb616722d44b167b5d832957a0a163b88dca59 SHA256 6fb4247ca4900717b8ab76cbfa25ddfd9bc799296752e5b1d829e0318747f795
-DIST firefox-4.0.1-bn-IN.xpi 292731 RMD160 9acd2a515436b5d4c7dd55849510151f1dfce6a5 SHA1 cc53e0e339e990ba320ed70883efbe2cdf4c0a59 SHA256 65b7beaab67dc0a66558a1ba8d481ae94afb81c8eea3907ddc8103ce60dcb62d
-DIST firefox-4.0.1-br.xpi 228724 RMD160 58f5d4610a6e67665ef81998f3404c84bcb75e5d SHA1 14e47aed55d01c416e33109901e522a3fffeeb8b SHA256 6764cfab9d896a8b43d60fa6383e1be52faf37526a9883389cb933bb2a2f12ec
-DIST firefox-4.0.1-bs.xpi 226718 RMD160 609f877aee41d0373ec952d1c36d5d4b92f3d10e SHA1 5d895b88d0d783b91870cadbdbedd88a5725e2d3 SHA256 d502f8e154e386eafdabc96bea4e5d4ce2aebb980f5c98ef0ede798428974867
-DIST firefox-4.0.1-ca.xpi 228114 RMD160 c09fa5e331d7ac16d0c31e4ff3cdc3b1df1f2267 SHA1 1b799329e13d9869c0a2f9322e5edde5dac9701d SHA256 67d919edddfb7f58de3655afdd7dd0c3992d549c3cb02db4ee5a27e9ce4c9178
-DIST firefox-4.0.1-cs.xpi 229191 RMD160 07fb7c15bb5c8b5e265ae77906237bebcb63b2be SHA1 c79bfe0bf81acea4207250873e8456f8e6f8075b SHA256 1746e852231aa5b504bf36434d73eb0989e93a34a50d95277f5aebf3617d1ad9
-DIST firefox-4.0.1-cy.xpi 221682 RMD160 cd77cc2619277e7c17c08a85d761bd4dfb77e9d8 SHA1 d026f83918407cff06892b5f835992d50b8cbeaf SHA256 0de01085aaf07e0ee6604088651a1bdbe8e6d5c799d4a6164b02523ebe88d1b6
-DIST firefox-4.0.1-da.xpi 221658 RMD160 cfb8524e9a8324eadb17efd6981abbc653616184 SHA1 6cf77fedbcad80123773fb4737323051d0fbd354 SHA256 9f4c12725d2fb6a5f7c20afe1de1407a66e25f4d34f9f085e1013a466ed28e4c
-DIST firefox-4.0.1-de.xpi 229257 RMD160 51eb9b28544871cbf733ad4a97ae65d20b49e10d SHA1 a1f6129e7a779107b3808ff2eb7ec98a4ff65781 SHA256 bf5258a6e3549e3fd9ff9d2c7ebd435219b0a271000bb9f2e4ece238b8fe0869
-DIST firefox-4.0.1-el.xpi 243564 RMD160 47d6d66378661ab9b495d3769cc54ca2375102e4 SHA1 6182dffbb16d25e76628c9c6a9aa9bcb3de19a6f SHA256 75d6e97d5a1eaeaf44353cc3ea3a259aebb51eaa9800865b2190038072d14492
-DIST firefox-4.0.1-en-ZA.xpi 213525 RMD160 7c74f5040f8b06ea80b7ecb2db66397ccf93bfb0 SHA1 eb79891b74d524a9d46c7fe671713a65fa9be3d0 SHA256 3c0066026972c870087901ae763516f87a14152aef0ffc3d6b7e661986fd2992
-DIST firefox-4.0.1-eo.xpi 222304 RMD160 370dbcaa0b30cd17f85a475cf4ab937e61a5f2e6 SHA1 189e0d0fecc80454d7b0d03bd59b1a21453c71df SHA256 d389663243416eac7af309b2bac387977dcfa4abfa8ade18c0a83ced0f8bdc8d
-DIST firefox-4.0.1-es-ES.xpi 202316 RMD160 f3dea9e7acfd69de845b351d299e3df7538a5e42 SHA1 0e2bb1140f4cde0ceb909ef7adbbfde3358799d1 SHA256 f7c2d17b9e632956346d651d1a387e12e92643639bedd01509c9df8a4c661bf3
-DIST firefox-4.0.1-et.xpi 223433 RMD160 5488c10f129bed2527ee67f81b1a3d7684e13a9d SHA1 997aaf4a8074dba2480a309931f13f8459b3adfb SHA256 911f52cdd00d50881cbd98836fd8c3a7f5bd8c1533865fb447254683612010ed
-DIST firefox-4.0.1-eu.xpi 221330 RMD160 3f2f83aca483f64dd1b5993935943da9689fa8ed SHA1 d2d6092f2bb1189b4b039f720114c3a5284689cd SHA256 ca8c7edd050d73f43e8685fc2f763124e10fe6a3f10a8900b7daa060885eda6b
-DIST firefox-4.0.1-fa.xpi 249722 RMD160 7c645aa6fe293b8c9979ecba01b24e7e7ccf4102 SHA1 fac7c9a2af4254f8c965ec9d1617ffea471bb3f6 SHA256 a45e298a3e300ea9ffc64c42909e11db6e7bb2d941585884db743847b67e4756
-DIST firefox-4.0.1-fi.xpi 224502 RMD160 9a5ab40eb3df0299276e060af2e28f5e345ec866 SHA1 e935262bad4c7feb064303e01b79e9d4e5a67d8a SHA256 fb69f58589a4f66d970b4e9e94c9cd59b1fd2fe97e49f90786cd1f3b2ee59178
-DIST firefox-4.0.1-fr.xpi 230272 RMD160 572f46b060ea317bca1005d4813ced07209dd2d2 SHA1 cadb3f4413cc92fcfd2e4e9cca101512bea501c5 SHA256 34d2350057923735f3cc56ba2f54fd8c0daa153d1c2af145bf3b594aea5f42d3
-DIST firefox-4.0.1-fy-NL.xpi 227615 RMD160 ad3a9cf208c50b40b7089a5c45a5ec41e2b616f4 SHA1 2d9ca5afd1e48a95c36434f40069e02918d0b1d9 SHA256 991cfc1725510ab47f715076bf5ab6728bb59e898ec075f609782a0b2542750c
-DIST firefox-4.0.1-ga-IE.xpi 232342 RMD160 37faefa8c4ba1dbc3fd11d7abf8cd057e2b55290 SHA1 2417c08da97c5f26be9a7e699605d23f7ccc30d9 SHA256 566338ac72be0c59ae58f43cedf8b7ed7cc03eb4aade6da56f4a4bc649857887
-DIST firefox-4.0.1-gd.xpi 233887 RMD160 e2265ad2c4db19d51d7831403e08ae3ad87333f2 SHA1 ba7bc78482c983ca8d0d130f3e14f1aa316ca221 SHA256 547591e3a49b93b2f39306cd13e0a548b655f84bc1a2f92b2848c95f1c3e0c0b
-DIST firefox-4.0.1-gl.xpi 224437 RMD160 a0bc5e8fff02606e45c5088395f8ff1aa570c06a SHA1 aef092915119c17db4f1ec14b8c12b318eb77d55 SHA256 ce4c3638151b28d612ae53fa9b1d604c5ddef2b7f84c5508b21c5198dd9db5ae
-DIST firefox-4.0.1-gu-IN.xpi 252617 RMD160 fcbc362bdec869042a926d6f436c146f576fdd14 SHA1 696e7f29df809f659527a0d05b7f5ac884184efc SHA256 34f381592403e63b03b7349123ee727e3df66d0496ad27688a2b671e9b0fcddd
-DIST firefox-4.0.1-he.xpi 234330 RMD160 48f55f631046aa74293b6d009f6d56ea499959b4 SHA1 bdd17f84554305bbc8b35dd67674f08f31c13501 SHA256 8b517d41b62f757001307f9f99f76fecefd393cad9756751499682e49b32c803
-DIST firefox-4.0.1-hi-IN.xpi 257584 RMD160 3c4edb1e796fac4c0e3f9dd04fd66c8b3cf56d33 SHA1 f9d75c3ce9c49acb70f6f05d33ff0d59c44ea6de SHA256 390f65fcb7b474fd6348978427be254f94cfc80bcc594a8b5acdfec9e9a42bf3
-DIST firefox-4.0.1-hr.xpi 234112 RMD160 0b02beb5bd9b9b576b1ac495d47fbde62501ceb3 SHA1 701cb21f9fdef72a1f9a00f3cec44c6a8bd6cc6a SHA256 721eae6dd46da5adb22bed63986f72fb873b7315e1cdd41d48d63bd28c59d498
-DIST firefox-4.0.1-hu.xpi 234692 RMD160 e55b8c101a77b9e5059622ca8a989f7a873c770a SHA1 1bcb0ce280aa2afe34fb16fd441be95cb779f93f SHA256 1167b384bb2f1855a6551a35ad9c21c382e58f051a101a506c43ecb34728610c
-DIST firefox-4.0.1-hy-AM.xpi 418864 RMD160 f80d7d8936c20dce5c1267874314f9b9d0751dc2 SHA1 c50a924c921ba0e0873e9fb914e8257e080f8978 SHA256 5debb46f72776254662bfb72188470b537394b9bce29f9c2113b40dfd3b23e19
-DIST firefox-4.0.1-id.xpi 218468 RMD160 85ba3e60d8bebaa35991dc205ee289dfd1528cc4 SHA1 69d5aeb375722310903d2c28ca0e26365ceeb7b8 SHA256 9767e46ab7a4f341feb6b80bc559f44a22e2db62699970e6d1a423bc41b92324
-DIST firefox-4.0.1-is.xpi 224206 RMD160 4875eb59f3c75e2f30ddb1017ba7d7c99e719dad SHA1 86290f41c59af1f56fb77e3cd6de0217ae528220 SHA256 da92b0f17d8d37e4b48237fa9d23ef70a8d4317916eb219c663ce9997e5acca5
-DIST firefox-4.0.1-it.xpi 199845 RMD160 502c4bd22eae78b053996b6e1ee110d07cef943b SHA1 2fda513f7df563dfcfe1e986add2757bc9c2da61 SHA256 ff4a70d419f537fa8ae5d631a291c925725ff18c596888bfbe8de9f610753024
-DIST firefox-4.0.1-ja.xpi 252159 RMD160 29a7c24681d35d93ebeac67e09a0737f6adfc723 SHA1 57c8e695afc4bc2dfbee413c3c78bfb0f8276d87 SHA256 1dd8854f2ee2c8a571e98d32e6993c1829640e6f66add4025f858bcbf63a3047
-DIST firefox-4.0.1-kk.xpi 256607 RMD160 260f8c3b358089b06d46f4ae44b115291d70c0c0 SHA1 5e9c700fdd4dc7afc79842827afcf553e222036a SHA256 c42b67048c3360bbba688254aa1cd760ee82510023ffdf807f9fe27d8fe2c1d8
-DIST firefox-4.0.1-kn.xpi 273823 RMD160 8806d36e14bed90eb67bebcbe1338adb863e52ae SHA1 4228d0607e6096530bc8266cbf5b60ace061aa74 SHA256 f6d284b74a3055441344d7128d3a0f18c33baed3cc845a12f3d740e97fcabcea
-DIST firefox-4.0.1-ko.xpi 206945 RMD160 2e8000a5ccc0f1f22083523d84427415fb5c242d SHA1 4410ac1b4d3743a13088af11445091a9f91594cb SHA256 a410f4ed933dee17e846701ed938ff5ed513b222793fcb51265da4104197701a
-DIST firefox-4.0.1-ku.xpi 231607 RMD160 594d3cca337997d094ca676997ca516a51d8c996 SHA1 e09cba6bf36e45931d306bda97aac4f7472b0b24 SHA256 6e21a64f14ed6f19f50ae4b4accb7829ea3fbf2f69962715781349ff7235eccb
-DIST firefox-4.0.1-lg.xpi 228828 RMD160 c83d0477a5d1140aa0154e76b19359374642bdd8 SHA1 6413fd30d6689807db461a892d18fd0127a12a59 SHA256 64ce8df858a651fab26ea65b50c4b938a383969d1e5e3746b478e88412d9fb8c
-DIST firefox-4.0.1-lt.xpi 314014 RMD160 83d0aeebf2c26606a4106badba8d41e93bac1801 SHA1 6fdb9f734a87a54ecd51c4ce941c4f9d680c28ee SHA256 a9e816093405b627d1c67ccc60e046f9d51ced5d5aa34822dc8188e96a499d2b
-DIST firefox-4.0.1-lv.xpi 225535 RMD160 0cf0f27a374bf6d37704f8cfabbfa95704f54977 SHA1 775ce6957cd1bd06d902cae1e772a751ebff66f0 SHA256 bd7200b38d34f96035a479f840f0be63820d7d404b48fcabfdd6670df7a78171
-DIST firefox-4.0.1-mai.xpi 257134 RMD160 0b1082ac6a7c07412e7487a77b59fdb53e78eb49 SHA1 62abf505a08f656de1dcc7ecd07959f50fb67867 SHA256 d6202a51a21ce549469b6c678ece7b344758e7db9b05ca8b5ed4b43904e69f98
-DIST firefox-4.0.1-mk.xpi 250541 RMD160 9f34aa8e683506966607339c49e7a16576ffa98c SHA1 f880bc3c729ffe65125f52629c5334284b0ab33a SHA256 35ac22e21cb5b530437f276aace1283ec8ef0be2472d0b19e4b40544d1163872
-DIST firefox-4.0.1-ml.xpi 282447 RMD160 284f0e3e92557a9c1186fd3be3d2115f2b0ca10a SHA1 b582a3f9f22079acd05496b86e778cfc1254bb61 SHA256 32ca3d3eb383bb067981d5b40a3fbf508ce189f3fa105092ab00ab5b49cae67d
-DIST firefox-4.0.1-mr.xpi 257805 RMD160 b1939bc8451e52e5bdf00e197c5e5fbec25d63fe SHA1 d4ccf68b7c21c46389413f24a475eb6e0b5da910 SHA256 7d177b9d98487b9f0563e1e53fbca48ab4df36534fe8f7b38e339933b6a2eb61
-DIST firefox-4.0.1-nb-NO.xpi 222493 RMD160 dc9902b3c8df832e52a6cf8476ad2c9bbe48e8e0 SHA1 6a86417d540b922aeb23300b6b5e9c35ccf00660 SHA256 05d485c0eb9abc9dbe19934c4cac6b69a6fcb56217df26286a7dc7863d94adec
-DIST firefox-4.0.1-nl.xpi 223776 RMD160 44721ba15558d02b1a3934e2380993d44797c46f SHA1 ac9989dbe7a405f051b2eb6fef77c70de1ee0801 SHA256 bda740575ae1da40c0ccf87d3213916d1847972ab2523a30af8ccef476d17be2
-DIST firefox-4.0.1-nn-NO.xpi 223784 RMD160 f4e5e8a3055cae220607d461bf0412503bf54ed3 SHA1 35e7fd5285fe40242baae04d0e31b018c0344bcd SHA256 e3f34c474898021d0f8f70ff5b40ab0a85f9d10743b470ce67ac736c544dca90
-DIST firefox-4.0.1-nso.xpi 227056 RMD160 c32ab502e5ae46dcea3d89c330ad3e43bc595057 SHA1 ea95b8a1754fdbfcfe7ec90eb6c93431f2f90730 SHA256 8d81e36399371b488821fe13a22cd2c3855c0bb7a0c1856dbc7ec834895f3432
-DIST firefox-4.0.1-or.xpi 261472 RMD160 6b33f7ab004e3b53ce6ba9c039c4147f4d06e402 SHA1 935d4012f98adf0ffd77446f5929d00b982149e7 SHA256 cc830f87a191460cb3e595f2596160224c5e6dd9dbc0c1455dc558ca83def60b
-DIST firefox-4.0.1-pa-IN.xpi 258820 RMD160 b9341d5c51082d4a480e7fb4eb26351ece95df3f SHA1 38d2908a2ce3e2f7e2f9f0effe400b1408249588 SHA256 ed7f9ed51bd6c15aaf5f895d1e2adddc7328788f8a99c8c722d7651eb433b37c
-DIST firefox-4.0.1-pl.xpi 232239 RMD160 541269d2ffeab8219b2c4366a522a40ba22ad4e4 SHA1 f5375ee49b94f5e86e1c54b75c9f530e550bde04 SHA256 9988d6918a2cfb60e6cab999bc90f2b3bde948a3331a8daf1be11895f177f163
-DIST firefox-4.0.1-pt-PT.xpi 227260 RMD160 4296ccda0a1ecbb907837308701482aec921e187 SHA1 6dd3180838a69bfd6695ee69e9f94e724ddab188 SHA256 dccd2e5d458533451e6fdbb9dc90622b1c2abe6914eefaf6275f6d6bba4b86dd
-DIST firefox-4.0.1-rm.xpi 226580 RMD160 584a3ea61f6b07157bc532ed19c4ec752794281f SHA1 0a03b842632991b50bc7d8dda2178cfca4d133f8 SHA256 fb0796264bfe9ba5b69bc2fac588c5c3ea02191cbd1bbb6a5cc9e1debe8556dd
-DIST firefox-4.0.1-ro.xpi 230023 RMD160 7a8adaa9ba1e7675a2169eb2c7270e57783baa9a SHA1 e5d4a65efeb994741a8f0e301cd38751913bbf4f SHA256 584fab1a0f399631f99741f6575bef916f75be361136d5a1bc017eadc1a25895
-DIST firefox-4.0.1-ru.xpi 239442 RMD160 f412c1fb3b86001aeaae6c8d5ea3c8a2d2ea9453 SHA1 c2f847dae16327e527c9189d6b21a277ab97c670 SHA256 95d73a38abd1371c6d7b2b5ca2365b359f728878731dae5ca69120d74479c1e6
-DIST firefox-4.0.1-si.xpi 252437 RMD160 8ffdca8e315361d18808a5cf0b79a9aac68f449f SHA1 089602a157fccc32d8d6234a612ba63988472bf5 SHA256 24afc5858116c69559a5b76bdec8c9fb2efe204bd1f673d89dee02083953240d
-DIST firefox-4.0.1-sk.xpi 234295 RMD160 7d95911417ac45b91cd03fc25375d91349416077 SHA1 5d394fdc250e157534e7141ea84e79e301e04514 SHA256 017f565e2bee568988bee079f0dffa4d287fb9ff4e9692f94da1ad831bae8ce8
-DIST firefox-4.0.1-sl.xpi 222381 RMD160 956df91464afd3809c22fa0008ae909e5bed5bb8 SHA1 ab488b2142824b9d190e589210d0936850bd8637 SHA256 7471f994be4e43c4624622edf6d6ef725b85d160e57f7397e490822b5b6b6b65
-DIST firefox-4.0.1-son.xpi 220136 RMD160 8ece25e8a6f1217eb04f0695c5ad4149906eec97 SHA1 54b5e3b700733e7a7b5a7aaaa650e23ebf11ab45 SHA256 9a3bb75ae65c75a474778591a7ac77c660c59550b18095a843a9f0e768cd807f
-DIST firefox-4.0.1-sq.xpi 207488 RMD160 7ffcd2edba834fb56c9431d1b21ae34bfc60621a SHA1 da81be8e004a6ac7a8e56875c7dff2dbbc3bdfdb SHA256 c7e6eeb61c2edb7c902d30d417da676e5a087787d95d137269c87dc7663b2014
-DIST firefox-4.0.1-sr.xpi 258226 RMD160 f932dcb6e3c83b3e17742160729c0ac0c5ea6f44 SHA1 63bf99126a81ba21beeef08f1d8813761f680491 SHA256 f215e7ce5be9903069cd10ba20b0ef62d703111bb63bb19e030b3f771a85db75
-DIST firefox-4.0.1-sv-SE.xpi 260773 RMD160 1fdc4fb8104255e78edbb5b1cd731d114f51e87a SHA1 ff2590c1bd98bd882bf65f5582689ccec122d3cf SHA256 287935fe120bbd11496ebc67e4502f6a8e11c50a286d26f3f0fe09345ea9d150
-DIST firefox-4.0.1-ta-LK.xpi 267030 RMD160 a655f021bcb859f5b0eadbeac9560a080224cba7 SHA1 90d617329d7ccf94d08c524a37ce933265b743e1 SHA256 47cab0e3f19adaa8d0d42abe54d2ce63a03e0fc08464552b16e3b414c3b39417
-DIST firefox-4.0.1-ta.xpi 252374 RMD160 0316910624940e9b216dd437a1e8dd770da259bd SHA1 52bf76cb05b478753e6818c6c7cd31d01bc5fbc2 SHA256 02c14b534f5db23db68967aaa9ded8dfb9677951d7482abda06452b9d1406a39
-DIST firefox-4.0.1-te.xpi 266689 RMD160 d12630acd82a4e6354ae55d79ab24e02ca98d6a0 SHA1 aac6754630ddf710c0978eab0ce9ed9cb8daf15c SHA256 8f9c2a74c42e3aa295794b0bf60b5ff34a8a0d91d9f845c864093200cd28933b
-DIST firefox-4.0.1-th.xpi 253295 RMD160 d10f6c9072e49d5eaed64a3e975411ebe7cf9baf SHA1 ca8e349a4e98c81d8492bef08c4db0d4e4f5cee9 SHA256 d49d74da70f522d8c7d7605b6d683f7750f906f6a0876c47603828ed63e1ab36
-DIST firefox-4.0.1-tr.xpi 227124 RMD160 7dce476a04fdd338b0ca16e585ab51a62bb79461 SHA1 301fe0f38cce5c50ac82da9262f0732283be9b21 SHA256 4d4b80b81eb829053bb10a22b97c2515f60357ae9f25fb40d9bb35885da8bfc7
-DIST firefox-4.0.1-uk.xpi 260131 RMD160 7a4ea1bd3728037b6a72f2bffea2691433472429 SHA1 e55cfab8a580689688b8689e6f73be13b4215e0e SHA256 685acc732cabe069dfe006ee82c0f8be5a7195b54c4bbf1556603cac4a347f4e
-DIST firefox-4.0.1-vi.xpi 239967 RMD160 15bcdf411cd432329d743c060c68d1cce16d7e56 SHA1 ff34a6697c4c02485d592da9849dbbcabdb87689 SHA256 78408acdada24372e27a2b0bc162d49b70accdcda506f56e6e700168c2434c2b
-DIST firefox-4.0.1-zu.xpi 227606 RMD160 4341384271eb8c3341f55512c301dcd9dc9fc542 SHA1 d171ff639bbcd5173e3dfd185fd7902da70815ad SHA256 6c8575e740f4058ee54be0f89a25994c25fca691499762b4036e190d03c24698
-DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
-EBUILD firefox-4.0.1-r1.ebuild 8009 RMD160 ebac173dbe2df329e247646ac4aee4e2dfcbf306 SHA1 79230c70497625eaf44192255b1ff3292beeb90f SHA256 4f2739cdbdb66505acafe7a216f86eb3eb576bb7fb23bb116bc95a053c3611b0
+DIST firefox-5.0-patches-0.3.tar.bz2 14956 RMD160 905688afd3339d791faeacd4930022bcc92d146d SHA1 8c7fa871bef5e02a71d4fac195ce4c8ab8ce0eda SHA256 f0d72278018ed443ca1fe07fd69e612fc3bf9a0e3ee6fc15c5a1700df3126eef
+DIST firefox-5.0b2.source.tar.bz2 68883059 RMD160 948509c32a35f224d77eb22ebe3e87b99148754c SHA1 1466717db96c992691b32dba28a32ccefb5d0b9d SHA256 634e963b03ba460617771e19e138ac124894165aebc81afc535c22dbda0766fc
+EBUILD firefox-5.0_beta2.ebuild 8478 RMD160 8aace231bb39d5d911a696bbc758ce0b49dd9d61 SHA1 096dcd4b7c574e98c1e500de156d10c8ec0cd02a SHA256 596daa7f737f23b3ebefb37411b3635460350b5e8cbf32d0418b2b9beced1d21
diff --git a/www-client/firefox/files/fix_omnijar_startupcache_breakage.patch b/www-client/firefox/files/fix_omnijar_startupcache_breakage.patch
new file mode 100644
index 0000000..ccb63c6
--- /dev/null
+++ b/www-client/firefox/files/fix_omnijar_startupcache_breakage.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent 321c235ffaf41a77747672f46c43aa024490b8e4
+
+diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
+--- a/browser/installer/Makefile.in
++++ b/browser/installer/Makefile.in
+@@ -118,9 +118,8 @@
+ endif
+
+ ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY))
+-ifdef RUN_TEST_PROGRAM
+-_ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM))
+-endif
++ifndef RUN_TEST_PROGRAM
++_ABS_RUN_TEST_PROGRAM = /usr/lib64/xulrunner-devel-5.0
+
+ GENERATE_CACHE = \
+ $(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip");' && \
+@@ -130,6 +129,7 @@
+ find jsloader | xargs touch -t 201001010000 && \
+ $(ZIP) -r9mX omni.jar jsloader
+ endif
++endif
+
+ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
+
diff --git a/www-client/firefox/firefox-4.0.1-r1.ebuild b/www-client/firefox/firefox-5.0_beta2.ebuild
similarity index 93%
rename from www-client/firefox/firefox-4.0.1-r1.ebuild
rename to www-client/firefox/firefox-5.0_beta2.ebuild
index fa685bd..2dcbede 100644
--- a/www-client/firefox/firefox-4.0.1-r1.ebuild
+++ b/www-client/firefox/firefox-5.0_beta2.ebuild
@@ -7,14 +7,14 @@ WANT_AUTOCONF="2.1"
inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python
-MAJ_XUL_PV="2.0"
+MAJ_XUL_PV="5.0"
MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
XUL_PV="${MAJ_XUL_PV}${PV/${MAJ_FF_PV}/}" # 1.9.3_alpha6, 1.9.2.3, etc.
FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
CHANGESET="e56ecd8b3a68"
-PATCH="${PN}-4.0-patches-1.0"
+PATCH="${PN}-5.0-patches-0.3"
DESCRIPTION="Firefox Web Browser"
HOMEPAGE="http://www.mozilla.com/firefox"
@@ -25,6 +25,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="bindist +ipc system-sqlite +webm"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
# More URIs appended below...
SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
@@ -49,10 +50,14 @@ DEPEND="${RDEPEND}
amd64? ( ${ASM_DEPEND} ) )"
# No source releases for alpha|beta
-if [[ ${PV} =~ alpha|beta ]]; then
+if [[ ${PV} =~ alpha ]]; then
SRC_URI="${SRC_URI}
http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
S="${WORKDIR}/mozilla-central"
+elif [[ ${PV} =~ beta ]]; then
+ SRC_URI="${SRC_URI}
+ ${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+ S="${WORKDIR}/mozilla-beta"
else
SRC_URI="${SRC_URI}
${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
@@ -139,6 +144,7 @@ src_prepare() {
epatch "${WORKDIR}"
epatch "${FILESDIR}"/fix-preferences-gentoo.patch
+ epatch "${FILESDIR}"/fix_omnijar_startupcache_breakage.patch
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -177,6 +183,7 @@ src_configure() {
mozconfig_annotate '' --enable-system-ffi
mozconfig_annotate '' --with-system-libxul
mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
+ # mozconfig_annotate '' --enable-chrome-format=jar
# Other ff-specific settings
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
@@ -248,6 +255,11 @@ src_install() {
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
+
+ # Must symlink xulrunner into firefox directory now
+ dosym ../xulrunner-"${MAJ_XUL_PV}" "${MOZILLA_FIVE_HOME}"/xulrunner \
+ || die "failed to setup xulrunner"
+
# Plugins dir
dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
|| die "failed to symlink"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-26 11:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-26 11:52 [gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/, Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2011-03-28 19:11 Jory Pratt
2011-02-08 1:31 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox