From f7f1f93043e2db8daafbbd69577482ad85b651b8 Mon Sep 17 00:00:00 2001
From:  <alexander@mezon.ru>
Date: Sat, 6 Jul 2019 18:12:26 +0000
Subject: [PATCH 1/2] MassBuild#1715: Increase release tag

---
 firefox.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firefox.spec b/firefox.spec
index 1f0ba95..5c79197 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -37,7 +37,7 @@ Summary:	Next generation web browser
 Name:		firefox
 Version:	%{major}
 Epoch:		%{ff_epoch}
-Release:	2
+Release:	3
 License:	MPLv1+
 Group:		Networking/WWW
 Url:		http://www.mozilla.com/firefox/

From e57c70f902c622e930852d8f010cecf3b59ea0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= <a.zimin@rosalinux.ru>
Date: Wed, 10 Jul 2019 22:01:00 +0300
Subject: [PATCH 2/2] Updated to 68.0

---
 .abf.yml                                      |   2 +-
 ...37-build-with-time-independent-uuids.patch |  12 -
 firefox-kde.patch                             | 290 +++++++-----------
 firefox.spec                                  |   8 +-
 mozilla-kde.patch                             | 147 +++++----
 5 files changed, 193 insertions(+), 266 deletions(-)
 delete mode 100644 firefox-37-build-with-time-independent-uuids.patch

diff --git a/.abf.yml b/.abf.yml
index 4671cbb..19b73aa 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
   cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935
-  firefox-67.0.4.source.tar.xz: a6a28648bfad6aa9c2bbf1e9b4999909196dd741
+  firefox-68.0.source.tar.xz: 8512af474bc5fbcec00d7298562fa3cd890ecd93
   firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f
diff --git a/firefox-37-build-with-time-independent-uuids.patch b/firefox-37-build-with-time-independent-uuids.patch
deleted file mode 100644
index 46a2bf0..0000000
--- a/firefox-37-build-with-time-independent-uuids.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mozilla-release/python/mach/mach/main.py mozilla-release.new/python/mach/mach/main.py
---- mozilla-release/python/mach/mach/main.py	2015-04-03 05:30:08.000000000 +0300
-+++ mozilla-release.new/python/mach/mach/main.py	2015-04-20 13:03:05.743443939 +0300
-@@ -261,7 +261,7 @@
-                 mod = imp.new_module(b'mach.commands')
-                 sys.modules[b'mach.commands'] = mod
- 
--            module_name = 'mach.commands.%s' % uuid.uuid1().get_hex()
-+            module_name = 'mach.commands.%s' % uuid.uuid4().get_hex()
- 
-         try:
-             imp.load_source(module_name, path)
diff --git a/firefox-kde.patch b/firefox-kde.patch
index 3e3a1f0..c85652e 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,11 +1,20 @@
 # HG changeset patch
-# Parent  18632e53d0b0c4c03f254ca2dbbeac8f48ec6f5c
+# User msirringhaus@suse.de
+# Date 1559300151 -7200
+#      Fri May 31 12:55:51 2019 +0200
+# Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec
+# Parent  428161c3b9599083e1b8710eda1760f1f707ab11
+How to apply this patch:
+1. Import and apply it
+2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
+3. Find editBookmarkPanelDoneButton
+4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
+5. hg qrefresh
 
-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,1404 @@
+diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/base/content/browser-kde.xul	Fri May 31 12:55:51 2019 +0200
+@@ -0,0 +1,1375 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -37,7 +46,6 @@ new file mode 100644
 +<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>
-+<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
 +
 +# All DTD information is stored in a separate file so that it can be shared by
 +# hiddenWindow.xul.
@@ -89,10 +97,9 @@ new file mode 100644
 +# that they can be shared with macWindow.inc.xul.
 +#include global-scripts.inc
 +
-+<script type="application/javascript">
++<script>
 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-captivePortal.js", this);
-+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-compacttheme.js", this);
 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-contentblocking.js", this);
 +#ifdef MOZ_DATA_REPORTING
 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);
@@ -133,69 +140,52 @@ new file mode 100644
 +    <menupopup id="tabContextMenu"
 +               onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
 +               onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
-+      <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
++      <menuitem id="context_reloadTab" data-lazy-l10n-id="reload-tab"
 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_reloadSelectedTabs" label="&reloadTabs.label;" hidden="true"
-+                accesskey="&reloadTabs.accesskey;"
++      <menuitem id="context_reloadSelectedTabs" data-lazy-l10n-id="reload-tabs" hidden="true"
 +                oncommand="gBrowser.reloadMultiSelectedTabs();"/>
 +      <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
 +      <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
 +                oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_pinTab" label="&pinTab.label;"
-+                accesskey="&pinTab.accesskey;"
++      <menuitem id="context_pinTab" data-lazy-l10n-id="pin-tab"
 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
-+                accesskey="&unpinTab.accesskey;"
++      <menuitem id="context_unpinTab" data-lazy-l10n-id="unpin-tab" hidden="true"
 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_pinSelectedTabs" label="&pinSelectedTabs.label;" hidden="true"
