Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory
checked in at 2015-04-07 09:27:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old)
and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox"
Changes:
--------
--- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes
2015-03-25 09:54:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes
2015-04-07 09:27:52.000000000 +0200
@@ -1,0 +2,54 @@
+Sat Mar 28 09:46:48 UTC 2015 - w...@rosenauer.org
+
+- update to Firefox 37.0 (bnc#925368)
+ * Heartbeat user rating system
+ * Yandex set as default search provider for the Turkish locale
+ * Bing search now uses HTTPS for secure searching
+ * Improved protection against site impersonation via OneCRL
+ centralized certificate revocation
+ * Opportunistically encrypt HTTP traffic where the server supports
+ HTTP/2 AltSvc
+ * some more behaviour changes for TLS
+ security fixes:
+ * MFSA 2015-30/CVE-2015-0814/CVE-2015-0815
+ Miscellaneous memory safety hazards
+ * MFSA 2015-31/CVE-2015-0813 (bmo#1106596))
+ Use-after-free when using the Fluendo MP3 GStreamer plugin
+ * MFSA 2015-32/CVE-2015-0812 (bmo#1128126)
+ Add-on lightweight theme installation approval bypassed through
+ MITM attack
+ * MFSA 2015-33/CVE-2015-0816 (bmo#1144991)
+ resource:// documents can load privileged pages
+ * MFSA-2015-34/CVE-2015-0811 (bmo#1132468)
+ Out of bounds read in QCMS library
+ * MFSA-2015-35/CVE-2015-0810 (bmo#1125013)
+ Cursor clickjacking with flash and images (OS X only)
+ * MFSA-2015-36/CVE-2015-0808 (bmo#1109552)
+ Incorrect memory management for simple-type arrays in WebRTC
+ * MFSA-2015-37/CVE-2015-0807 (bmo#1111834)
+ CORS requests should not follow 30x redirections after preflight
+ * MFSA-2015-38/CVE-2015-0805/CVE-2015-0806 (bmo#1135511, bmo#1099437)
+ Memory corruption crashes in Off Main Thread Compositing
+ * MFSA-2015-39/CVE-2015-0803/CVE-2015-0804 (bmo#1134560)
+ Use-after-free due to type confusion flaws
+ * MFSA-2015-40/CVE-2015-0801 (bmo#1146339)
+ Same-origin bypass through anchor navigation
+ * MFSA-2015-41/CVE-2015-0800/CVE-2012-2808
+ PRNG weakness allows for DNS poisoning on Android (only)
+ * MFSA-2015-42/CVE-2015-0802 (bmo#1124898)
+ Windows can retain access to privileged content on navigation
+ to unprivileged pages
+- removed obsolete patches
+ * mozilla-bmo1088588.patch
+ * mozilla-bmo1108834.patch
+- requires NSPR 4.10.8
+
+-------------------------------------------------------------------
+Tue Mar 24 15:35:24 UTC 2015 - dval...@suse.com
+
+- Fix builds with skia on Power
+ mozilla-skia-be-le.patch (patch from #bmo1136958)
+ mozilla-bmo1108834.patch
+ mozilla-bmo1005535.patch
+
+-------------------------------------------------------------------
Old:
----
firefox-36.0.4-source.tar.xz
l10n-36.0.4.tar.xz
mozilla-bmo1088588.patch
New:
----
firefox-37.0-source.tar.xz
l10n-37.0.tar.xz
mozilla-bmo1005535.patch
mozilla-skia-be-le.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:02.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:02.000000000 +0200
@@ -18,10 +18,10 @@
# changed with every update
-%define major 36
-%define mainver %major.0.4
+%define major 37
+%define mainver %major.0
%define update_channel release
-%define releasedate 2015032000
+%define releasedate 2015032800
# general build definitions
%if "%{update_channel}" != "aurora"
@@ -76,7 +76,7 @@
BuildRequires: libnotify-devel
BuildRequires: libproxy-devel
BuildRequires: makeinfo
-BuildRequires: mozilla-nspr-devel >= 4.10.7
+BuildRequires: mozilla-nspr-devel >= 4.10.8
BuildRequires: mozilla-nss-devel >= 3.17.4
BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
@@ -143,9 +143,10 @@
Patch9: mozilla-repo.patch
Patch10: mozilla-icu-strncat.patch
Patch11: mozilla-arm-disable-edsp.patch
-Patch12: mozilla-bmo1088588.patch
-Patch13: mozilla-openaes-decl.patch
-Patch14: mozilla-skia-bmo1136958.patch
+Patch12: mozilla-openaes-decl.patch
+Patch13: mozilla-skia-bmo1136958.patch
+Patch14: mozilla-skia-be-le.patch
+Patch15: mozilla-bmo1005535.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch
@@ -199,7 +200,7 @@
%package translations-other
Summary: Extra translations for %{appname}
Group: System/Localization
-Provides:
locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu)
+Provides:
locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;uz;vi;zu)
Requires: %{name} = %{version}
Obsoletes: %{name}-translations < %{version}-%{release}
@@ -260,6 +261,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
# Firefox
%patch101 -p1
%patch102 -p1
++++++ compare-locales.tar.xz ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_36_0_4_RELEASE"
-VERSION="36.0.4"
+RELEASE_TAG="FIREFOX_37_0_RELEASE"
+VERSION="37.0"
# mozilla
if [ -d mozilla ]; then
++++++ firefox-36.0.4-source.tar.xz -> firefox-37.0-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/firefox-36.0.4-source.tar.xz
/work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-37.0-source.tar.xz
differ: char 26, line 1
++++++ firefox-kde.patch ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent ae5fa7b97ee57df54434bebc6dbda400b7525340
+# Parent 409c60c5454efb61ebecf0edc8822a0e92f563f3
diff --git a/browser/base/content/browser-kde.xul
b/browser/base/content/browser-kde.xul
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1272 @@
+@@ -0,0 +1,1288 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -295,17 +295,22 @@
+ <panel id="social-share-panel"
+ class="social-panel"
+ type="arrow"
-+ orient="horizontal"
++ orient="vertical"
+ onpopupshowing="SocialShare.onShowing()"
+ onpopuphidden="SocialShare.onHidden()"
+ hidden="true">
-+ <vbox class="social-share-toolbar">
-+ <arrowscrollbox id="social-share-provider-buttons" orient="vertical"
flex="1">
++ <hbox class="social-share-toolbar">
++ <toolbarbutton id="manage-share-providers" class="toolbarbutton
share-provider-button"
++ tooltiptext="&social.addons.label;"
++
oncommand="BrowserOpenAddonsMgr('addons://list/service');
++ this.parentNode.parentNode.hidePopup();"/>
++ <arrowscrollbox id="social-share-provider-buttons"
orient="horizontal" flex="1" pack="end">
+ <toolbarbutton id="add-share-provider" class="toolbarbutton
share-provider-button" type="radio"
+ group="share-providers"
tooltiptext="&findShareServices.label;"
+ oncommand="SocialShare.showDirectory()"/>
+ </arrowscrollbox>
-+ </vbox>
++ </hbox>
++ <hbox id="share-container" flex="1"/>
+ </panel>
+
+ <panel id="social-notification-panel"
@@ -580,6 +585,17 @@
+
+ <tooltip id="dynamic-shortcut-tooltip"
+ onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
++
++ <menupopup id="emeNotificationsPopup">
++ <menuitem id="emeNotificationsNotNow"
++ label="Not now"
++ acceskey="N"
++ oncommand="gEMEHandler.onNotNow(this);"/>
++ <menuitem id="emeNotificationsDontAskAgain"
++ label="Don't ask me again"
++ acceskey="D"
++ oncommand="gEMEHandler.onDontAskAgain(this);"/>
++ </menupopup>
+ </popupset>
+
+#ifdef CAN_DRAW_IN_TITLEBAR
@@ -642,7 +658,6 @@
+ </toolbar>
+
+ <toolbar id="TabsToolbar"
-+ class="toolbar-primary"
+ fullscreentoolbar="true"
+ customizable="true"
+ mode="icons"
@@ -728,7 +743,7 @@
+ to the default placements of buttons in CustomizableUI.jsm, so the
+ customization code doesn't get confused.
+ -->
-+ <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
++ <toolbar id="nav-bar"
+ aria-label="&navbarCmd.label;"
+ fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="small"
@@ -801,6 +816,7 @@
+ <image id="servicesInstall-notification-icon"
class="notification-anchor-icon" role="button"/>
+ <image id="translate-notification-icon"
class="notification-anchor-icon" role="button"/>
+ <image id="translated-notification-icon"
class="notification-anchor-icon" role="button"/>
++ <image id="eme-notification-icon"
class="notification-anchor-icon" role="button"/>
+ </box>
+ <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag
events.
@@ -1300,7 +1316,7 @@
<button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;"
-@@ -1198,17 +1198,17 @@
+@@ -1214,17 +1214,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to
bug 579776. -->
@@ -1333,10 +1349,10 @@
* content/browser/browser.xul (content/browser.xul)
+* content/browser/browser-kde.xul
(content/browser-kde.xul)
+% override chrome://browser/content/browser.xul
chrome://browser/content/browser-kde.xul desktop=kde
+ * content/browser/browser-eme.properties
(content/browser-eme.properties)
* content/browser/browser-tabPreviews.xml
(content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js)
- content/browser/content-UITour.js
(content/content-UITour.js)
content/browser/defaultthemes/1.footer.jpg
(content/defaultthemes/1.footer.jpg)
content/browser/defaultthemes/1.header.jpg
(content/defaultthemes/1.header.jpg)
content/browser/defaultthemes/1.icon.jpg
(content/defaultthemes/1.icon.jpg)
@@ -1427,7 +1443,7 @@
// when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
-@@ -572,16 +578,27 @@ var gMainPane = {
+@@ -549,16 +555,27 @@ var gMainPane = {
*/
setDefaultBrowser: function()
{
@@ -1895,7 +1911,7 @@
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
-@@ -689,19 +689,21 @@
+@@ -688,19 +688,21 @@
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/profile/prefs.js
++++++ firefox-multilocale-chrome.patch ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -1,12 +1,13 @@
# HG changeset patch
# Parent 16846914f968944f991c8b12fdc38ce8fc099d73
# User Wolfgang Rosenauer <w...@rosenauer.org>
+# Parent c0a406c7a6cc5edc8fb34549428866ff39ad878f
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
-@@ -389,16 +389,20 @@ pref("browser.helperApps.deleteTempFileO
+@@ -378,16 +378,20 @@ pref("browser.helperApps.deleteTempFileO
#endif
// search engines URL
@@ -19,18 +20,18 @@
+pref("browser.search.loadFromJars", true);
+pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/");
+
- // disable logging for the search service by default
- pref("browser.search.log", false);
-
// Ordering of Search Engines in the Engine list.
pref("browser.search.order.1",
"chrome://browser-region/locale/region.properties");
pref("browser.search.order.2",
"chrome://browser-region/locale/region.properties");
pref("browser.search.order.3",
"chrome://browser-region/locale/region.properties");
+ // Market-specific search defaults (US market only)
+ pref("browser.search.geoSpecificDefaults", true);
+ pref("browser.search.defaultenginename.US",
"data:text/plain,browser.search.defaultenginename.US=Yahoo");
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
-@@ -66,24 +66,27 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST
+@@ -66,27 +66,30 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST
cp ../installer/windows/l10ngen/stub.exe
'$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
$(NULL)
@@ -41,17 +42,20 @@
else
-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
ddg
+SEARCHPLUGINS_NAMES = $(shell cat \
-+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
-+ @srcdir@/en-US/searchplugins/list.txt ) ) ddg
++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
++ @srcdir@/en-US/searchplugins/list.txt ) ) ddg
endif
SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
# metro build call a searchplugins target for search engine plugins
.PHONY: searchplugins
SEARCHPLUGINS_TARGET := libs searchplugins
--SEARCHPLUGINS := $(foreach plugin,$(addsuffix
.xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call
MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
--PP_TARGETS += SEARCHPLUGINS
-+#SEARCHPLUGINS := $(foreach plugin,$(addsuffix
.xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call
MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
+-SEARCHPLUGINS := $(foreach plugin,$(addsuffix
.xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call
EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin:
$(plugin))))
++#SEARCHPLUGINS := $(foreach plugin,$(addsuffix
.xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call
EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin:
$(plugin))))
+SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
+ # Some locale-specific search plugins may have preprocessor directives, but
the
+ # default en-US ones do not.
+ SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings
+-PP_TARGETS += SEARCHPLUGINS
+#PP_TARGETS += SEARCHPLUGINS
# Required for l10n.mk - defines a list of app sub dirs that should
@@ -61,7 +65,7 @@
DIST_SUBDIRS = browser metro
else
DIST_SUBDIRS = $(DIST_SUBDIR)
-@@ -117,16 +120,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J
+@@ -120,16 +123,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J
libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
@@ -104,7 +108,7 @@
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
-@@ -141,14 +141,15 @@
+@@ -146,14 +146,15 @@
locale/browser/syncQuota.properties
(%chrome/browser/syncQuota.properties)
#endif
% locale browser-region @AB_CD@ %locale/browser-region/
++++++ l10n-36.0.4.tar.xz -> l10n-37.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/l10n-36.0.4.tar.xz
/work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-37.0.tar.xz differ: char
26, line 1
++++++ mozilla-bmo1088588.patch -> mozilla-bmo1005535.patch ++++++
--- /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-bmo1088588.patch
2014-11-01 08:15:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-bmo1005535.patch
2015-04-07 09:27:56.000000000 +0200
@@ -1,29 +1,152 @@
# HG changeset patch
-# User Dirk Mueller <dmuel...@suse.com>
-# 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
+# Parent b7eb1ce0237d6125b75bc8ff1cb3afc328d6e78c
+# User Steve Singer <st...@ssinger.info>
+# Parent d7af74fb513bcca581012f17ea248b1692db5d97
+Bug 1005535 - Get skia GPU building on big endian.
-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;
- }
- }
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -8198,21 +8198,21 @@ dnl Skia
+ dnl ========================================================
+ if test "$MOZ_ENABLE_SKIA"; then
+ AC_DEFINE(MOZ_ENABLE_SKIA)
+ AC_DEFINE(USE_SKIA)
+ if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" =
x"gonk"; then
+ AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
+ fi
-+}
-+}
+- if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}"
!= "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then
++ #if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a
"${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then
+ MOZ_ENABLE_SKIA_GPU=1
+ AC_DEFINE(USE_SKIA_GPU)
+ AC_SUBST(MOZ_ENABLE_SKIA_GPU)
+- fi
++ #fi
+ fi
+ AC_SUBST(MOZ_ENABLE_SKIA)
+
+ dnl ========================================================
+ dnl Check for nss-shared-helper
+ dnl ========================================================
+
+ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
+diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h
b/gfx/skia/trunk/include/config/SkUserConfig.h
+--- a/gfx/skia/trunk/include/config/SkUserConfig.h
++++ b/gfx/skia/trunk/include/config/SkUserConfig.h
+@@ -192,16 +192,17 @@
+
+ #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64)
+ # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h"
+ #else
+ # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h"
+ #endif
+
+ // On all platforms we have this byte order
++
+ #define SK_A32_SHIFT 24
+ #define SK_R32_SHIFT 16
+ #define SK_G32_SHIFT 8
+ #define SK_B32_SHIFT 0
+
+ #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
+
+ #define SK_SUPPORT_LEGACY_GETDEVICE
+diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h
b/gfx/skia/trunk/include/core/SkColorPriv.h
+--- a/gfx/skia/trunk/include/core/SkColorPriv.h
++++ b/gfx/skia/trunk/include/core/SkColorPriv.h
+@@ -27,37 +27,27 @@
+ * For easier compatibility with Skia's GPU backend, we further restrict
these
+ * to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does
+ * not directly correspond to the same shift-order, since we have to take
endianess
+ * into account.
+ *
+ * Here we enforce this constraint.
+ */
+
+-#ifdef SK_CPU_BENDIAN
+- #define SK_RGBA_R32_SHIFT 24
+- #define SK_RGBA_G32_SHIFT 16
+- #define SK_RGBA_B32_SHIFT 8
+- #define SK_RGBA_A32_SHIFT 0
+
+- #define SK_BGRA_B32_SHIFT 24
+- #define SK_BGRA_G32_SHIFT 16
+- #define SK_BGRA_R32_SHIFT 8
+- #define SK_BGRA_A32_SHIFT 0
+-#else
+ #define SK_RGBA_R32_SHIFT 0
+ #define SK_RGBA_G32_SHIFT 8
+ #define SK_RGBA_B32_SHIFT 16
+ #define SK_RGBA_A32_SHIFT 24
+
+ #define SK_BGRA_B32_SHIFT 0
+ #define SK_BGRA_G32_SHIFT 8
+ #define SK_BGRA_R32_SHIFT 16
+ #define SK_BGRA_A32_SHIFT 24
+-#endif
++
+
+ #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
+ #error "can't define PMCOLOR to be RGBA and BGRA"
+ #endif
+
+ #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \
+ (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \
+ SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \
+diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h
b/gfx/skia/trunk/include/core/SkImageInfo.h
+--- a/gfx/skia/trunk/include/core/SkImageInfo.h
++++ b/gfx/skia/trunk/include/core/SkImageInfo.h
+@@ -83,19 +83,20 @@ enum SkColorType {
+
+ kLastEnum_SkColorType = kIndex_8_SkColorType,
+
+ #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
+ kN32_SkColorType = kBGRA_8888_SkColorType,
+ #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
+ kN32_SkColorType = kRGBA_8888_SkColorType,
+ #else
+-#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
++ kN32_SkColorType = kBGRA_8888_SkColorType
+ #endif
+
++
+ #ifdef SK_SUPPORT_LEGACY_N32_NAME
+ kPMColor_SkColorType = kN32_SkColorType
+ #endif
+ };
+
+ static int SkColorTypeBytesPerPixel(SkColorType ct) {
+ static const uint8_t gSize[] = {
+ 0, // Unknown
+diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h
b/gfx/skia/trunk/include/gpu/GrTypes.h
+--- a/gfx/skia/trunk/include/gpu/GrTypes.h
++++ b/gfx/skia/trunk/include/gpu/GrTypes.h
+@@ -304,25 +304,23 @@ enum GrPixelConfig {
+ * Byte order is r, g, b, a. This color format is 32 bits per channel
+ */
+ kRGBA_float_GrPixelConfig,
+ kLast_GrPixelConfig = kRGBA_float_GrPixelConfig
+ };
+ static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
+
+ // Aliases for pixel configs that match skia's byte order.
+-#ifndef SK_CPU_LENDIAN
+- #error "Skia gpu currently assumes little endian"
+-#endif
+
+ #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
+ static const GrPixelConfig kSkia8888_GrPixelConfig =
kBGRA_8888_GrPixelConfig;
+ #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
+ static const GrPixelConfig kSkia8888_GrPixelConfig =
kRGBA_8888_GrPixelConfig;
+ #else
+- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
++ static const GrPixelConfig kSkia8888_GrPixelConfig =
kBGRA_8888_GrPixelConfig;
#endif
--
--}
--}
+
+ // Returns true if the pixel config is a GPU-specific compressed format
+ // representation.
+ static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) {
+ switch (config) {
+ case kETC1_GrPixelConfig:
+ case kLATC_GrPixelConfig:
++++++ mozilla-kde.patch ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent aba9432d1fd32a118ba24e92c6b6e99ddb0b9bdc
+# Parent 2b183c17f6e4693372442af1a8ee0be364f8cba0
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfg...@rosenauer.org>
Author: Lubos Lunak <lu...@suse.com>
@@ -46,7 +46,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -1172,16 +1173,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1165,16 +1166,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -81,7 +81,7 @@
return NS_OK;
bool hasMore;
-@@ -1197,17 +1216,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1190,17 +1209,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -100,7 +100,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1301,26 +1320,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1294,26 +1313,38 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all
other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -223,9 +223,9 @@
#ifdef MOZ_WIDGET_ANDROID
#include "AndroidBridge.h"
- using namespace mozilla::widget::android;
#endif
-@@ -2717,16 +2721,25 @@ nsDownload::SetState(DownloadState aStat
+
+@@ -2716,16 +2720,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -251,12 +251,12 @@
int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2757,16 +2770,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2756,16 +2769,17 @@ nsDownload::SetState(DownloadState aStat
NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
message, !removeWhenDone,
mPrivate ? NS_LITERAL_STRING("private") :
NS_LITERAL_STRING("non-private"),
mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
- EmptyString(), EmptyString(), nullptr);
+ EmptyString(), EmptyString(), nullptr, mPrivate);
}
}
}
@@ -3137,13 +3137,13 @@
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
--- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp
-@@ -1,32 +1,34 @@
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*/
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
+@@ -4,32 +4,34 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Types.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
@@ -3172,7 +3172,7 @@
nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
void
-@@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -238,17 +240,19 @@ nsFilePicker::AppendFilters(int32_t aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3193,7 +3193,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -363,16 +367,32 @@ nsFilePicker::Show(int16_t *aReturn)
NS_IMETHODIMP
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3226,7 +3226,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -551,8 +571,235 @@ nsFilePicker::Done(GtkWidget* file_choos
if (mCallback) {
mCallback->Done(result);
mCallback = nullptr;
@@ -3561,7 +3561,7 @@
mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
"RELEASE",
osVersion);
- isTablet = mozilla::widget::android::GeckoAppShell::IsTablet();
+ isTablet = mozilla::widget::GeckoAppShell::IsTablet();
}
+ desktop = NS_LITERAL_STRING("android");
#endif
++++++ mozilla-openaes-decl.patch ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -1,17 +1,18 @@
# HG changeset patch
# Parent 33024abb3c58dab7239e32388df58e14f99defd5
# User Wolfgang Rosenauer <w...@rosenauer.org>
+# Parent 12305a99d90ce098f8f11f5609571cd709b6e2de
diff --git a/media/gmp-clearkey/0.1/openaes/oaes_lib.c
b/media/gmp-clearkey/0.1/openaes/oaes_lib.c
--- a/media/gmp-clearkey/0.1/openaes/oaes_lib.c
+++ b/media/gmp-clearkey/0.1/openaes/oaes_lib.c
-@@ -27,16 +27,17 @@
+@@ -24,16 +24,17 @@
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* ---------------------------------------------------------------------------
*/
- static const char _NR[] = {
- 0x4e,0x61,0x62,0x69,0x6c,0x20,0x53,0x2e,0x20,
- 0x41,0x6c,0x20,0x52,0x61,0x6d,0x6c,0x69,0x00 };
#include <stdlib.h>
+#include <stdio.h>
++++++ mozilla-repo.patch ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -1,5 +1,6 @@
# HG changeset patch
# Parent 80b6464bd883864fce57e8748010869af1be69e9
+# Parent d160c6876c5f05d902b391551bf4f684254b3c7d
diff --git a/toolkit/mozapps/installer/package-name.mk
b/toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk
@@ -10,7 +11,7 @@
ifndef INCLUDED_RCS_MK
USE_RCS_MK := 1
- include $(topsrcdir)/config/makefiles/makeutils.mk
+ include $(MOZILLA_DIR)/config/makefiles/makeutils.mk
endif
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent
--template="{node|short}\n" 2>/dev/null))
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8268,16 +8268,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8207,16 +8207,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -84,10 +84,10 @@
#include "ExtendedValidation.h"
#include "NSSCertDBTrustDomain.h"
#include "mozilla/Telemetry.h"
+ #include "nsAppDirectoryServiceDefs.h"
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
- #include "nsComponentManagerUtils.h"
-@@ -986,17 +993,31 @@ nsNSSComponent::InitializeNSS()
+@@ -996,17 +1003,31 @@ nsNSSComponent::InitializeNSS()
if (NS_FAILED(rv)) {
nsPSMInitPanic::SetPanic();
return NS_ERROR_NOT_AVAILABLE;
++++++ mozilla-skia-be-le.patch ++++++
# HG changeset patch
# Parent c5d7373760d7abbd34f89cb60d4a45cba2c05379
Part 2 of
Bug 1136958 - gfx/layers/basic/BasicCompositor.cpp:20:56: fatal error:
skia/SkCanvas.h: No such file or directory when skia is disabled
diff --git a/gfx/skia/trunk/include/core/SkPreConfig.h
b/gfx/skia/trunk/include/core/SkPreConfig.h
--- a/gfx/skia/trunk/include/core/SkPreConfig.h
+++ b/gfx/skia/trunk/include/core/SkPreConfig.h
@@ -87,16 +87,24 @@
#if !defined(SK_WARN_UNUSED_RESULT)
#define SK_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#endif
//////////////////////////////////////////////////////////////////////
#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
+ #if defined(__BIG_ENDIAN__)
+ #define SK_CPU_BENDIAN
+ #elif defined(__LITTLE_ENDIAN__)
+ #define SK_CPU_LENDIAN
+ #endif
+#endif
+
+#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
#if defined(__sparc) || defined(__sparc__) || \
defined(_POWER) || defined(__powerpc__) || \
defined(__ppc__) || defined(__hppa) || \
defined(__PPC__) || defined(__PPC64__) || \
defined(_MIPSEB) || defined(__ARMEB__) || \
defined(__s390__) || \
(defined(__sh__) && defined(__BIG_ENDIAN__)) || \
(defined(__ia64) && defined(__BIG_ENDIAN__))
diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp
--- a/js/src/jsdtoa.cpp
+++ b/js/src/jsdtoa.cpp
@@ -47,16 +47,17 @@ using namespace js;
static inline void* dtoa_malloc(size_t size) { return js_malloc(size); }
static inline void dtoa_free(void* p) { return js_free(p); }
#define NO_GLOBAL_STATE
#define NO_ERRNO
#define MALLOC dtoa_malloc
#define FREE dtoa_free
#include "dtoa.c"
+#undef CONST
/* Mapping of JSDToStrMode -> js_dtoa mode */
static const uint8_t dtoaModes[] = {
0, /* DTOSTR_STANDARD */
0, /* DTOSTR_STANDARD_EXPONENTIAL, */
3, /* DTOSTR_FIXED, */
2, /* DTOSTR_EXPONENTIAL, */
2}; /* DTOSTR_PRECISION */
++++++ mozilla-skia-bmo1136958.patch ++++++
++++ 684 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-skia-bmo1136958.patch
++++ and
/work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-skia-bmo1136958.patch
++++++ source-stamp.txt ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -1,2 +1,2 @@
-REV=df45b1c67169
+REV=29182ac68a26
REPO=http://hg.mozilla.org/releases/mozilla-release
++++++ toolkit-download-folder.patch ++++++
--- /var/tmp/diff_new_pack.bMpPQ8/_old 2015-04-07 09:28:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bMpPQ8/_new 2015-04-07 09:28:03.000000000 +0200
@@ -6,7 +6,7 @@
diff --git a/browser/components/preferences/main.js
b/browser/components/preferences/main.js
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
-@@ -290,17 +290,17 @@ var gMainPane = {
+@@ -408,17 +408,17 @@ var gMainPane = {
// and was available as an option in the 1.5 drop down. On XP this
// was in My Documents, on OSX it was in User Docs. In 2.0, we did
// away with the drop down option, although the special label was
@@ -17,18 +17,18 @@
// folder. See nsDownloadManager for details.
- downloadFolder.label =
bundlePreferences.getString("downloadsFolderName");
+ downloadFolder.label = "Downloads";
- iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1));
+ iconUrlSpec = fph.getURLSpecFromFile(yield this._indexToFolder(1));
} else {
// 'Desktop'
downloadFolder.label = bundlePreferences.getString("desktopFolderName");
- iconUrlSpec =
fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop"));
+ iconUrlSpec = fph.getURLSpecFromFile(yield
this._getDownloadsFolder("Desktop"));
}
downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16";
-
+ }),
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp
b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi
+@@ -1361,18 +1361,20 @@ nsDownloadManager::GetDefaultDownloadsDi
// Vista:
// Downloads
// XP/2K:
