Prepare 39beta cycle
authorWolfgang Rosenauer <wr@rosenauer.org>
Mon, 08 Jun 2015 13:58:06 +0200
changeset 856 c2e88e5c7aab
parent 850 a2bdff616a0e (current diff)
parent 855 1f860c829900 (diff)
child 857 ab297940ae8a
Prepare 39beta cycle merge latest changes from firefox38 branch
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/MozillaFirefox.changes	Sun May 10 09:05:36 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Jun 08 13:58:06 2015 +0200
@@ -1,8 +1,75 @@
 -------------------------------------------------------------------
-Thu Apr 23 06:41:34 UTC 2015 - wr@rosenauer.org
-
-- update to Firefox 38.0b6
+Sun Jun  7 07:09:12 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.0.6
+  * fixes bmo#1171730 which is not really relevant to oS builds
+- fix KDE regression from 38.0.5 builds (bsc#933439)
+
+-------------------------------------------------------------------
+Sat May 23 21:13:49 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.0.5
+  * Keep track of articles and videos with Pocket
+  * Clean formatting for articles and blog posts with Reader View
+  * Share the active tab or window in a Hello conversation
+- add changes file as source for SRPM (bsc#932142)
+
+-------------------------------------------------------------------
+Fri May 15 10:40:19 UTC 2015 - normand@linux.vnet.ibm.com
+
+- add mozilla-add-glibcxx_use_cxx11_abi.patch grabbed from
+  https://bugzilla.mozilla.org/show_bug.cgi?id=1153109
+
+-------------------------------------------------------------------
+Fri May 15 07:37:46 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.0.1
+  stability and regression fixes
+  * Systems with first generation NVidia Optimus graphics cards
+    may crash on start-up
+  * Users who import cookies from Google Chrome can end up with
+    broken websites
+  * Large animated images may fail to play and may stop other
+    images from loading
+
+-------------------------------------------------------------------
+Sun May 10 07:07:49 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.0 (bnc#930622)
+  * New tab-based preferences
+  * Ruby annotation support
+  * more info: https://www.mozilla.org/en-US/firefox/38.0/releasenotes/
+  security fixes:
+  * MFSA 2015-46/CVE-2015-2708/CVE-2015-2709
+    Miscellaneous memory safety hazards
+  * MFSA 2015-47/VE-2015-0797 (bmo#1080995)
+    Buffer overflow parsing H.264 video with Linux Gstreamer
+  * MFSA 2015-48/CVE-2015-2710 (bmo#1149542)
+    Buffer overflow with SVG content and CSS
+  * MFSA 2015-49/CVE-2015-2711 (bmo#1113431)
+    Referrer policy ignored when links opened by middle-click and
+    context menu
+  * MFSA 2015-50/CVE-2015-2712 (bmo#1152280)
+    Out-of-bounds read and write in asm.js validation
+  * MFSA 2015-51/CVE-2015-2713 (bmo#1153478)
+    Use-after-free during text processing with vertical text enabled
+  * MFSA 2015-53/CVE-2015-2715 (bmo#988698)
+    Use-after-free due to Media Decoder Thread creation during shutdown
+  * MFSA 2015-54/CVE-2015-2716 (bmo#1140537)
+    Buffer overflow when parsing compressed XML
+  * MFSA 2015-55/CVE-2015-2717 (bmo#1154683)
+    Buffer overflow and out-of-bounds read while parsing MP4 video
+    metadata
+  * MFSA 2015-56/CVE-2015-2718 (bmo#1146724)
+    Untrusted site hosting trusted page can intercept webchannel
+    responses
+  * MFSA 2015-57/CVE-2011-3079 (bmo#1087565)
+    Privilege escalation through IPC channel messages
 - requires NSS 3.18.1
+- removed obsolete patches:
+  * mozilla-skia-bmo1136958.patch
+- remove gnomevfs build options as it is removed from sources
+- rebased patches
 
 -------------------------------------------------------------------
 Fri Apr 17 16:39:20 UTC 2015 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec	Sun May 10 09:05:36 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Jun 08 13:58:06 2015 +0200
@@ -18,10 +18,10 @@
 
 
 # changed with every update
-%define major 37
+%define major 38
 %define mainver %major.99
 %define update_channel beta
-%define releasedate 2015042200
+%define releasedate 2015060700
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
@@ -131,6 +131,7 @@
 Source13:       spellcheck.js
 Source14:       create-tar.sh
 Source15:       firefox-appdata.xml
+Source16:       MozillaFirefox.changes
 # Gecko/Toolkit
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-nongnome-proxies.patch
@@ -146,6 +147,7 @@
 Patch12:        mozilla-openaes-decl.patch
 Patch14:        mozilla-skia-be-le.patch
 Patch15:        mozilla-bmo1005535.patch
+Patch16:        mozilla-add-glibcxx_use_cxx11_abi.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-no-default-ualocale.patch
@@ -260,6 +262,7 @@
 %patch12 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
--- a/MozillaFirefox/create-tar.sh	Sun May 10 09:05:36 2015 +0200
+++ b/MozillaFirefox/create-tar.sh	Mon Jun 08 13:58:06 2015 +0200
@@ -2,8 +2,8 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_38_0b6_RELEASE"
-VERSION="37.99"
+RELEASE_TAG="FIREFOX_39_0b3_RELEASE"
+VERSION="38.99"
 
 # mozilla
 if [ -d mozilla ]; then
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-add-glibcxx_use_cxx11_abi.patch	Mon Jun 08 13:58:06 2015 +0200
@@ -0,0 +1,1 @@
+../mozilla-add-glibcxx_use_cxx11_abi.patch
\ No newline at end of file
--- a/firefox-kde.patch	Sun May 10 09:05:36 2015 +0200
+++ b/firefox-kde.patch	Mon Jun 08 13:58:06 2015 +0200
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  a21f91aa3ed60b4e95b47f45715dfda379dab7c8
+# Parent  14be97741eabce611c291418a4c1774cae8b29ff
 
 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,1302 @@
+@@ -0,0 +1,1311 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -738,9 +738,9 @@
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
 +#ifdef MOZ_DEV_EDITION
-+             defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button"
++             defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button"
 +#else
-+             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button"
++             defaultset="urlbar-container,search-container,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button"
 +#endif
 +             customizationtarget="nav-bar-customization-target"
 +             overflowable="true"
@@ -890,6 +890,7 @@
 +                     oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
 +                     onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
 +                     onpopupshowing="BookmarkingUI.onPopupShowing(event);
++                                     BookmarkingUI.updatePocketItemVisibility('BMB_');
 +                                     BookmarkingUI.attachPlacesView(event, this);"
 +                     tooltip="bhTooltip" popupsinherittooltip="true">
 +            <menuitem id="BMB_viewBookmarksSidebar"
@@ -906,6 +907,11 @@
 +                      command="Browser:ShowAllBookmarks"
 +                      key="manBookmarkKb"/>
 +            <menuseparator/>
++            <menuitem id="BMB_pocket"
++                      class="menuitem-iconic bookmark-item subviewbutton"
++                      label="&pocketMenuitem.label;"
++                      oncommand="openUILink(Pocket.listURL, event);"/>
++            <menuseparator id="BMB_pocketSeparator"/>
 +            <menuitem id="BMB_subscribeToPageMenuitem"
 +#ifndef XP_MACOSX
 +                      class="menuitem-iconic subviewbutton"
@@ -1307,6 +1313,9 @@
 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
 +</deck>
 +
++<script type="application/javascript" src="chrome://browser/content/pocket/pktApi.js"/>
++<script type="application/javascript" src="chrome://browser/content/pocket/main.js"/>
++
 +</window>
 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
 --- a/browser/base/content/browser.xul
@@ -1330,7 +1339,7 @@
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1228,17 +1228,17 @@
+@@ -1234,17 +1234,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1363,14 +1372,14 @@
  *       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-pocket-en-US.properties (content/browser-pocket-en-US.properties)
+         content/browser/browser-pocket.dtd            (content/browser-pocket.dtd)
+         content/browser/browser-pocket-de.properties  (content/browser-pocket-de.properties)
+         content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties)
+         content/browser/browser-pocket-ja.properties  (content/browser-pocket-ja.properties)
+         content/browser/browser-pocket-ru.properties  (content/browser-pocket-ru.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/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)
-         content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
-         content/browser/defaultthemes/2.footer.jpg    (content/defaultthemes/2.footer.jpg)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-add-glibcxx_use_cxx11_abi.patch	Mon Jun 08 13:58:06 2015 +0200
@@ -0,0 +1,35 @@
+From 32b9943e0d2c7c28d9d113c0e83d121c356fe5d5 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozilla@glandium.org>
+Date: Fri, 10 Apr 2015 16:53:05 +0900
+Subject: [PATCH] Bug 1153109 - Add -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS when
+ building with --enable-stdcxx-compat
+
+patch grab from https://bugzilla.mozilla.org/show_bug.cgi?id=1153109
+
+---
+ configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 95d2a70..6c858b3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7375,16 +7375,18 @@ STDCXX_COMPAT=
+ MOZ_ARG_ENABLE_BOOL(stdcxx-compat,
+ [  --enable-stdcxx-compat  Enable compatibility with older libstdc++],
+     STDCXX_COMPAT=1)
+ 
+ if test -n "$STDCXX_COMPAT"; then
+    eval $(CXX="$CXX" HOST_CXX="$HOST_CXX" $PYTHON -m mozbuild.configure.libstdcxx)
+    AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION)
+    AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION)
++   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
++   HOST_CXXFLAGS="$HOST_CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
+ fi
+ 
+ dnl ========================================================
+ dnl =
+ dnl = Profiling and Instrumenting
+ dnl =
+ dnl ========================================================
+ MOZ_ARG_HEADER(Profiling and Instrumenting)
--- a/series	Sun May 10 09:05:36 2015 +0200
+++ b/series	Mon Jun 08 13:58:06 2015 +0200
@@ -15,6 +15,7 @@
 mozilla-openaes-decl.patch
 mozilla-skia-be-le.patch
 mozilla-bmo1005535.patch
+mozilla-add-glibcxx_use_cxx11_abi.patch
 
 # Firefox patches
 firefox-kde.patch