-+                accesskey="&pinSelectedTabs.accesskey;"
++      <menuitem id="context_pinSelectedTabs" data-lazy-l10n-id="pin-selected-tabs" hidden="true"
 +                oncommand="gBrowser.pinMultiSelectedTabs();"/>
-+      <menuitem id="context_unpinSelectedTabs" label="&unpinSelectedTabs.label;" hidden="true"
-+                accesskey="&unpinSelectedTabs.accesskey;"
++      <menuitem id="context_unpinSelectedTabs" data-lazy-l10n-id="unpin-selected-tabs" hidden="true"
 +                oncommand="gBrowser.unpinMultiSelectedTabs();"/>
-+      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
-+                accesskey="&duplicateTab.accesskey;"
++      <menuitem id="context_duplicateTab" data-lazy-l10n-id="duplicate-tab"
 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
-+      <menuitem id="context_duplicateTabs" label="&duplicateTabs.label;"
-+                accesskey="&duplicateTabs.accesskey;"
++      <menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs"
 +                oncommand="TabContextMenu.duplicateSelectedTabs();"/>
 +      <menuseparator/>
-+      <menuitem id="context_selectAllTabs" label="&selectAllTabs.label;" accesskey="&selectAllTabs.accesskey;"
++      <menuitem id="context_selectAllTabs" data-lazy-l10n-id="select-all-tabs"
 +                oncommand="gBrowser.selectAllTabs();"/>
 +      <menuitem id="context_bookmarkSelectedTabs"
 +                hidden="true"
-+                label="&bookmarkSelectedTabs.label;"
-+                accesskey="&bookmarkSelectedTabs.accesskey;"
++                data-lazy-l10n-id="bookmark-selected-tabs"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"/>
 +      <menuitem id="context_bookmarkTab"
-+                label="&bookmarkTab.label;"
-+                accesskey="&bookmarkTab.accesskey;"
++                data-lazy-l10n-id="bookmark-tab"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.getUniquePages([TabContextMenu.contextTab]));"/>
 +      <menu id="context_reopenInContainer"
-+            label="&reopenInContainer.label;"
-+            accesskey="&reopenInContainer.accesskey;"
++            data-lazy-l10n-id="reopen-in-container"
 +            hidden="true">
 +        <menupopup oncommand="TabContextMenu.reopenInContainer(event);"
 +                   onpopupshowing="TabContextMenu.createReopenInContainerMenu(event);"/>
 +      </menu>
-+      <menu id="context_moveTabOptions"
-+            multiselectcontextlabel="&moveSelectedTabOptions.label;"
-+            multiselectcontextaccesskey="&moveSelectedTabOptions.accesskey;"
-+            nonmultiselectcontextlabel="&moveTabOptions.label;"
-+            nonmultiselectcontextaccesskey="&moveTabOptions.accesskey;">
++      <menu id="context_moveTabOptions">
 +        <menupopup id="moveTabOptionsMenu">
 +          <menuitem id="context_moveToStart"
-+                    label="&moveToStart.label;"
-+                    accesskey="&moveToStart.accesskey;"
++                    data-lazy-l10n-id="move-to-start"
 +                    tbattr="tabbrowser-multiple"
 +                    oncommand="gBrowser.moveTabsToStart(TabContextMenu.contextTab);"/>
 +          <menuitem id="context_moveToEnd"
-+                    label="&moveToEnd.label;"
-+                    accesskey="&moveToEnd.accesskey;"
++                    data-lazy-l10n-id="move-to-end"
 +                    tbattr="tabbrowser-multiple"
 +                    oncommand="gBrowser.moveTabsToEnd(TabContextMenu.contextTab);"/>
-+          <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
-+                    accesskey="&moveToNewWindow.accesskey;"
++          <menuitem id="context_openTabInWindow" data-lazy-l10n-id="move-to-new-window"
 +                    tbattr="tabbrowser-multiple"
 +                    oncommand="gBrowser.replaceTabsWithWindow(TabContextMenu.contextTab);"/>
 +        </menupopup>
@@ -206,18 +196,17 @@ new file mode 100644
 +                   onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle, TabContextMenu.contextTab.multiselected);"/>
 +      </menu>
 +      <menuseparator/>
-+      <menuitem id="context_closeTabsToTheEnd" label="&closeTabsToTheEnd.label;" accesskey="&closeTabsToTheEnd.accesskey;"
++      <menuitem id="context_closeTabsToTheEnd" data-lazy-l10n-id="close-tabs-to-the-end"
 +                oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab, {animate: true});"/>
-+      <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;"
++      <menuitem id="context_closeOtherTabs" data-lazy-l10n-id="close-other-tabs"
 +                oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
 +      <menuitem id="context_undoCloseTab"
-+                label="&undoCloseTab.label;"
-+                accesskey="&undoCloseTab.accesskey;"
++                data-lazy-l10n-id="undo-close-tab"
 +                observes="History:UndoCloseTab"/>
-+      <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
++      <menuitem id="context_closeTab" data-lazy-l10n-id="close-tab"
 +                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
-+      <menuitem id="context_closeSelectedTabs" label="&closeTabs.label;"
-+                hidden="true" accesskey="&closeTabs.accesskey;"
++      <menuitem id="context_closeSelectedTabs" data-lazy-l10n-id="close-tabs"
++                hidden="true"
 +                oncommand="gBrowser.removeMultiSelectedTabs();"/>
 +    </menupopup>
 +
