10b98266f1
* requires NSPR 4.9.5 and NSS 3.14.3
* MFSA 2013-30/CVE-2013-0788/CVE-2013-0789
Miscellaneous memory safety hazards
* MFSA 2013-31/CVE-2013-0800 (bmo#825721)
Out-of-bounds write in Cairo library
* MFSA 2013-35/CVE-2013-0796 (bmo#827106)
WebGL crash with Mesa graphics driver on Linux
* MFSA 2013-36/CVE-2013-0795 (bmo#825697)
Bypass of SOW protections allows cloning of protected nodes
* MFSA 2013-37/CVE-2013-0794 (bmo#626775)
Bypass of tab-modal dialog origin disclosure
* MFSA 2013-38/CVE-2013-0793 (bmo#803870)
Cross-site scripting (XSS) using timed history navigations
* MFSA 2013-39/CVE-2013-0792 (bmo#722831)
Memory corruption while rendering grayscale PNG images
- use GStreamer 1.0 starting with 12.3 (mozilla-gstreamer-1.patch)
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=326
79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
# HG changeset patch
|
|
# Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b
|
|
|
|
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
--- a/browser/app/Makefile.in
|
|
+++ b/browser/app/Makefile.in
|
|
@@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
|
|
endif
|
|
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
|
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
|
|
@@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \
|
|
firefox.icns \
|
|
disk.icns \
|
|
document.icns \
|
|
dsstore \
|
|
$(NULL)
|
|
|
|
LINUX_BRANDING_FILES = \
|
|
default16.png \
|
|
+ default22.png \
|
|
+ default24.png \
|
|
default32.png \
|
|
default48.png \
|
|
+ default256.png \
|
|
mozicon128.png \
|
|
$(NULL)
|
|
|
|
OS2_BRANDING_FILES = \
|
|
firefox-os2.ico \
|
|
document-os2.ico \
|
|
$(NULL)
|
|
|
|
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
|
|
@@ -552,18 +552,21 @@
|
|
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
|
#ifdef SHIP_FEEDBACK
|
|
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
|
|
#endif
|
|
@BINPATH@/chrome/toolkit@JAREXT@
|
|
@BINPATH@/chrome/toolkit.manifest
|
|
#ifdef MOZ_GTK2
|
|
@BINPATH@/chrome/icons/default/default16.png
|
|
+@BINPATH@/chrome/icons/default/default22.png
|
|
+@BINPATH@/chrome/icons/default/default24.png
|
|
@BINPATH@/chrome/icons/default/default32.png
|
|
@BINPATH@/chrome/icons/default/default48.png
|
|
+@BINPATH@/chrome/icons/default/default256.png
|
|
#endif
|
|
|
|
; shell icons
|
|
#ifdef XP_UNIX
|
|
#ifndef XP_MACOSX
|
|
@BINPATH@/icons/*.xpm
|
|
@BINPATH@/icons/*.png
|
|
#endif
|