diff -r 9483ff78d5a0 -r 354c672efefa mozilla-repo.patch --- a/mozilla-repo.patch Thu Oct 16 21:20:22 2014 +0200 +++ b/mozilla-repo.patch Thu Oct 16 23:09:58 2014 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 9b45fd4b00c45014b17358158cdb51805c8ca327 +# Parent 1478a2c97152e81b6d7cb89a4ab34da7310e3e86 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -138,23 +138,23 @@ else +@@ -137,24 +137,24 @@ else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif @@ -20,8 +20,10 @@ # bug: 746277 - preserve existing functionality. # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists ########################################################################### + ifdef MOZILLA_OFFICIAL -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) + endif MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json @@ -29,26 +31,3 @@ # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip - endif # PACKAGE_NAME_MK_INCLUDED -diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in ---- a/toolkit/xre/Makefile.in -+++ b/toolkit/xre/Makefile.in -@@ -39,17 +39,17 @@ TOOLKIT_EM_VERSION=$(shell $(PERL) $(top - # Valid if null: {warn,error}IfEmpty - DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"' - - MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null)) - ifdef MOZ_SOURCE_STAMP - - INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) - -- source_repo := $(call getSourceRepo) -+ source_repo ?= $(call getSourceRepo) - - # extra sanity check for old versions of hg, no showconfig support - ifneq (,$(filter http%,$(source_repo))) - INIARGS += --sourcerepo=$(source_repo) - endif - - endif # MOZ_SOURCE_STAMP -