@@ -301,11 +290,17 @@ new file mode 100644
 +           aria-labelledby="editBookmarkPanelTitle">
 +      <box class="panel-header">
 +        <label id="editBookmarkPanelTitle"/>
++        <toolbarbutton id="editBookmarkPanelInfoButton" oncommand="StarUI.toggleRecommendation();" >
++          <image/>
++        </toolbarbutton>
 +      </box>
-+      <html:div id="editBookmarkPanelFaviconContainer">
-+        <html:img id="editBookmarkPanelFavicon"/>
++      <html:div id="editBookmarkPanelInfoArea">
++        <html:div id="editBookmarkPanelRecommendation"></html:div>
++        <html:div id="editBookmarkPanelFaviconContainer">
++          <html:img id="editBookmarkPanelFavicon"/>
++        </html:div>
++        <html:div id="editBookmarkPanelImage"></html:div>
 +      </html:div>
-+      <box id="editBookmarkPanelImage"/>
 +#include ../../components/places/content/editBookmarkPanel.inc.xul
 +      <vbox id="editBookmarkPanelBottomContent"
 +            flex="1">
@@ -424,6 +419,11 @@ new file mode 100644
 +                label="&customizeMenu.removeExtension.label;"
 +                contexttype="toolbaritem"
 +                class="customize-context-removeExtension"/>
++      <menuitem oncommand="ToolbarContextMenu.reportExtensionForContextAction(this.parentElement, 'toolbar_context_menu')"
++                accesskey="&customizeMenu.reportExtension.accesskey;"
++                label="&customizeMenu.reportExtension.label;"
++                contexttype="toolbaritem"
++                class="customize-context-reportExtension"/>
 +      <menuseparator/>
 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
@@ -444,32 +444,26 @@ new file mode 100644
 +      <menuitem id="toolbar-context-reloadSelectedTab"
 +                contexttype="tabbar"
 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
-+                label="&toolbarContextMenu.reloadSelectedTab.label;"
-+                accesskey="&toolbarContextMenu.reloadSelectedTab.accesskey;"/>
++                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tab"/>
 +      <menuitem id="toolbar-context-reloadSelectedTabs"
 +                contexttype="tabbar"
 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
-+                label="&toolbarContextMenu.reloadSelectedTabs.label;"
-+                accesskey="&toolbarContextMenu.reloadSelectedTabs.accesskey;"/>
++                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tabs"/>
 +      <menuitem id="toolbar-context-bookmarkSelectedTab"
 +                contexttype="tabbar"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
-+                label="&toolbarContextMenu.bookmarkSelectedTab.label;"
-+                accesskey="&toolbarContextMenu.bookmarkSelectedTab.accesskey;"/>
++                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tab"/>
 +      <menuitem id="toolbar-context-bookmarkSelectedTabs"
 +                contexttype="tabbar"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
-+                label="&toolbarContextMenu.bookmarkSelectedTabs.label;"
-+                accesskey="&toolbarContextMenu.bookmarkSelectedTabs.accesskey;"/>
++                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tabs"/>
 +      <menuitem id="toolbar-context-selectAllTabs"
 +                contexttype="tabbar"
 +                oncommand="gBrowser.selectAllTabs();"
-+                label="&toolbarContextMenu.selectAllTabs.label;"
-+                accesskey="&toolbarContextMenu.selectAllTabs.accesskey;"/>
++                data-lazy-l10n-id="toolbar-context-menu-select-all-tabs"/>
 +      <menuitem id="toolbar-context-undoCloseTab"
 +                contexttype="tabbar"
-+                label="&toolbarContextMenu.undoCloseTab.label;"
-+                accesskey="&toolbarContextMenu.undoCloseTab.accesskey;"
++                data-lazy-l10n-id="toolbar-context-menu-undo-close-tab"
 +                observes="History:UndoCloseTab"/>
 +      <menuseparator/>
 +      <menuseparator id="viewToolbarsMenuSeparator"/>
@@ -631,7 +625,8 @@ new file mode 100644
 +#include popup-notifications.inc
 +
 +#include ../../components/customizableui/content/panelUI.inc.xul
-+#include ../../components/controlcenter/content/panel.inc.xul
++#include ../../components/controlcenter/content/identityPanel.inc.xul
++#include ../../components/controlcenter/content/protectionsPanel.inc.xul
 +#include ../../components/downloads/content/downloadsPanel.inc.xul
 +#include browser-allTabsMenu.inc.xul
 +
@@ -645,31 +640,23 @@ new file mode 100644
 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
 +
 +    <menupopup id="SyncedTabsSidebarContext">
-+      <menuitem label="&syncedTabs.context.open.label;"
-+                accesskey="&syncedTabs.context.open.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open"
 +                id="syncedTabsOpenSelected" where="current"/>
-+      <menuitem label="&syncedTabs.context.openInNewTab.label;"
-+                accesskey="&syncedTabs.context.openInNewTab.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-tab"
 +                id="syncedTabsOpenSelectedInTab" where="tab"/>
