# HG changeset patch # User Wolfgang Rosenauer # Date 1414707235 -3600 # Node ID 215db725bd829427b75c455d7704f5b9fa05af8f # Parent 6f0035130900c39797c98f48c0956e940fafe1f1# Parent a0aa49fce462f0e0ad5c6535dee4ad5f75496944 merge from firefox33 diff -r 6f0035130900 -r 215db725bd82 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Thu Oct 30 23:09:49 2014 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Thu Oct 30 23:13:55 2014 +0100 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Thu Oct 30 18:22:02 UTC 2014 - wr@rosenauer.org + +- update to Firefox 33.1 + * DuckDuckGo is now included upstream (bmo#1061736) + * fix to allow overriding sec_error_ca_cert_invalid errors + (bmo#1042889) + * disable http/1 framing enforcement (bmo#1088850) + +------------------------------------------------------------------- +Thu Oct 30 11:31:05 UTC 2014 - wr@rosenauer.org + +- update to Firefox 33.0.2 + * Fix a startup crash with some combination of hardware and drivers + 33.0.1 + * Firefox displays a black screen at start-up with certain + graphics drivers +- adjusted _constraints for ARM + +------------------------------------------------------------------- +Tue Oct 28 15:23:09 UTC 2014 - josua.mayer97@gmail.com + +- added mozilla-bmo1088588.patch to fix build with EGL (bmo#1088588) + +------------------------------------------------------------------- Sat Oct 25 08:45:43 UTC 2014 - wr@rosenauer.org - define /usr/share/myspell as additional dictionary location diff -r 6f0035130900 -r 215db725bd82 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Thu Oct 30 23:09:49 2014 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Oct 30 23:13:55 2014 +0100 @@ -21,8 +21,6 @@ %define major 33 %define mainver %major.99 %define update_channel beta -%define mainver %major.0 -%define update_channel release %define releasedate 2014103000 # general build definitions @@ -152,6 +150,7 @@ Patch10: mozilla-sle11.patch Patch11: mozilla-icu-strncat.patch Patch12: mozilla-arm-disable-edsp.patch +Patch13: mozilla-bmo1088588.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-kde-114.patch @@ -263,6 +262,7 @@ %endif %patch11 -p1 %patch12 -p1 +%patch13 -p1 # Firefox %patch101 -p1 %if 0%{?suse_version} >= 1140 diff -r 6f0035130900 -r 215db725bd82 MozillaFirefox/_constraints --- a/MozillaFirefox/_constraints Thu Oct 30 23:09:49 2014 +0100 +++ b/MozillaFirefox/_constraints Thu Oct 30 23:13:55 2014 +0100 @@ -8,4 +8,15 @@ 4500 + + + armv6l + armv7l + + + + 768 + + + diff -r 6f0035130900 -r 215db725bd82 MozillaFirefox/create-tar.sh diff -r 6f0035130900 -r 215db725bd82 MozillaFirefox/mozilla-bmo1088588.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-bmo1088588.patch Thu Oct 30 23:13:55 2014 +0100 @@ -0,0 +1,1 @@ +../mozilla-bmo1088588.patch \ No newline at end of file diff -r 6f0035130900 -r 215db725bd82 firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Thu Oct 30 23:09:49 2014 +0100 +++ b/firefox-multilocale-chrome.patch Thu Oct 30 23:13:55 2014 +0100 @@ -1,12 +1,12 @@ # HG changeset patch -# Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd +# Parent 839ad2a7997b5b64edf2454b42c733a0fc729270 # User Wolfgang Rosenauer Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO +@@ -386,16 +386,20 @@ pref("browser.helperApps.deleteTempFileO #endif // search engines URL @@ -41,8 +41,8 @@ else -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) +SEARCHPLUGINS_NAMES = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) ddg endif SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) @@ -128,7 +128,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -133,14 +133,15 @@ +@@ -139,14 +139,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ diff -r 6f0035130900 -r 215db725bd82 mozilla-bmo1088588.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-bmo1088588.patch Thu Oct 30 23:13:55 2014 +0100 @@ -0,0 +1,29 @@ +# HG changeset patch +# User Dirk Mueller +# Date 1414618964 0 +# Wed Oct 29 21:42:44 2014 +0000 +# Node ID 8e3825b2d12a9f295b6ff9a972340b9d84fce068 +# Parent 262e4847ad6cca40d7375e40a0d6ebe8b372e3d3 +Bug 1088588 - fix ifdef in X11TextureSourceOGL.cpp, r?nical + +diff --git a/gfx/layers/opengl/X11TextureSourceOGL.cpp b/gfx/layers/opengl/X11TextureSourceOGL.cpp +--- a/gfx/layers/opengl/X11TextureSourceOGL.cpp ++++ b/gfx/layers/opengl/X11TextureSourceOGL.cpp +@@ -94,14 +94,14 @@ X11TextureSourceOGL::ContentTypeToSurfac + switch (aType) { + case gfxContentType::COLOR: + return SurfaceFormat::R8G8B8X8; + case gfxContentType::COLOR_ALPHA: + return SurfaceFormat::R8G8B8A8; + default: + return SurfaceFormat::UNKNOWN; + } + } + ++} ++} ++ + #endif +- +-} +-} diff -r 6f0035130900 -r 215db725bd82 series --- a/series Thu Oct 30 23:09:49 2014 +0100 +++ b/series Thu Oct 30 23:13:55 2014 +0100 @@ -13,6 +13,7 @@ mozilla-icu-strncat.patch mozilla-arm-disable-edsp.patch mozilla-idldir.patch +mozilla-bmo1088588.patch # Firefox patches firefox-kde.patch