summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Cecil Curry <leycec@gmail.com> 2010-04-04 06:22:21 +1200
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2010-04-03 11:23:50 +0200
commita0ece846591347cec8c0f5fa1c2d6379071003f3 (patch)
treeb7a2e11c0c14d5c358d79661a279705317ebcca9
parentfc02ce110de116a360a59731c096f62bc2162d91 (diff)
downloadmozilla-a0ece846591347cec8c0f5fa1c2d6379071003f3.tar.gz
mozilla-a0ece846591347cec8c0f5fa1c2d6379071003f3.tar.xz
Bump Firefox and Xulrunner to 3.6.3; fix broken Mozilla makefiles.
Firefox 3.6.2 shipped with broken makefiles referencing a mythical "hg parent" command. However, "hg" has no such command. They meant "hg parents", instead. But they shouldn't be calling "hg" at all, as source tarballs don't ship a working ".hg/" repository. This fix removes all such references.
-rw-r--r--exlibs/mozilla.exlib17
-rw-r--r--packages/dev-libs/xulrunner/xulrunner-1.9.2.3.exheres-0 (renamed from packages/dev-libs/xulrunner/xulrunner-1.9.2.2.exheres-0)0
-rw-r--r--packages/net-www/firefox/firefox-3.6.3.exheres-0 (renamed from packages/net-www/firefox/firefox-3.6.2.exheres-0)0
3 files changed, 17 insertions, 0 deletions
diff --git a/exlibs/mozilla.exlib b/exlibs/mozilla.exlib
index 76e89e6..2055d21 100644
--- a/exlibs/mozilla.exlib
+++ b/exlibs/mozilla.exlib
@@ -48,6 +48,23 @@ mozilla_src_prepare() {
-e "/^idldir/ c idldir = /usr/share/idl/${PN}" \
-e "/^sdkdir/ c sdkdir = /usr/$(get_libdir)/${PN}-devel" \
-i "${ECONF_SOURCE}"/config/autoconf.mk.in
+
+ # The Firefox 3.6.2 build introduced broken makefiles that have yet to be
+ # fixed. Affected makefiles attempt to call the "hg parent" command;
+ # however, there is no such command. They meant "hg parents", instead.
+ # Of course, they shouldn't be calling "hg" at all as the tarball does not
+ # ship a working ".hg/" repository.
+ #
+ # This fix removes all references to "hg" from affected makefiles, and
+ # should probably be submitted as an upstream patch.
+ for BROKEN_MAKEFILE in \
+ "${ECONF_SOURCE}/toolkit/mozapps/installer/package-name.mk" \
+ "${ECONF_SOURCE}/browser/app/Makefile.in" \
+ "${ECONF_SOURCE}/browser/locales/Makefile.in" \
+ "${ECONF_SOURCE}/xpcom/analysis/Makefile.in" \
+ ; do
+ edo sed -e 's:$(shell hg .*)::' -i "${BROKEN_MAKEFILE}"
+ done
}
mozilla_src_configure() {
diff --git a/packages/dev-libs/xulrunner/xulrunner-1.9.2.2.exheres-0 b/packages/dev-libs/xulrunner/xulrunner-1.9.2.3.exheres-0
index 940552e..940552e 100644
--- a/packages/dev-libs/xulrunner/xulrunner-1.9.2.2.exheres-0
+++ b/packages/dev-libs/xulrunner/xulrunner-1.9.2.3.exheres-0
diff --git a/packages/net-www/firefox/firefox-3.6.2.exheres-0 b/packages/net-www/firefox/firefox-3.6.3.exheres-0
index 338964f..338964f 100644
--- a/packages/net-www/firefox/firefox-3.6.2.exheres-0
+++ b/packages/net-www/firefox/firefox-3.6.3.exheres-0