-+      <menuitem label="&syncedTabs.context.openInNewWindow.label;"
-+                accesskey="&syncedTabs.context.openInNewWindow.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-window"
 +                id="syncedTabsOpenSelectedInWindow" where="window"/>
-+      <menuitem label="&syncedTabs.context.openInNewPrivateWindow.label;"
-+                accesskey="&syncedTabs.context.openInNewPrivateWindow.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-private-window"
 +                id="syncedTabsOpenSelectedInPrivateWindow" where="window" private="true"/>
 +      <menuseparator/>
-+      <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;"
-+                accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-bookmark-single-tab"
 +                id="syncedTabsBookmarkSelected"/>
-+      <menuitem label="&syncedTabs.context.copy.label;"
-+                accesskey="&syncedTabs.context.copy.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-copy"
 +                id="syncedTabsCopySelected"/>
 +      <menuseparator/>
-+      <menuitem label="&syncedTabs.context.openAllInTabs.label;"
-+                accesskey="&syncedTabs.context.openAllInTabs.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-all-in-tabs"
 +                id="syncedTabsOpenAllInTabs"/>
-+      <menuitem label="&syncedTabs.context.managedevices.label;"
-+                accesskey="&syncedTabs.context.managedevices.accesskey;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-manage-devices"
 +                id="syncedTabsManageDevices"
 +                oncommand="gSync.openDevicesManagementPage('syncedtabs-sidebar');"/>
 +      <menuitem label="&syncSyncNowItem.label;"
@@ -704,7 +691,7 @@ new file mode 100644
 +                id="syncedTabsRefreshFilter"/>
 +    </menupopup>
 +
-+    <hbox id="statuspanel" inactive="true" layer="true">
++    <hbox id="statuspanel" inactive="true" renderroot="content">
 +      <hbox id="statuspanel-inner">
 +        <label id="statuspanel-label"
 +               role="status"
@@ -876,16 +863,6 @@ new file mode 100644
 +                     placeholder="&urlbar.placeholder2;"
 +                     defaultPlaceholder="&urlbar.placeholder2;"
 +                     focused="true"
-+                     type="autocomplete"
-+                     quantumbar="false"
-+                     autocompletesearch="unifiedcomplete"
-+                     autocompletesearchparam="enable-actions"
-+                     autocompletepopup="PopupAutoCompleteRichResult"
-+                     completeselectedindex="true"
-+                     tabscrolling="true"
-+                     newlines="stripsurroundingwhitespace"
-+                     ontextentered="this.handleCommand(param);"
-+                     ontextreverted="return this.handleRevert();"
 +                     pageproxystate="invalid">
 +              <!-- Use onclick instead of normal popup= syntax since the popup
 +                   code fires onmousedown, and hence eats our favicon drag events. -->
@@ -928,6 +905,8 @@ new file mode 100644
 +                         tooltiptext="&urlbar.flashPluginBlocked.tooltip;"/>
 +                  <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
 +                         tooltiptext="&urlbar.midiBlocked.tooltip;"/>
++                  <image data-permission-id="install" class="blocked-permission-icon install-icon" role="button"
++                         tooltiptext="&urlbar.installBlocked.tooltip;"/>
 +                </box>
 +                <box id="notification-popup-box"
 +                     hidden="true"
@@ -1339,7 +1318,7 @@ new file mode 100644
 +
 +  <hbox id="fullscr-toggler" hidden="true"/>
 +
-+  <deck id="content-deck" flex="1">
++  <deck id="content-deck" flex="1" renderroot="content">
 +    <hbox flex="1" id="browser">
 +      <vbox id="browser-border-start" hidden="true" layer="true"/>
 +      <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
@@ -1372,10 +1351,12 @@ new file mode 100644
 +      </vbox>
 +      <vbox id="browser-border-end" hidden="true" layer="true"/>
 +    </hbox>
++    <box id="customization-container" flex="1" hidden="true"><![CDATA[
 +#include ../../components/customizableui/content/customizeMode.inc.xul
++    ]]></box>
 +  </deck>
 +
-+  <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true">
++  <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
 +    <html:div class="pointerlockfswarning-domain-text">
 +      &fullscreenWarning.beforeDomain.label;
 +      <html:span class="pointerlockfswarning-domain"/>
@@ -1394,7 +1375,7 @@ new file mode 100644
 +    </html:button>
 +  </html:div>
 +
-+  <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true">
++  <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
 +    <html:div class="pointerlockfswarning-domain-text">
 +      &pointerlockWarning.beforeDomain.label;
 +      <html:span class="pointerlockfswarning-domain"/>
@@ -1405,42 +1386,26 @@ new file mode 100644
 +    </html:div>
 +  </html:div>
 +
-+  <vbox id="browser-bottombox" layer="true">
++  <vbox id="browser-bottombox" layer="true" renderroot="content">
 +    <!-- gNotificationBox will be added here lazily. -->
 +  </vbox>
