# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1498502490 -7200
# Node ID 53443ffb496a1c8a22d72b5766449d1c9846e97b
# Parent  593707d5c013936561dfbd80bdb7b098d84e4d4c
Firefox 54.0

diff -r 593707d5c013 -r 53443ffb496a MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Thu Jun 15 15:34:01 2017 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Jun 26 20:41:30 2017 +0200
@@ -1,13 +1,14 @@
 -------------------------------------------------------------------
-Sun Jun  4 07:57:41 UTC 2017 - wr@rosenauer.org
-
-- update to Firefox 54.0b13
+Thu Jun 15 13:56:05 UTC 2017 - wr@rosenauer.org
+
+- update to Firefox 54.0
   * Clearer and more detailed information for download items in the
     download panel
   * Added Burmese (my) locale
   * Bookmarks created on mobile devices are now shown in
     "Mobile Bookmarks” folder in the drop down list from the toolbar
     and Bookmarks option in the menu bar in Desktop Firefox
+  * added support for multiple content processes (e10s-multi)
 - requires NSPR 4.14 and NSS 3.30.2
 - requires rust 1.15.1
 - removed mozilla-shared-nss-db.patch as it seems to be a rather
diff -r 593707d5c013 -r 53443ffb496a MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Jun 15 15:34:01 2017 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Jun 26 20:41:30 2017 +0200
@@ -16,21 +16,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 # changed with every update
-%define major 53
-%define mainver %major.99
-%define update_channel beta
+%define major 54
+%define mainver %major.0
+%define update_channel release
 %define branding 1
-%define releasedate 20170602000000
+%define releasedate 20170612000000
 
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
 
-%if 0%{?suse_version} > 1320
-%ifarch %ix86 x86_64
-%define firefox_use_rust 1
-%endif
+# Firefox only supports i686
+%ifarch %ix86
+ExclusiveArch: i586 i686
+BuildArch:     i686
+%{expand:%%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic}
 %endif
 
 # general build definitions
@@ -89,11 +89,9 @@
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.4.0
 BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
-%if 0%{?firefox_use_rust}
 BuildRequires:  cargo
 BuildRequires:  rust >= 1.15.1
 BuildRequires:  rust-std
-%endif
 # libavcodec is required for H.264 support but the
 # openSUSE version is currently not able to play H.264
 # therefore the Packman version is required
