forked from pool/MozillaFirefox
2d4b618151
* requires NSPR 4.12 / NSS 3.21.1
* Instant browser tab sharing through Hello
* Synced Tabs button in button bar
* Tabs synced via Firefox Accounts from other devices are now shown
in dropdown area of Awesome Bar when searching
* Introduce a new preference (network.dns.blockDotOnion) to allow
blocking .onion at the DNS level
* Tab Groups (Panorama) feature removed
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=490
74 lines
2.9 KiB
Diff
74 lines
2.9 KiB
Diff
# HG changeset patch
|
|
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
|
|
# Parent e3d8efdd7eea96ff7b8a7f6489a082cad72a98d8
|
|
|
|
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
--- a/browser/app/Makefile.in
|
|
+++ b/browser/app/Makefile.in
|
|
@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
|
|
endif
|
|
|
|
ifdef MOZ_WIDGET_GTK
|
|
libs::
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default
|
|
+ifdef MOZ_OFFICIAL_BRANDING
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default
|
|
+endif
|
|
endif
|
|
|
|
# channel-prefs.js is handled separate from other prefs due to bug 756325
|
|
libs:: $(srcdir)/profile/channel-prefs.js
|
|
$(NSINSTALL) -D $(DIST)/bin/defaults/pref
|
|
$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
|
|
|
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
|
|
--- a/browser/branding/branding-common.mozbuild
|
|
+++ b/browser/branding/branding-common.mozbuild
|
|
@@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
|
|
'disk.icns',
|
|
'document.icns',
|
|
'dsstore',
|
|
'firefox.icns',
|
|
]
|
|
elif CONFIG['MOZ_WIDGET_GTK']:
|
|
BRANDING_FILES += [
|
|
'default16.png',
|
|
+ 'default22.png',
|
|
+ 'default24.png',
|
|
+ 'default256.png',
|
|
'default32.png',
|
|
'default48.png',
|
|
'mozicon128.png',
|
|
]
|
|
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
|
--- a/browser/installer/package-manifest.in
|
|
+++ b/browser/installer/package-manifest.in
|
|
@@ -665,18 +665,21 @@
|
|
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
|
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
|
@RESPATH@/chrome/toolkit@JAREXT@
|
|
@RESPATH@/chrome/toolkit.manifest
|
|
@RESPATH@/chrome/recording.manifest
|
|
@RESPATH@/chrome/recording/*
|
|
#ifdef MOZ_GTK
|
|
@RESPATH@/browser/chrome/icons/default/default16.png
|
|
+@RESPATH@/browser/chrome/icons/default/default22.png
|
|
+@RESPATH@/browser/chrome/icons/default/default24.png
|
|
@RESPATH@/browser/chrome/icons/default/default32.png
|
|
@RESPATH@/browser/chrome/icons/default/default48.png
|
|
+@RESPATH@/browser/chrome/icons/default/default256.png
|
|
#endif
|
|
@RESPATH@/browser/features/*
|
|
|
|
; [Webide Files]
|
|
@RESPATH@/browser/chrome/webide@JAREXT@
|
|
@RESPATH@/browser/chrome/webide.manifest
|
|
@RESPATH@/browser/@PREF_DIR@/webide-prefs.js
|
|
|