forked from pool/MozillaFirefox
6d0dbb410f
* just a version bump for our builds
* fixed the in application update process for certain environments
(in application update is not enabled in openSUSE and Linux
is unaffected in any case)
- build with --disable-optimize for 13.1 and above for i586 to
workaround miscompilations (bnc#896624)
- update to Firefox 32.0.1
* fixed stability issues for computers with multiple graphics cards
* mixed content icon may be incorrectly displayed instead of lock
icon for SSL sites in 32.0 (
* WebRTC: setRemoteDescription() silently fails if no success
callback is specified (bmo#1063971)
- update to Firefox 32.0 (bnc#894370)
* MFSA 2014-67/CVE-2014-1553/CVE-2014-1554/CVE-2014-1562
- rebased patches
- requires NSS 3.16.4
- removed upstreamed patch
* mozilla-aarch64-bmo-810631.patch
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=396
79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
# HG changeset patch
|
|
# Parent 17ccae9100af86bc65f924b87545184af2f4ada9
|
|
|
|
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
--- a/browser/app/Makefile.in
|
|
+++ b/browser/app/Makefile.in
|
|
@@ -75,16 +75,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
|
|
|
|
libs:: $(srcdir)/profile/prefs.js
|
|
$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
|
|
|
|
ifndef LIBXUL_SDK
|
|
# channel-prefs.js is handled separate from other prefs due to bug 756325
|
|
libs:: $(srcdir)/profile/channel-prefs.js
|
|
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
|
|
--- a/browser/branding/official/Makefile.in
|
|
+++ b/browser/branding/official/Makefile.in
|
|
@@ -35,18 +35,21 @@ BRANDING_FILES := \
|
|
document.icns \
|
|
dsstore \
|
|
$(NULL)
|
|
endif
|
|
|
|
ifdef MOZ_WIDGET_GTK
|
|
BRANDING_FILES := \
|
|
default16.png \
|
|
+ default22.png \
|
|
+ default24.png \
|
|
default32.png \
|
|
default48.png \
|
|
+ default256.png \
|
|
mozicon128.png \
|
|
$(NULL)
|
|
endif
|
|
|
|
BRANDING_DEST := $(DIST)/branding
|
|
BRANDING_TARGET := export
|
|
INSTALL_TARGETS += BRANDING
|
|
|
|
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
|
|
@@ -629,18 +629,21 @@
|
|
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
|
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
|
@BINPATH@/chrome/toolkit@JAREXT@
|
|
@BINPATH@/chrome/toolkit.manifest
|
|
@BINPATH@/chrome/recording.manifest
|
|
@BINPATH@/chrome/recording/*
|
|
#ifdef MOZ_GTK
|
|
@BINPATH@/browser/chrome/icons/default/default16.png
|
|
+@BINPATH@/browser/chrome/icons/default/default22.png
|
|
+@BINPATH@/browser/chrome/icons/default/default24.png
|
|
@BINPATH@/browser/chrome/icons/default/default32.png
|
|
@BINPATH@/browser/chrome/icons/default/default48.png
|
|
+@BINPATH@/browser/chrome/icons/default/default256.png
|
|
#endif
|
|
|
|
; [Webide Files]
|
|
#ifdef MOZ_DEVTOOLS_WEBIDE
|
|
@BINPATH@/browser/chrome/webide@JAREXT@
|
|
@BINPATH@/browser/chrome/webide.manifest
|
|
@BINPATH@/browser/@PREF_DIR@/webide-prefs.js
|
|
#endif
|