@@ -317,10 +315,6 @@
 ac_add_options --libdir=%{_libdir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
-%if 0%{?firefox_use_rust}
-%else
-ac_add_options --disable-rust
-%endif
 ac_add_options --enable-default-toolkit=cairo-gtk3
 %if 0%{?build_hardened}
 ac_add_options --enable-pie
diff -r 593707d5c013 -r 53443ffb496a MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Thu Jun 15 15:34:01 2017 +0200
+++ b/MozillaFirefox/create-tar.sh	Mon Jun 26 20:41:30 2017 +0200
@@ -5,10 +5,10 @@
 # "moz_source_stamp": "c1de04f39fa956cfce83f6065b0e709369215ed5"
 # http://ftp.mozilla.org/pub/firefox/candidates/48.0-candidates/build2/l10n_changesets.txt
 
-CHANNEL="beta"
+CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_54_0b13_RELEASE"
-VERSION="53.99"
+RELEASE_TAG="FIREFOX_54_0_RELEASE"
+VERSION="54.0"
 
 # mozilla
 if [ -d mozilla ]; then
diff -r 593707d5c013 -r 53443ffb496a firefox-kde.patch
--- a/firefox-kde.patch	Thu Jun 15 15:34:01 2017 +0200
+++ b/firefox-kde.patch	Mon Jun 26 20:41:30 2017 +0200
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  f17aea11a99a3ea5fee78bc53bdecb8d851660f0
+# Parent  2d666d6d44b2c1f6bc3e033c7e0ac94652af9fee
 
 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,1136 @@
+@@ -0,0 +1,1149 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -21,7 +21,6 @@
 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-+<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?>
 +
 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
@@ -61,7 +60,6 @@
 +#endif
 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
 +        lightweightthemes="true"
-+        lightweightthemesfooter="browser-bottombox"
 +        windowtype="navigator:browser"
 +        macanimationtype="document"
 +        screenX="4" screenY="4"
@@ -155,7 +153,8 @@
 +           noautofocus="true"
 +           hidden="true"
 +           overflowpadding="4"
-+           norolluponanchor="true" />
++           norolluponanchor="true"
++           nomaxresults="true" />
 +
 +    <!-- for search with one-off buttons -->
 +    <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
@@ -175,7 +174,8 @@
 +           orient="vertical"
 +           noautofocus="true"
 +           consumeoutsideclicks="false"
-+           level="parent">
++           level="parent"
++           tabspecific="true">
 +      <iframe id="dateTimePopupFrame"/>
 +    </panel>
 +
@@ -711,6 +711,7 @@
 +                       consumeanchor="identity-box"
 +                       onclick="PageProxyClickHandler(event);"/>
 +                <image id="sharing-icon" mousethrough="always"/>
++                <image id="tracking-protection-icon"/>
 +                <box id="blocked-permissions-container" align="center">
 +                  <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
 +                         tooltiptext="&urlbar.geolocationBlocked.tooltip;"/>
@@ -759,7 +760,6 @@
 +                  <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
 +                         tooltiptext="&urlbar.emeNotificationAnchor.tooltip;"/>
 +                </box>
-+                <image id="tracking-protection-icon"/>
 +                <image id="connection-icon"/>
 +                <hbox id="identity-icon-labels">
 +                  <label id="identity-icon-label" class="plain" flex="1"/>
@@ -888,6 +888,19 @@
 +                                           new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
 +                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
 +            </menu>
++            <menu id="BMB_mobileBookmarks"
++                  class="menu-iconic bookmark-item subviewbutton"
++                  label="&bookmarksMenuButton.mobile.label;"
++                  hidden="true"
++                  container="true">
++              <menupopup id="BMB_mobileBookmarksPopup"
++                         placespopup="true"
++                         context="placesContext"
++                         onpopupshowing="if (!this.parentNode._placesView)
++                                           new PlacesMenu(event, 'place:folder=MOBILE_BOOKMARKS',
++                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
++            </menu>
++
 +            <menuseparator/>
 +            <!-- Bookmarks menu items will go here -->
 +            <menuitem id="BMB_bookmarksShowAll"
diff -r 593707d5c013 -r 53443ffb496a mozilla-kde.patch
--- a/mozilla-kde.patch	Thu Jun 15 15:34:01 2017 +0200
+++ b/mozilla-kde.patch	Mon Jun 26 20:41:30 2017 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  1fccdb56cf307cef5ddd39ece2ac58c93fe706b8
+# Parent  a15b45ae85ab486503a1a09252734b80fe782998
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -1624,9 +1624,9 @@
 +                  aPaneElement.style.opacity = 0.0;
 +                  this.animate(oldPane, aPaneElement);
 +                } else if (!this._shouldAnimate && prefpanes.length > 1) {
-+                  var targetHeight = parseInt(window.getComputedStyle(this._paneDeckContainer, "").height);
-+                  var verticalPadding = parseInt(window.getComputedStyle(aPaneElement, "").paddingTop);
-+                  verticalPadding += parseInt(window.getComputedStyle(aPaneElement, "").paddingBottom);
++                  var targetHeight = parseInt(window.getComputedStyle(this._paneDeckContainer).height);
++                  var verticalPadding = parseInt(window.getComputedStyle(aPaneElement).paddingTop);
++                  verticalPadding += parseInt(window.getComputedStyle(aPaneElement).paddingBottom);
 +                  if (aPaneElement.contentHeight > targetHeight - verticalPadding) {
 +                    // To workaround the bottom border of a groupbox from being
 +                    // cutoff an hbox with a class of bottomBox may enclose it.
@@ -1635,7 +1635,7 @@
 +                    var bottomPadding = 0;
 +                    var bottomBox = aPaneElement.getElementsByAttribute("class", "bottomBox")[0];
 +                    if (bottomBox)
-+                      bottomPadding = parseInt(window.getComputedStyle(bottomBox, "").paddingBottom);
++                      bottomPadding = parseInt(window.getComputedStyle(bottomBox).paddingBottom);
 +                    window.innerHeight += bottomPadding + verticalPadding + aPaneElement.contentHeight - targetHeight;
 +                  }
 +
@@ -1719,7 +1719,7 @@
 +            }
 +          } else if (aTimer == this._fadeTimer) {
 +            var elt = document.getElementById(this.lastSelected);
-+            var newOpacity = parseFloat(window.getComputedStyle(elt, "").opacity) + this._fadeIncrement;
++            var newOpacity = parseFloat(window.getComputedStyle(elt).opacity) + this._fadeIncrement;
 +            if (newOpacity < 1.0)
 +              elt.style.opacity = newOpacity;
 +            else {
@@ -2087,9 +2087,9 @@
 +
 +      <property name="contentHeight">
 +        <getter>
-+          var targetHeight = parseInt(window.getComputedStyle(this._content, "").height);
-+          targetHeight += parseInt(window.getComputedStyle(this._content, "").marginTop);
-+          targetHeight += parseInt(window.getComputedStyle(this._content, "").marginBottom);
++          var targetHeight = parseInt(window.getComputedStyle(this._content).height);
++          targetHeight += parseInt(window.getComputedStyle(this._content).marginTop);
++          targetHeight += parseInt(window.getComputedStyle(this._content).marginBottom);
 +          return targetHeight;
 +        </getter>
 +      </property>