-+
 +</window>
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
---- a/browser/base/jar.mn
-+++ b/browser/base/jar.mn
-@@ -28,16 +28,18 @@ browser.jar:
-         content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
-         content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
- *       content/browser/browser.css                   (content/browser.css)
-         content/browser/browser.js                    (content/browser.js)
- #ifdef MOZ_BROWSER_XHTML
- *       content/browser/browser.xhtml                 (content/browser.xhtml)
- #endif
+diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn
+--- a/browser/base/jar.mn	Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/base/jar.mn	Fri May 31 12:55:51 2019 +0200
+@@ -33,6 +33,8 @@
+ #else
  *       content/browser/browser.xul                   (content/browser.xul)
+ #endif
 +*       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-addons.js             (content/browser-addons.js)
          content/browser/browser-allTabsMenu.js        (content/browser-allTabsMenu.js)
          content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
-         content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
-         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-compacttheme.js       (content/browser-compacttheme.js)
-         content/browser/browser-contentblocking.js    (content/browser-contentblocking.js)
-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
-@@ -288,16 +288,23 @@ var gMainPane = {
-           this._backoffIndex++ : backoffTimes.length - 1]);
-       };
- 
-       window.setTimeout(() => {
-         window.requestIdleCallback(pollForDefaultBrowser);
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/main.js
+--- a/browser/components/preferences/in-content/main.js	Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/components/preferences/in-content/main.js	Fri May 31 12:55:51 2019 +0200
+@@ -294,6 +294,13 @@
        }, backoffTimes[this._backoffIndex]);
      }
  
@@ -1454,17 +1419,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
      this.initBrowserContainers();
      this.buildContentProcessCountMenuList();
  
