From c24d6768a7232ba1eb62cd9151ebb12ca1839595 Mon Sep 17 00:00:00 2001
From: Tigro <ashejn@gmail.com>
Date: Wed, 3 Aug 2016 13:32:15 +0300
Subject: [PATCH] update to 48.0

---
 .abf.yml                                     |  2 +-
 firefox-47-kde.patch => firefox-48-kde.patch | 68 ++++++++++++--------
 firefox.spec                                 |  6 +-
 mozilla-47-kde.patch => mozilla-48-kde.patch | 22 +++----
 4 files changed, 56 insertions(+), 42 deletions(-)
 rename firefox-47-kde.patch => firefox-48-kde.patch (97%)
 rename mozilla-47-kde.patch => mozilla-48-kde.patch (99%)

diff --git a/.abf.yml b/.abf.yml
index 011ec44..2baee51 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  firefox-47.0.source.tar.xz: 439dac5e9815ba5df6d509ebef8e29aa105b9708
+  firefox-48.0.source.tar.xz: 2b73cfc996861fe895ad7564d485bf9e35190767
diff --git a/firefox-47-kde.patch b/firefox-48-kde.patch
similarity index 97%
rename from firefox-47-kde.patch
rename to firefox-48-kde.patch
index 4a22002..a8ee84a 100644
--- a/firefox-47-kde.patch
+++ b/firefox-48-kde.patch
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  4311c6bdf61ac317bc60b25cd89ff67662a75049
+# Parent  07e419c2bbc63c486d25fd8ce117abd10e9ebdba
 
 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,1160 @@
+@@ -0,0 +1,1174 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -148,7 +148,12 @@ new file mode 100644
 +    <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
 +
 +    <!-- for url bar autocomplete -->
-+    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true">
++    <panel type="autocomplete-richlistbox"
++           id="PopupAutoCompleteRichResult"
++           noautofocus="true"
++           hidden="true"
++           flip="none"
++           level="parent">
 +#ifdef NIGHTLY_BUILD
 +      <hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end">
 +        <button id="urlbar-search-settings" label="&changeSearchSettings.button;"
@@ -177,7 +182,6 @@ new file mode 100644
 +
 +    <panel id="editBookmarkPanel"
 +           type="arrow"
-+           footertype="promobox"
 +           orient="vertical"
 +           ignorekeys="true"
 +           hidden="true"
@@ -228,16 +232,14 @@ new file mode 100644
 +           orient="vertical"
 +           role="alert">
 +     <vbox>
-+      <hbox pack="end">
-+        <toolbarbutton id="UITourTooltipClose" class="close-icon"
-+                       tooltiptext="&uiTour.infoPanel.close;"/>
-+      </hbox>
 +      <hbox id="UITourTooltipBody">
-+        <vbox id="UITourTooltipIconContainer">
-+          <image id="UITourTooltipIcon"/>
-+        </vbox>
++        <image id="UITourTooltipIcon"/>
 +        <vbox flex="1">
-+          <label id="UITourTooltipTitle" flex="1"/>
++          <hbox id="UITourTooltipTitleContainer">
++            <label id="UITourTooltipTitle" flex="1"/>
++            <toolbarbutton id="UITourTooltipClose" class="close-icon"
++                           tooltiptext="&uiTour.infoPanel.close;"/>
++          </hbox>
 +          <description id="UITourTooltipDescription" flex="1"/>
 +        </vbox>
 +      </hbox>
@@ -469,12 +471,25 @@ new file mode 100644
 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
 +
 +    <menupopup id="SyncedTabsSidebarContext">
-+      <menuitem label="&syncedTabs.context.openTab.label;"
-+                accesskey="&syncedTabs.context.openTab.accesskey;"
-+                id="syncedTabsOpenSelected"/>
++      <menuitem label="&syncedTabs.context.open.label;"
++                accesskey="&syncedTabs.context.open.accesskey;"
++                id="syncedTabsOpenSelected" where="current"/>
++      <menuitem label="&syncedTabs.context.openInNewTab.label;"
++                accesskey="&syncedTabs.context.openInNewTab.accesskey;"
++                id="syncedTabsOpenSelectedInTab" where="tab"/>
++      <menuitem label="&syncedTabs.context.openInNewWindow.label;"
++                accesskey="&syncedTabs.context.openInNewWindow.accesskey;"
++                id="syncedTabsOpenSelectedInWindow" where="window"/>
++      <menuitem label="&syncedTabs.context.openInNewPrivateWindow.label;"
++                accesskey="&syncedTabs.context.openInNewPrivateWindow.accesskey;"
++                id="syncedTabsOpenSelectedInPrivateWindow" where="window" private="true"/>
++      <menuseparator/>
 +      <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;"
 +                accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;"
 +                id="syncedTabsBookmarkSelected"/>
++      <menuitem label="&syncedTabs.context.copy.label;"
++                accesskey="&syncedTabs.context.copy.accesskey;"
++                id="syncedTabsCopySelected"/>
 +      <menuseparator/>
 +      <menuitem label="&syncSyncNowItem.label;"
 +                accesskey="&syncSyncNowItem.accesskey;"
@@ -684,7 +699,7 @@ new file mode 100644
 +            <textbox id="urlbar" flex="1"
 +                     placeholder="&urlbar.placeholder2;"
 +                     type="autocomplete"
-+                     autocompletesearch="urlinline history"
++                     autocompletesearch="unifiedcomplete"
 +                     autocompletesearchparam="enable-actions"
 +                     autocompletepopup="PopupAutoCompleteRichResult"
 +                     completeselectedindex="true"
@@ -693,7 +708,7 @@ new file mode 100644
 +                     showcommentcolumn="true"
 +                     showimagecolumn="true"
 +                     enablehistory="true"
-+                     maxrows="6"
++                     maxrows="10"
 +                     newlines="stripsurroundingwhitespace"
 +                     ontextentered="this.handleCommand(param);"
 +                     ontextreverted="return this.handleRevert();"
@@ -713,8 +728,6 @@ new file mode 100644
 +                       aria-label="&urlbar.loginFillNotificationAnchor.label;"/>
 +                <image id="password-notification-icon" class="notification-anchor-icon" role="button"
 +                       aria-label="&urlbar.passwordNotificationAnchor.label;"/>
-+                <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"
-+                       aria-label="&urlbar.webappsNotificationAnchor.label;"/>
 +                <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"
 +                       aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
 +                <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"
@@ -865,7 +878,7 @@ new file mode 100644
 +            </menu>
 +            <menu id="BMB_unsortedBookmarks"
 +                  class="menu-iconic bookmark-item subviewbutton"
-+                  label="&bookmarksMenuButton.unsorted.label;"
++                  label="&bookmarksMenuButton.other.label;"
 +                  container="true">
 +              <menupopup id="BMB_unsortedBookmarksPopup"
 +                         placespopup="true"
@@ -887,7 +900,8 @@ new file mode 100644
 +        <!-- This is a placeholder for the Downloads Indicator.  It is visible
 +             during the customization of the toolbar, in the palette, and before
 +             the Downloads Indicator overlay is loaded. -->
-+        <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++        <toolbarbutton id="downloads-button"
++                       class="toolbarbutton-1 chromeclass-toolbar-additional badged-button"
 +                       key="key_openDownloads"
 +                       oncommand="DownloadsIndicatorView.onCommand(event);"
 +                       ondrop="DownloadsIndicatorView.onDrop(event);"
@@ -1169,7 +1183,7 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -71,16 +71,18 @@ browser.jar:
+@@ -69,16 +69,18 @@ browser.jar:
          content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
          content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
          content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
@@ -1185,9 +1199,9 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
          content/browser/browser-customization.js      (content/browser-customization.js)
          content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
          content/browser/browser-devedition.js         (content/browser-devedition.js)
-         content/browser/browser-eme.js                (content/browser-eme.js)
          content/browser/browser-feeds.js              (content/browser-feeds.js)
          content/browser/browser-fullScreen.js         (content/browser-fullScreen.js)
+         content/browser/browser-fullZoom.js           (content/browser-fullZoom.js)
 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
@@ -1311,11 +1325,11 @@ diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.b
      SOURCES += [
          'nsMacShellService.cpp',
      ]
- elif CONFIG['MOZ_WIDGET_GTK']:
+ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
      SOURCES += [
          'nsGNOMEShellService.cpp',
-+	'nsKDEShellService.cpp',
-+	'nsUnixShellService.cpp',
++        'nsKDEShellService.cpp',
++        'nsUnixShellService.cpp',
      ]
  
  if SOURCES:
@@ -1617,7 +1631,7 @@ new file mode 100644
 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
-@@ -697,16 +697,17 @@
+@@ -689,16 +689,17 @@
  @RESPATH@/greprefs.js
  @RESPATH@/defaults/autoconfig/prefcalls.js
  @RESPATH@/browser/defaults/permissions
diff --git a/firefox.spec b/firefox.spec
index f185256..7504704 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -7,7 +7,7 @@
 # This also means only STABLE upstream releases, NO betas.
 # This is a discussed topic. Please, do not flame it again.
 
-%define major 47.0
+%define major 48.0
 %define ff_epoch 0
 # (tpg) set version HERE !!!
 %define realver %{major}
@@ -45,8 +45,8 @@ Source4:	%{name}.desktop
 Source9:	kde.js
 Source1000:	README.urpmi
 # Patches for kde integration of FF 
-Patch11:	firefox-47-kde.patch
-Patch12:	mozilla-47-kde.patch
+Patch11:	firefox-48-kde.patch
+Patch12:	mozilla-48-kde.patch
 #Patch13:	mozilla-kde-background.patch
 Patch34:	xulrunner_nojit.patch
 Patch35:	firefox-37-build-with-time-independent-uuids.patch
diff --git a/mozilla-47-kde.patch b/mozilla-48-kde.patch
similarity index 99%
rename from mozilla-47-kde.patch
rename to mozilla-48-kde.patch
index a42b3d0..33be2e8 100644
--- a/mozilla-47-kde.patch
+++ b/mozilla-48-kde.patch
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  f2726ebfae7cdded8e7ca6030829b0a3fae4e438
+# Parent  972c67cdd5dd4463abbee60036b686d4cb78e616
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1138,16 +1139,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1145,16 +1146,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -62,7 +62,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
      return NS_OK;
  
    bool hasMore;
-@@ -1163,17 +1182,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1170,17 +1189,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1267,24 +1286,36 @@ static nsresult pref_InitInitialObjects(
+@@ -1274,24 +1293,36 @@ 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)
@@ -187,7 +187,7 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
-@@ -64,15 +64,16 @@ if not CONFIG['MOZ_SUITE']:
+@@ -60,15 +60,16 @@ if not CONFIG['MOZ_SUITE']:
          'nsDownloadManagerUI.js',
          'nsDownloadManagerUI.manifest',
      ]
@@ -337,7 +337,7 @@ new file mode 100644
 +
 +      <xul:hbox class="dialog-button-box" anonid="buttons"
 +                xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"
-+#ifdef XP_UNIX
++#ifdef XP_UNIX_GNOME
 +                >
 +        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
@@ -2296,7 +2296,7 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
          'nsNativeAppSupportQt.cpp',
          'nsQAppInstance.cpp',
      ]
- elif CONFIG['MOZ_ENABLE_GTK']:
+ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 +    EXPORTS += ['nsKDEUtils.h']
      UNIFIED_SOURCES += [
 +        'nsKDEUtils.cpp',
@@ -2715,11 +2715,11 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
          osdir + '/nsOSHelperAppService.cpp',
      ]
  
- if CONFIG['MOZ_ENABLE_GTK']:
+ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
      UNIFIED_SOURCES += [
 +        'unix/nsCommonRegistry.cpp',
          'unix/nsGNOMERegistry.cpp',
-+	'unix/nsKDERegistry.cpp',
++        'unix/nsKDERegistry.cpp',
          'unix/nsMIMEInfoUnix.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
@@ -3164,7 +3164,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -86,16 +86,17 @@ else:
+@@ -90,16 +90,17 @@ else:
  include('/ipc/chromium/chromium-config.mozbuild')
  
  FINAL_LIBRARY = 'xul'
@@ -3684,7 +3684,7 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 +    '/toolkit/xre'
  ]
  
- if CONFIG['MOZ_WIDGET_GTK']:
+ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
      CXXFLAGS += CONFIG['TK_CFLAGS']
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp