--- a/firefox-kde.patch Wed Jan 10 22:40:39 2018 +0100
+++ b/firefox-kde.patch Thu Jan 11 10:37:42 2018 +0100
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent 9f19902f8bcde21fa63172a85818fb11714878d8
+# Parent 671a03875b1bfe82edbebfde64654ea3ffc98e34
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,1252 @@
+@@ -0,0 +1,1248 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -104,12 +104,6 @@
+ accesskey="&moveToNewWindow.accesskey;"
+ tbattr="tabbrowser-multiple"
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
-+#ifdef E10S_TESTING_ONLY
-+ <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window"
-+ tbattr="tabbrowser-remote"
-+ hidden="true"
-+ oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
-+#endif
+ <menuseparator id="context_sendTabToDevice_separator"/>
+ <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
+ accesskey="&sendTabToDevice.accesskey;">
@@ -435,8 +429,7 @@
+ mainViewId="pageActionPanelMainView"
+ viewCacheId="appMenu-viewCache">
+ <panelview id="pageActionPanelMainView"
-+ context="pageActionPanelContextMenu"
-+ oncontextmenu="BrowserPageActions.onContextMenu(event);"
++ context="pageActionContextMenu"
+ class="PanelUI-subView">
+ <vbox class="panel-subview-body"/>
+ </panelview>
@@ -458,13 +451,24 @@
+ <label id="pageActionFeedbackMessage"/>
+ </panel>
+
-+ <menupopup id="pageActionPanelContextMenu"
++ <menupopup id="pageActionContextMenu"
+ onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
-+ <menuitem id="pageActionPanelContextMenu-toggleUrlbar"
-+ add-label="&pageAction.addToUrlbar.label;"
-+ remove-label="&pageAction.removeFromUrlbar.label;"
++ <menuitem class="pageActionContextMenuItem builtInUnpinned"
+ label="&pageAction.addToUrlbar.label;"
-+ oncommand="BrowserPageActions.toggleShownInUrlbarForContextAction();"/>
++ oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++ <menuitem class="pageActionContextMenuItem builtInPinned"
++ label="&pageAction.removeFromUrlbar.label;"
++ oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++ <menuitem class="pageActionContextMenuItem extensionUnpinned"
++ label="&pageAction.allowInUrlbar.label;"
++ oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++ <menuitem class="pageActionContextMenuItem extensionPinned"
++ label="&pageAction.disallowInUrlbar.label;"
++ oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++ <menuseparator class="pageActionContextMenuItem extensionPinned extensionUnpinned"/>
++ <menuitem class="pageActionContextMenuItem extensionPinned extensionUnpinned"
++ label="&pageAction.manageExtension.label;"
++ oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/>
+ </menupopup>
+
+ <!-- Bookmarks and history tooltip -->
@@ -642,7 +646,6 @@
+#endif
+
+ <tabs id="tabbrowser-tabs"
-+ class="tabbrowser-tabs"
+ tabbrowser="content"
+ flex="1"
+ setfocus="false"
@@ -787,7 +790,6 @@
+ tabscrolling="true"
+ showcommentcolumn="true"
+ showimagecolumn="true"
-+ enablehistory="true"
+ newlines="stripsurroundingwhitespace"
+ ontextentered="this.handleCommand(param);"
+ ontextreverted="return this.handleRevert();"
@@ -812,14 +814,14 @@
+ tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/>
+ <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
+ tooltiptext="&urlbar.cameraBlocked.tooltip;"/>
-+ <image data-permission-id="indexedDB" class="blocked-permission-icon indexedDB-icon" role="button"
-+ tooltiptext="&urlbar.indexedDBBlocked.tooltip;"/>
+ <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
+ tooltiptext="&urlbar.microphoneBlocked.tooltip;"/>
+ <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
+ tooltiptext="&urlbar.screenBlocked.tooltip;"/>
+ <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
+ tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
++ <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
++ tooltiptext="&urlbar.popupBlocked.tooltip;"/>
+ </box>
+ <box id="notification-popup-box"
+ hidden="true"
@@ -832,6 +834,8 @@
+ tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
+ <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
+ tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
++ <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
++ tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/>
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
+ tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/>
+ <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
@@ -873,17 +877,11 @@
+ <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
+ <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
+ </box>
-+ <hbox id="page-action-buttons">
++ <hbox id="page-action-buttons" context="pageActionContextMenu">
+ <hbox id="userContext-icons" hidden="true">
+ <label id="userContext-label"/>
+ <image id="userContext-indicator"/>
+ </hbox>
-+ <image id="page-report-button"
-+ class="urlbar-icon urlbar-page-action"
-+ role="button"
-+ hidden="true"
-+ tooltiptext="&pageReportIcon.tooltip;"
-+ onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
+ <image id="reader-mode-button"
+ class="urlbar-icon urlbar-page-action"
+ role="button"
@@ -902,8 +900,6 @@
+ <hbox id="star-button-box"
+ hidden="true"
+ class="urlbar-icon-wrapper urlbar-page-action"
-+ context="pageActionPanelContextMenu"
-+ oncontextmenu="BrowserPageActions.onContextMenu(event);"
+ onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
+ <image id="star-button"
+ class="urlbar-icon"
@@ -1261,7 +1257,7 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -58,16 +58,18 @@ browser.jar:
+@@ -52,16 +52,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css)
@@ -1343,7 +1339,7 @@
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
-@@ -203,16 +203,23 @@ var gMainPane = {
+@@ -193,16 +193,23 @@ var gMainPane = {
this._backoffIndex++ : backoffTimes.length - 1]);
};
@@ -1367,7 +1363,7 @@
performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
this.updateDefaultPerformanceSettingsPref();
-@@ -952,16 +959,27 @@ var gMainPane = {
+@@ -898,16 +905,27 @@ var gMainPane = {
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
this._backoffIndex = 0;
@@ -1711,7 +1707,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
-@@ -666,16 +666,18 @@
+@@ -657,16 +657,18 @@
@RESPATH@/browser/defaults/blocklists
@RESPATH@/browser/defaults/pinning