e44b8338d6
* removed upstreamed patch firefox-712763.patch * removed disabled mozilla-disable-neon-option.patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=333
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
# HG changeset patch
|
|
# Parent 8d013204e3f06811daf5156939452765fb3e10bb
|
|
|
|
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
|
|
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
|
|
endif
|
|
|
|
ifndef INCLUDED_RCS_MK
|
|
USE_RCS_MK := 1
|
|
include $(topsrcdir)/config/makefiles/makeutils.mk
|
|
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))
|
|
|
|
###########################################################################
|
|
# bug: 746277 - preserve existing functionality.
|
|
# MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists
|
|
###########################################################################
|
|
-MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
|
|
+#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
|
|
|
|
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
|
|
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
|
|
|
|
# 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
|
|
@@ -214,17 +214,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
|
|
endif
|
|
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)
|
|
|
|
- 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
|
|
|