-     let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
-     let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
-     performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
- 
-     this.updateDefaultPerformanceSettingsPref();
-@@ -1025,16 +1032,27 @@ var gMainPane = {
-       // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
-       this._backoffIndex = 0;
- 
-       let shellSvc = getShellService();
-       if (!shellSvc)
+@@ -983,6 +990,17 @@
          return;
        try {
          shellSvc.setDefaultBrowser(true, false);
@@ -1482,20 +1437,10 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
        } catch (ex) {
          Cu.reportError(ex);
          return;
-       }
- 
-       let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
-       document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
-     }
-diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
---- a/browser/components/shell/moz.build
-+++ b/browser/components/shell/moz.build
-@@ -29,16 +29,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
-     ]
- elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-     XPIDL_SOURCES += [
-         'nsIGNOMEShellService.idl',
-     ]
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build
+--- a/browser/components/shell/moz.build	Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/components/shell/moz.build	Fri May 31 12:55:51 2019 +0200
+@@ -33,6 +33,8 @@
  
      SOURCES += [
          'nsGNOMEShellService.cpp',
@@ -1504,15 +1449,9 @@ diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.b
      ]
  elif CONFIG['OS_ARCH'] == 'WINNT':
      SOURCES += [
-         'nsWindowsShellService.cpp',
-     ]
-     LOCAL_INCLUDES += [
-         '../../../other-licenses/nsis/Contrib/CityHash/cityhash',
-     ]
-diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsKDEShellService.cpp
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsKDEShellService.cpp	Fri May 31 12:55:51 2019 +0200
 @@ -0,0 +1,150 @@
 +/* -*- 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
@@ -1664,10 +1603,9 @@ new file mode 100644
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
 +
-diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsKDEShellService.h
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsKDEShellService.h	Fri May 31 12:55:51 2019 +0200
 @@ -0,0 +1,32 @@
 +/* -*- 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
@@ -1701,10 +1639,9 @@ new file mode 100644
 +};
 +
 +#endif // nskdeshellservice_h____
-diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsUnixShellService.cpp
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.cpp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsUnixShellService.cpp	Fri May 31 12:55:51 2019 +0200
 @@ -0,0 +1,22 @@
 +/* -*- 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
@@ -1728,10 +1665,9 @@ new file mode 100644
 +        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
 +    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
 +}
-diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsUnixShellService.h
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.h
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsUnixShellService.h	Fri May 31 12:55:51 2019 +0200
 @@ -0,0 +1,15 @@
 +/* -*- 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
@@ -1748,15 +1684,10 @@ new file mode 100644
 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
-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
-@@ -286,16 +286,18 @@
- @RESPATH@/browser/defaults/settings/pinning
- @RESPATH@/browser/defaults/settings/main
- 
- ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
- ; Technically this is an app pref file, but we are keeping it in the original
+diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in	Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/installer/package-manifest.in	Fri May 31 12:55:51 2019 +0200
+@@ -299,6 +299,8 @@
  ; gre location for now.
  @RESPATH@/defaults/pref/channel-prefs.js
  
@@ -1765,8 +1696,3 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
  ; Services (gre) prefs
  @RESPATH@/defaults/pref/services-sync.js
  
- ; [Layout Engine Resources]
- ; Style Sheets, Graphics and other Resources used by the layout engine.
- @RESPATH@/res/EditorOverride.css
- @RESPATH@/res/contenteditable.css
- @RESPATH@/res/designmode.css
diff --git a/firefox.spec b/firefox.spec
index 5c79197..5ebd80d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,7 +10,7 @@
 # This also means only STABLE upstream releases, NO betas.
 # This is a discussed topic. Please, do not flame it again.
 
-%define major 67.0.4
+%define major 68.0
 %define ff_epoch 0
 # (tpg) set version HERE !!!
 %define realver %{major}
@@ -37,7 +37,7 @@ Summary:	Next generation web browser
 Name:		firefox
 Version:	%{major}
 Epoch:		%{ff_epoch}
-Release:	3
+Release:	1
 License:	MPLv1+
 Group:		Networking/WWW
 Url:		http://www.mozilla.com/firefox/
@@ -59,8 +59,6 @@ Patch11:	firefox-kde.patch
 Patch12:	mozilla-kde.patch
 Patch13:	mozilla-kde-background.patch
 
-Patch35:	firefox-37-build-with-time-independent-uuids.patch
-
 # Fedora specific patches
 # Unable to install addons from https pages
 Patch215:	firefox-enable-addons.patch
@@ -214,8 +212,6 @@ Files and macros mainly for building Firefox extensions.
 %patch12 -p1 -b .kdemoz
 %patch13 -p1 -b .kdebackground
 
-%patch35 -p1
-
 # Fedora patches
 %patch215 -p1 -b .addons
 
diff --git a/mozilla-kde.patch b/mozilla-kde.patch
index ba80c56..85dd1c3 100644
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@@ -1,5 +1,9 @@
 # HG changeset patch
-# Parent  cafacdb0b7c50666e5dcc927684a23e8733206a5
+# User msirringhaus@suse.de
+# Date 1559294891 -7200
+#      Fri May 31 11:28:11 2019 +0200
+# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
+# Parent  f11c2d7239c0caa4dc74272716d9e30ced1a1ca3
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -27,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  #ifdef XP_WIN
  #  include "windows.h"
  #endif
-@@ -4493,25 +4494,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4507,25 +4508,37 @@ static nsresult pref_ReadDefaultPrefs(co
    // application pref files for backwards compatibility.
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -65,7 +69,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  
    // Load jar:$app/omni.jar!/defaults/preferences/*.js
    // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4559,17 +4572,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4573,17 +4586,17 @@ static nsresult pref_ReadDefaultPrefs(co
        }
  
        nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -183,18 +187,18 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 +*  content/global/bindings/dialog-kde.xml      (widgets/dialog-kde.xml)
 +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
     content/global/bindings/general.xml         (widgets/general.xml)
-    content/global/bindings/menu.xml            (widgets/menu.xml)
     content/global/bindings/popup.xml           (widgets/popup.xml)
-    content/global/bindings/radio.xml           (widgets/radio.xml)
     content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
     content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
     content/global/bindings/spinner.js          (widgets/spinner.js)
     content/global/bindings/tabbox.xml          (widgets/tabbox.xml)
+ *  content/global/bindings/textbox.xml         (widgets/textbox.xml)
+    content/global/bindings/timekeeper.js       (widgets/timekeeper.js)
 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,507 @@
+@@ -0,0 +1,499 @@
 +<?xml version="1.0"?>
 +<!-- 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
@@ -495,6 +499,10 @@ new file mode 100644
 +          buttons.help = document.getAnonymousElementByAttribute(this, "dlgtype", "help");
 +          buttons.disclosure = document.getAnonymousElementByAttribute(this, "dlgtype", "disclosure");
 +
++          for (let button in buttons) {
++            customElements.upgrade(buttons[button]);
++          }
++
 +          // look for any overriding explicit button elements
 +          var exBtns = this.getElementsByAttribute("dlgtype", "*");
 +          var dlgtype;
@@ -646,19 +654,7 @@ new file mode 100644
 +          event.initEvent("dialog" + aDlgType, true, true);
 +
 +          // handle dom event handlers
-+          var noCancel = this.dispatchEvent(event);
-+
-+          // handle any xml attribute event handlers
-+          var handler = this.getAttribute("ondialog" + aDlgType);
-+          if (handler != "") {
-+            var fn = new Function("event", handler);
-+            var returned = fn(event);
-+            // eslint-disable-next-line mozilla/no-compare-against-boolean-literals
-+            if (returned == false)
-+              noCancel = false;
-+          }
-+
-+          return noCancel;
++          return this.dispatchEvent(event);
 +        ]]>
 +        </body>
 +      </method>
@@ -705,7 +701,7 @@ new file mode 100644
 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
-@@ -1030,30 +1030,60 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1042,30 +1042,60 @@ nsUnknownContentTypeDialog.prototype = {
  
        if (params.handlerApp &&
            params.handlerApp.executable &&
@@ -783,7 +779,7 @@ diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downlo
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -15,16 +15,17 @@
+@@ -14,16 +14,17 @@
  #include "nsPrintfCString.h"
  #include "nsNetCID.h"
  #include "nsNetUtil.h"
@@ -801,10 +797,10 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
    NS_DECL_ISUPPORTS
    NS_DECL_NSISYSTEMPROXYSETTINGS
  
-@@ -44,16 +45,18 @@ class nsUnixSystemProxySettings final : 
-                                    nsACString& aResult);
-   nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost,
-                              int32_t aPort, nsACString& aResult);
+@@ -37,16 +38,18 @@ class nsUnixSystemProxySettings final : 
+   nsCOMPtr<nsIGSettingsCollection> mProxySettings;
+   nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection>
+       mSchemeProxySettings;
    nsresult GetProxyFromGSettings(const nsACString& aScheme,
                                   const nsACString& aHost, int32_t aPort,
                                   nsACString& aResult);
@@ -820,7 +816,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
  nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
    // dbus prevents us from being threadsafe, but this routine should not block
    // anyhow
-@@ -487,22 +490,51 @@ nsresult nsUnixSystemProxySettings::GetP
+@@ -382,21 +385,50 @@ nsresult nsUnixSystemProxySettings::GetP
    return NS_OK;
  }
  
@@ -836,7 +832,6 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
      nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
      if (NS_SUCCEEDED(rv)) return rv;
    }
-   if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
  
    return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);
  }
@@ -943,7 +938,7 @@ new file mode 100644
 +    Display* dpy = XOpenDisplay( NULL );
 +    if( dpy == NULL )
 +        return false;
-+    Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", True );
++    Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", true );
 +    bool kde = false;
 +    if( kde_full_session != None )
 +        {
@@ -1300,7 +1295,8 @@ new file mode 100644
 diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp
 --- a/uriloader/exthandler/HandlerServiceParent.cpp
 +++ b/uriloader/exthandler/HandlerServiceParent.cpp
-@@ -1,16 +1,16 @@
+@@ -1,17 +1,17 @@
+ #include "mozilla/ipc/ProtocolUtils.h"
  #include "mozilla/Logging.h"
  #include "HandlerServiceParent.h"
  #include "nsIHandlerService.h"
@@ -1318,13 +1314,13 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
  using mozilla::dom::RemoteHandlerApp;
  
  namespace {
-@@ -246,17 +246,17 @@ mozilla::ipc::IPCResult HandlerServicePa
-   handlerSvc->Exists(info, exists);
-   return IPC_OK();
- }
- 
- mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocol(
+@@ -282,17 +282,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+ mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
      const nsCString& aProtocolScheme, bool* aHandlerExists) {
+   if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) {
+     *aHandlerExists = false;
+     return IPC_OK();
+   }
  #ifdef MOZ_WIDGET_GTK
    // Check the GNOME registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme.get());
@@ -1335,12 +1331,31 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
    return IPC_OK();
  }
  
- mozilla::ipc::IPCResult HandlerServiceParent::RecvGetTypeFromExtension(
-     const nsCString& aFileExtension, nsCString* type) {
+ /*
+  * Check if a handler exists for the provided protocol. Check the datastore
+@@ -311,17 +311,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+   nsCOMPtr<nsIExternalProtocolService> protoSvc =
+       do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
+   if (NS_WARN_IF(NS_FAILED(rv))) {
+     *aHandlerExists = false;
+     return IPC_OK();
+   }
+   rv = protoSvc->ExternalProtocolHandlerExists(aProtocolScheme.get(),
+                                                aHandlerExists);
+-
++##
+   if (NS_WARN_IF(NS_FAILED(rv))) {
+     *aHandlerExists = false;
+   }
+ #else
+   MOZ_RELEASE_ASSERT(false, "No implementation on this platform.");
+   *aHandlerExists = false;
+ #endif
+   return IPC_OK();
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -80,17 +80,19 @@ else:
+@@ -83,17 +83,19 @@ else:
      SOURCES += [
          osdir + '/nsOSHelperAppService.cpp',
      ]
@@ -1360,7 +1375,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
          'android/nsExternalURLHandlerService.cpp',
          'android/nsMIMEInfoAndroid.cpp',
      ]
-@@ -130,16 +132,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -133,16 +135,17 @@ include('/ipc/chromium/chromium-config.m
  FINAL_LIBRARY = 'xul'
  
  LOCAL_INCLUDES += [
@@ -1624,13 +1639,13 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
 +#include "nsKDEUtils.h"
 +#endif
  
- nsresult nsMIMEInfoUnix::LoadUriInternal(nsIURI *aURI) {
+ nsresult nsMIMEInfoUnix::LoadUriInternal(nsIURI* aURI) {
 -  return nsGNOMERegistry::LoadURL(aURI);
 +  return nsCommonRegistry::LoadURL(aURI);
  }
  
  NS_IMETHODIMP
- nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval) {
+ nsMIMEInfoUnix::GetHasDefaultHandler(bool* _retval) {
    // if mDefaultApplication is set, it means the application has been set from
    // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
    // give the GNOME answer.
@@ -1794,7 +1809,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
-@@ -121,16 +121,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -124,16 +124,17 @@ include('/ipc/chromium/chromium-config.m
  
  FINAL_LIBRARY = 'xul'
  
@@ -1849,14 +1864,14 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  // bug 1184009
  #define MAX_PREVIEW_SOURCE_SIZE 4096
  
- nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
+ nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr;
 @@ -227,17 +229,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    mAllowURLs = !!(aFilterMask & filterAllowURLs);
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
  NS_IMETHODIMP
- nsFilePicker::AppendFilter(const nsAString &aTitle, const nsAString &aFilter) {
+ nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) {
    if (aFilter.EqualsLiteral("..apps")) {
      // No platform specific thing we can do here, really....
 -    return NS_OK;
@@ -1871,12 +1886,12 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -337,16 +341,39 @@ nsresult nsFilePicker::Show(int16_t *aRe
+@@ -337,16 +341,39 @@ nsresult nsFilePicker::Show(int16_t* aRe
    return NS_OK;
  }
  
  NS_IMETHODIMP
- nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) {
+ nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) {
    // Can't show two dialogs concurrently with the same filepicker
    if (mRunning) return NS_ERROR_NOT_AVAILABLE;
  
@@ -1906,12 +1921,12 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
    nsCString title;
    title.Adopt(ToNewUTF8String(mTitle));
  
-   GtkWindow *parent_widget =
+   GtkWindow* parent_widget =
        GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
  
-@@ -572,16 +599,240 @@ void nsFilePicker::Done(void *file_choos
+@@ -572,16 +599,240 @@ void nsFilePicker::Done(void* file_choos
      mCallback->Done(result);
      mCallback = nullptr;
    } else {
@@ -2145,13 +2160,13 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 +    }
 +
  // All below functions available as of GTK 3.20+
- void *nsFilePicker::GtkFileChooserNew(const gchar *title, GtkWindow *parent,
+ void* nsFilePicker::GtkFileChooserNew(const gchar* title, GtkWindow* parent,
                                        GtkFileChooserAction action,
-                                       const gchar *accept_label) {
+                                       const gchar* accept_label) {
    static auto sGtkFileChooserNativeNewPtr =
-       (void *(*)(const gchar *, GtkWindow *, GtkFileChooserAction,
-                  const gchar *,
-                  const gchar *))dlsym(RTLD_DEFAULT,
+       (void* (*)(const gchar*, GtkWindow*, GtkFileChooserAction, const gchar*,
+                  const gchar*))dlsym(RTLD_DEFAULT,
+                                      "gtk_file_chooser_native_new");
 diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 --- a/widget/gtk/nsFilePicker.h
 +++ b/widget/gtk/nsFilePicker.h
@@ -2162,7 +2177,7 @@ diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
    nsTArray<nsCString> mFilterNames;
  
   private:
-   static nsIFile *mPrevDisplayDirectory;
+   static nsIFile* mPrevDisplayDirectory;
  
 +  bool kdeRunning();
 +  bool getKdeRunning();
@@ -2170,12 +2185,12 @@ diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 +  NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn);
 +  nsCString kdeMakeFilter( int index );
 +
-   void *GtkFileChooserNew(const gchar *title, GtkWindow *parent,
+   void* GtkFileChooserNew(const gchar* title, GtkWindow* parent,
                            GtkFileChooserAction action,
-                           const gchar *accept_label);
-   void GtkFileChooserShow(void *file_chooser);
-   void GtkFileChooserDestroy(void *file_chooser);
-   void GtkFileChooserSetModal(void *file_chooser, GtkWindow *parent_widget,
+                           const gchar* accept_label);
+   void GtkFileChooserShow(void* file_chooser);
+   void GtkFileChooserDestroy(void* file_chooser);
+   void GtkFileChooserSetModal(void* file_chooser, GtkWindow* parent_widget,
                                gboolean modal);
  
 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
@@ -2199,7 +2214,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    int argc;
  
    bool ischrome;
-@@ -392,16 +393,17 @@ void ParseManifest(NSLocationType aType,
+@@ -393,16 +394,17 @@ void ParseManifest(NSLocationType aType,
    NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
    NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
    NS_NAMED_LITERAL_STRING(kApplication, "application");
@@ -2217,7 +2232,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    NS_NAMED_LITERAL_STRING(kMain, "main");
    NS_NAMED_LITERAL_STRING(kContent, "content");
  
-@@ -447,39 +449,44 @@ void ParseManifest(NSLocationType aType,
+@@ -448,39 +450,44 @@ void ParseManifest(NSLocationType aType,
          CopyUTF8toUTF16(s, abi);
          abi.Insert(char16_t('_'), 0);
          abi.Insert(osTarget, 0);
@@ -2262,7 +2277,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
      process = kMain;
    }
  
-@@ -566,25 +573,27 @@ void ParseManifest(NSLocationType aType,
+@@ -567,25 +574,27 @@ void ParseManifest(NSLocationType aType,
      TriState stOsVersion = eUnspecified;
      TriState stOs = eUnspecified;
      TriState stABI = eUnspecified;
@@ -2290,7 +2305,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
          continue;
        }
  
-@@ -621,17 +630,17 @@ void ParseManifest(NSLocationType aType,
+@@ -622,17 +631,17 @@ void ParseManifest(NSLocationType aType,
        }
  
        LogMessageWithContext(
@@ -2312,7 +2327,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -66,14 +66,15 @@ LOCAL_INCLUDES += [
+@@ -66,16 +66,17 @@ LOCAL_INCLUDES += [
      '!..',
      '../base',
      '../build',
@@ -2327,7 +2342,9 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
  if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
      CXXFLAGS += CONFIG['TK_CFLAGS']
  
- include('/ipc/chromium/chromium-config.mozbuild')
+ if CONFIG['MOZ_LAYOUT_DEBUGGER']:
+     DEFINES['MOZ_LAYOUT_DEBUGGER'] = True
+ 
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp