6f2059ff99
- requires NSPR 4.9.2 - improve GStreamer integration (bmo#760140) - removed upstreamed mozilla-crashreporter-restart-args.patch - webapprt now included - use kmozillahelper's new REVEAL command (bnc#777415) (requires mozilla-kde4-integration >= 0.6.4) - updated translations-other with new languages OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=295
104 lines
4.8 KiB
Diff
104 lines
4.8 KiB
Diff
# HG changeset patch
|
|
# Parent 7820633b718ca1983da7b105d7868c455809cff1
|
|
|
|
diff --git a/build/Makefile.in b/build/Makefile.in
|
|
--- a/build/Makefile.in
|
|
+++ b/build/Makefile.in
|
|
@@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
|
|
APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
|
|
|
|
MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null))
|
|
ifdef MOZ_SOURCE_STAMP
|
|
DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
|
|
endif
|
|
|
|
_dollar=$$
|
|
-SOURCE_REPO := $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
|
|
+SOURCE_REPO ?= $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
|
|
ifdef SOURCE_REPO
|
|
DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
|
|
endif
|
|
|
|
DEFINES += \
|
|
-DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
|
|
-DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \
|
|
-DMOZ_APP_ID="$(MOZ_APP_ID)" \
|
|
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
|
|
--- a/toolkit/content/Makefile.in
|
|
+++ b/toolkit/content/Makefile.in
|
|
@@ -35,17 +35,17 @@ endif
|
|
ifeq (Android,$(OS_TARGET))
|
|
DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME)
|
|
endif
|
|
|
|
# strip a trailing slash from the repo URL because it's not always present,
|
|
# and we want to construct a working URL in buildconfig.html
|
|
# make+shell+sed = awful
|
|
_dollar=$$
|
|
-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
|
|
+SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
|
|
# extra sanity check for old versions of hg
|
|
# that don't support showconfig
|
|
ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
|
|
DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"
|
|
endif
|
|
|
|
BUILD_HOSTNAME = $(shell hostname -s || hostname)
|
|
DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)"
|
|
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
|
|
@@ -131,22 +131,22 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
|
|
TEST_PACKAGE = $(PKG_BASENAME).tests.zip
|
|
|
|
ifneq (,$(wildcard $(DIST)/bin/application.ini))
|
|
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
|
|
else
|
|
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
|
|
endif
|
|
|
|
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
|
|
+#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
|
|
|
|
# strip a trailing slash from the repo URL because it's not always present,
|
|
# and we want to construct a working URL in the sourcestamp file.
|
|
# make+shell+sed = awful
|
|
_dollar=$$
|
|
-MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
|
|
+#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
|
|
|
|
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt
|
|
|
|
# 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
|
|
@@ -218,20 +218,20 @@ endif
|
|
|
|
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)
|
|
|
|
# strip a trailing slash from the repo URL because it's not always present,
|
|
# and we want to construct a working URL in buildconfig.html
|
|
- SOURCE_REPO := $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null))
|
|
- SOURCE_REPO := $(strip $(SOURCE_REPO))
|
|
- SOURCE_REPO := $(patsubst ssh://%,http://%,$(SOURCE_REPO))
|
|
- SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO))
|
|
+ SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null))
|
|
+ SOURCE_REPO ?= $(strip $(SOURCE_REPO))
|
|
+ SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO))
|
|
+ SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO))
|
|
|
|
# command set should change based on revision control use.
|
|
# warn for now in case (git, bzr, ...) is in use.
|
|
$(call warnIfEmpty,SOURCE_REPO)
|
|
|
|
# extra sanity check for old versions of hg, no showconfig support
|
|
ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
|
|
INIARGS += --sourcerepo=$(SOURCE_REPO)
|