$ git diff --patch-with-stat --summary b8c50a27d14030eadd26781bcbd6a49d315abe91..cf3e13e07f972ba6f9db3427070d9d14920ea03e
.abf.yml | 154 +++++++++++------------
firefox-66.0-kde.patch => firefox-67.0-kde.patch | 146 ++++++---------------
firefox.spec | 9 +-
mozilla-42.0-libproxy.patch | 10 --
mozilla-66.0-kde.patch => mozilla-67.0-kde.patch | 77 ++++++------
5 files changed, 160 insertions(+), 236 deletions(-)
rename firefox-66.0-kde.patch => firefox-67.0-kde.patch (95%)
delete mode 100644 mozilla-42.0-libproxy.patch
rename mozilla-66.0-kde.patch => mozilla-67.0-kde.patch (97%)
diff --git a/.abf.yml b/.abf.yml
index e500b08..c1fa4bb 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,79 +1,79 @@
sources:
- af.xpi: a83b1044a64332ec806e310ca87ca47fad317cd4
- ar.xpi: 0ae659cfac3177b7d2c3967a55ce430f2ff0310f
- as.xpi: 0d9e96cd1111bff811fde4a73eafd965dd38b366
- ast.xpi: adf67ab0be778b290ca5b5c7d2d9e404d987a371
+ af.xpi: b44768e12acb22bbaad40628e34094f6ef11d010
+ ar.xpi: 29eaea4ea0430213529fa8af5364cd0763d73c4f
+ as.xpi: dea3de95643d09208c347866e1ed7d2893a9fc4f
+ ast.xpi: a82115a9708b34254aee90ae90fec2057fd9e036
autoconf-2.13.tar.gz: e4826c8bd85325067818f19b2b2ad2b625da66fc
- bg.xpi: a0fca9d131224573cd4e104e6ea9230d5face2b2
- bn-BD.xpi: 7b67d986b170583622888384f14c139bcd9354a7
- bn-IN.xpi: cf78305aaa152c35d8394a20785f70231355544a
- br.xpi: 87e791bb82ed800f62a6fae32f7312900a2a260d
- bs.xpi: 575636b2ca8c8589dfddc978635b44096a29fdcc
- ca.xpi: 9ec927851188366dd824ce84381cb929e58a63af
- cbindgen-vendor.tar.xz: 4be157dcf0eec0ad6e1bc333c15b3dc84a12d78b
- cs.xpi: 0b788dcab2dde4976d51b42d101eb4e637e6a935
- cy.xpi: dcbcfc2fce9cedde00a9c2ec4653f7c299bb1c30
- da.xpi: 9540e78c2b234a7d691a899c90414bac7553dac0
- de.xpi: 3066712df3dab4ab6713f0ff6e27c768e50d3a0b
- el.xpi: dbfbb3dae0e3f4161061c0e5e5b74c19e8882aa5
- en-GB.xpi: 69aafccd453018ae56bc22a6d871fafe1fa76952
- en-ZA.xpi: 5b44fbe6b395ec4d5a026353289ff107f75ccf02
- eo.xpi: ae63e6a2bb62b8addc0128844d206b34639de7dc
- es-AR.xpi: 9281680521340b184341092b461ae4237be43bde
- es-CL.xpi: 14674e6f301a1511e2ea28a29401afeba49311ac
- es-ES.xpi: 2cfd2124ca971225e4ca40b825423f2adfcb7252
- es-MX.xpi: 55cec607a4186236455f4c45ae2797aeb15e453f
- et.xpi: 8aefca6a57d5b615767835ce1d39bf66b1885e05
- eu.xpi: 3c7df33f18dbb81733da778a61e82514231ce6e0
- fa.xpi: e0844266aa1d7f221d30bb0238ab77415f0e9fc3
- fi.xpi: 1f76d7d38029197d113befdfa76ff6ef4e1dba85
- firefox-66.0.5.source.tar.xz: f2704b63626a6305ce93ee201997d641a9f71ad4
- fr.xpi: e32bd41c324c1f318d7f94721676343b8f856c25
- fy-NL.xpi: 3af5298b77fe28e3dd70105b0fc0e1da28021998
- ga-IE.xpi: a3fdba4247946e7af51412f752bd984731f56794
- gd.xpi: e47430bade3ffaa1244119a20f2a5e2d8fe4edbc
- gl.xpi: 794ce87d08d7432b8ae33b1d55beac02ced7cd7e
- gu-IN.xpi: 52de22f646aa57b6c33bfe63be467faf46314380
- he.xpi: 1f5a3b0607ad41bd29a70fc2ab9ed1ffb33a8c73
- hi-IN.xpi: ed55c915e92c98b206f3e75befbb7464b22123a4
- hr.xpi: 025e1c8893003b42f5e4067990ce1d5c92fc13b0
- hu.xpi: d75752f355ed5f445de5d1405a7b52a61a0a4943
- hy-AM.xpi: 5f175ef1fabd083acc946bbd48bc33403555a4bf
- id.xpi: 33dafb1866ec7a33f7087659f2a644437273ef4a
- is.xpi: 5bd7eac132462bfd9c9efbce8c8d5667a62314f2
- it.xpi: 0e7acd828034d3ddca157eb7a27308dd453adfcc
- ja.xpi: 33eeacf06b43c2f330728d1296b4d250b5046cc2
- kk.xpi: 47c480ae2b4c524a4f8756d3d3e57e34e126b63a
- km.xpi: b756b8cd607da66a340f50fa29f643eb40f523fa
- kn.xpi: 95ca14c8aa860d75d8407a4574c08073f9e2276a
- ko.xpi: 95b59de8be820e1a8bf6c0d3509a231b6fa1456f
- lt.xpi: 160264f99f6a4b1bde2fff5dfc40806e36e77a13
- lv.xpi: 7dd85aff70557fd064b5a0c9dcf69ff58d85cb22
- mai.xpi: 502f3db2bec585d8a701562cfe452c0527874751
- mk.xpi: e6dfa0b8be0b7dfd6afb3ef21d6e866343e74c7f
- ml.xpi: 88c42be87bc2927207dae226017c457547c6b03c
- mr.xpi: 6ce5532cc1de1eb4a0c2e85e30d479c562c4c74b
- nb-NO.xpi: 57fdd1a81c88b9a19b55de03f3c286629dbf9792
- nl.xpi: d97fc1512084b6dae2655d2f478b74b0924e648c
- nn-NO.xpi: cba683b114a3ae7f30843c92d52aa75f63dc14a3
- or.xpi: f4705266b534fd92dccb0ac1508ab9b1e6d940c2
- pa-IN.xpi: 8fc6365252c75385559a8a398f5bc1db62d2f31a
- pl.xpi: dea5fef46632d2c433bf41707d4d11daab635537
- pt-BR.xpi: bc7f1204c933988d76ff599a9220426708c4bc06
- pt-PT.xpi: f316278bbba4bbc09689b58e3bcce8c5eb7163e0
- ro.xpi: 02746d2f048653e14b31887498c0cd2dd3f43a13
- ru.xpi: ce7d6bac28ee8c7a990ffe9d9c41fcd8f7397605
- si.xpi: abbb700a8185b79449e4943b8337e685b04e18f3
- sk.xpi: 3b8ac0580513e64f1348453f5cb7240f87825258
- sl.xpi: 14e232baa37730b0fde93c177822d5850d56eda3
- sq.xpi: ab826ce5cb2cca5c14cd3baea38c9367cd578cbe
- sr.xpi: 54b6ed13e11d108d95b35ca88710b89d5d43b6dd
- sv-SE.xpi: f05737238378324297c0fec4f3ae63925a45328b
- ta.xpi: c99dd5e35ec33cbb246804774a81807e71c946b5
- te.xpi: 266ab3f27ccf134020c855436dd07d16ec44d707
- th.xpi: 6a3e1f09975f75a1d3a88ff3abdeae399db3b16d
- tr.xpi: 849776a625b9af7c30d429deef6af382df3f621c
- uk.xpi: e7f1c77af621db2c040a56d015a1ab37d7b8a8de
- vi.xpi: c2961594282370e4ac505910c129fb2341d9f116
- zh-CN.xpi: e2d42df0d40e2eae376f506a7d488bc5ff3bd4ae
- zh-TW.xpi: aab3c9c94781099aae79a8276b87e9394e1cddbf
+ bg.xpi: 5b758549ccb0404f327c1225d24ef73849ad978d
+ bn-BD.xpi: 0576c27711f3b9a5d6c7deca6e3cd401d71a2e2e
+ bn-IN.xpi: 272de1f017741cae3a47d200dbb3a2b4a0ac4ac4
+ br.xpi: 37530448c93d2cb7aa8d8c1b61bce5704068964e
+ bs.xpi: 41efebb1ca5de80e65d1be71d8464dfedf4dfe49
+ ca.xpi: f15886e9225166a399aea126b3f6e5f84bcc4fdb
+ cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935
+ cs.xpi: 3511a273d3ed450f09f0bf770a25b8a16a465b1a
+ cy.xpi: 4b47e36f11b9f172b7fd2af1ef7ebf27b323e927
+ da.xpi: 8d8038fbb108edf5c0f1ebace43d02b126b4f816
+ de.xpi: 28487ffbd1d5c6aea424f054737166162b278d47
+ el.xpi: d44723d9faa3128d843da769714f6cf0d3c1c851
+ en-GB.xpi: 3514383d92e81223b17278cd707848003d086067
+ en-ZA.xpi: bab503b72167078ee7b03069ec1048d8eb082254
+ eo.xpi: 2707b19fdf9a7af92bf67e47ecee38a293b406b0
+ es-AR.xpi: 3675742a284d2044da1519f3ef78f135ae2a4422
+ es-CL.xpi: e9469546367acf85a94f57bcb9712546f6e8a361
+ es-ES.xpi: fcf340d968fe0e8afaa962d9e24fc94cc2ca3444
+ es-MX.xpi: 573af1325b0489713eb3e7e2d7ba506d3dd066f0
+ et.xpi: 7e8b5bbf1cb45117fad3846b4a19ecc55826dc4a
+ eu.xpi: e2d56b6a98809ed02325dfacca4d59d01790b19c
+ fa.xpi: 478e2c8fd3c172e00a0678eafbfc2164048b5cba
+ fi.xpi: d7a375c3f7d0654be4c42a4e1e4546edd1ba0b1a
+ firefox-67.0.source.tar.xz: c7a5f3182999e5efed5c714653adc538bb75aa53
+ fr.xpi: 0cac680cf90302ac99c15e2d4646e833582fc647
+ fy-NL.xpi: 21b60254f44dfc98d07aa25456f9cc64ad74d383
+ ga-IE.xpi: 9f38e7bca64ef903f0ed77fdfb9311fde6b8889b
+ gd.xpi: 0fdda4cc41d17a8e1aa298244d89ca16544ff4f0
+ gl.xpi: 46f5cda21ea68380b1eb409d27492b7ed5fc7818
+ gu-IN.xpi: c8002ff68a55c89513accb11ad0d8a108699900a
+ he.xpi: db3842831a1ecf2c4196620d942dd9d67497933d
+ hi-IN.xpi: aad9d23ce2348c0580aeacc1826343638c96b9e6
+ hr.xpi: 149382e5dfe2d6a32c51602c3bb936b08a80bf40
+ hu.xpi: 55a6bad8d3636b556f68bf3417831128945a12a9
+ hy-AM.xpi: b4c3861e50354535bffd09b90a76f28797afc50d
+ id.xpi: 32abd9f9eed519835ba5a500fd3d09bf92acdaec
+ is.xpi: 3b7c9757193701879b1afc3bc47600e7d60e94c9
+ it.xpi: d37cc3948150515e70846d9a38fd15f8908cab95
+ ja.xpi: 4a40cfa488472544b715385ca619de16d6d4f47c
+ kk.xpi: f297aab2e8abe848a1c585616c265eaa3d7582d0
+ km.xpi: 6076eec19250a6d011e9b374569e6946f10114aa
+ kn.xpi: f9b616ada42929a6fd128ea2ba321280352e4b0c
+ ko.xpi: 237aa9f93fa985cc9deddade3316326117dd8494
+ lt.xpi: 66001d51a2be1626a268176ae629e7a09d57c25e
+ lv.xpi: f31142cf6f8d3a13aec7b2dafa27e5f40c9298a6
+ mai.xpi: 641e77fc96bdac5801af9d1b4ade4be3c94bc2e3
+ mk.xpi: 14ae5f5bdf192645f4bb87951f5934912a96eeed
+ ml.xpi: 62ff9d807553dff584753e016e0bdffd42882809
+ mr.xpi: 978357b91caa24d17dd39fe4f7f04c1249a8b9a0
+ nb-NO.xpi: 676f52f74fff309cd237eb84e4a750b030061aa5
+ nl.xpi: d84d1855e6f7e243c387c061521053be5051de8b
+ nn-NO.xpi: 2f0a6bb064ab9df5a0351f21a224ff78fc6dbc3a
+ or.xpi: 1929c5198e43ae3e56952c51c6c711a33cf124b1
+ pa-IN.xpi: 436aa5da5e7a7b4057d9ab4edd21ab61161e6bde
+ pl.xpi: 968f7869f1b75e63ca80f074e3201a295fed875b
+ pt-BR.xpi: 37d8b14aeb3dc28484b2b5edb8e35826b40f094b
+ pt-PT.xpi: 15c4114a039533fca969343575b35993560f0068
+ ro.xpi: fa32c606697c5ea81630b89a8bbd4520f8cf44cf
+ ru.xpi: 78584e2cf3d49bb82c51f050eb57648ee56a9572
+ si.xpi: 3b135439e882400cd2a62aeca13d36143911f5cf
+ sk.xpi: 56e54dfe5f30cc1edf041062e48d3ee9467b1561
+ sl.xpi: 801e0c233134842656ba799ce68d0e8a55608e7b
+ sq.xpi: 6386eb72c6c9ed3109cc40a5909832eaac5e1b27
+ sr.xpi: aab0e60956347304f929c00cc2a144810bf51b84
+ sv-SE.xpi: b866550994600599b5d8cb4bd40eae42648ee817
+ ta.xpi: 647606805264382298f5bd0190725cc3f9f21ff0
+ te.xpi: f96881b01f22273d664bcfcfdfea7ce67d59156e
+ th.xpi: ede1044790bd9fe4848ad3080ec87497baadd007
+ tr.xpi: 1f94c9a615e68ab495409ad0a1fbcd07092555a9
+ uk.xpi: e5135dcaca8cb47e30a54c7dce41656f758849c0
+ vi.xpi: ae9d6c30454ef7fccb875f63f9971bd36bb74a26
+ zh-CN.xpi: 4fd6a8026cfa648b135ec5c8228a12efd5e3dba3
+ zh-TW.xpi: 010126b0c8dc48cb9ac0ab584588d0d9b1da6379
diff --git a/firefox-66.0-kde.patch b/firefox-67.0-kde.patch
similarity index 95%
rename from firefox-66.0-kde.patch
rename to firefox-67.0-kde.patch
index f5af168..3e3a1f0 100644
--- a/firefox-66.0-kde.patch
+++ b/firefox-67.0-kde.patch
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent 87262204aa945e6fce864193d103a93659bf76f6
+# Parent 18632e53d0b0c4c03f254ca2dbbeac8f48ec6f5c
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,1408 @@
+@@ -0,0 +1,1404 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -80,7 +80,6 @@ new file mode 100644
+ retargetdocumentfocus="urlbar"
+ persist="screenX screenY width height sizemode"
+#ifdef BROWSER_XHTML
-+ hidden="true"
+ mozpersist=""
+#endif
+ >
@@ -90,11 +89,7 @@ new file mode 100644
+# that they can be shared with macWindow.inc.xul.
+#include global-scripts.inc
+
-+<script type="application/javascript"
-+#ifdef BROWSER_XHTML
-+xmlns="http://www.w3.org/1999/xhtml"
-+#endif
-+>
++<script type="application/javascript">
+ 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);
@@ -111,23 +106,16 @@ new file mode 100644
+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-sidebar.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-tabsintitlebar.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
++ Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
+
+ window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
+ window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
+ window.onclose = WindowIsClosing;
+
-+#ifdef BROWSER_XHTML
-+ window.addEventListener("readystatechange", () => {
-+ // We initially hide the window to prevent layouts during parse. This lets us
-+ // avoid accidental XBL construction and better match browser.xul (see Bug 1497975).
-+ gBrowserInit.onBeforeInitialXULLayout();
-+ document.documentElement.removeAttribute("hidden");
-+ }, { once: true, capture: true });
-+#else
+ window.addEventListener("MozBeforeInitialXULLayout",
+ gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true });
-+#endif
++
+ // The listener of DOMContentLoaded must be set on window, rather than
+ // document, because the window can go away before the event is fired.
+ // In that case, we don't want to initialize anything, otherwise we
@@ -244,7 +232,8 @@ new file mode 100644
+
+ <!-- for search and content formfill/pw manager -->
+
-+ <panel type="autocomplete-richlistbox"
++ <panel is="autocomplete-richlistbox-popup"
++ type="autocomplete-richlistbox"
+ id="PopupAutoComplete"
+ role="group"
+ noautofocus="true"
@@ -254,7 +243,8 @@ new file mode 100644
+ nomaxresults="true" />
+
+ <!-- for search with one-off buttons -->
-+ <panel type="autocomplete-richlistbox"
++ <panel is="search-autocomplete-richlistbox-popup"
++ type="autocomplete-richlistbox"
+ id="PopupSearchAutoComplete"
+ role="group"
+ noautofocus="true"
@@ -270,27 +260,6 @@ new file mode 100644
+ level="parent"
+ overflowpadding="15" />
+
-+ <!-- for url bar autocomplete -->
-+ <panel id="urlbar-results"
-+ role="group"
-+ noautofocus="true"
-+ hidden="true"
-+ flip="none"
-+ consumeoutsideclicks="never"
-+ norolluponanchor="true"
-+ level="parent">
-+ <html:div class="urlbarView-body-outer">
-+ <html:div class="urlbarView-body-inner">
-+ <!-- TODO: add search suggestions notification -->
-+ <html:div class="urlbarView-results"/>
-+ </html:div>
-+ </html:div>
-+ <hbox class="search-one-offs"
-+ compact="true"
-+ includecurrentengine="true"
-+ disabletab="true"/>
-+ </panel>
-+
+ <!-- for date/time picker. consumeoutsideclicks is set to never, so that
+ clicks on the anchored input box are never consumed. -->
+ <panel id="DateTimePickerPanel"
@@ -581,6 +550,8 @@ new file mode 100644
+ position="bottomcenter topright"
+ tabspecific="true"
+ noautofocus="true"
++ pinTab-title="&pinTab.label;"
++ unpinTab-title="&unpinTab.label;"
+ pocket-title="&saveToPocketCmd.label;"
+ copyURL-title="&pageAction.copyLink.label;"
+ emailLink-title="&emailPageCmd.label;"
@@ -607,9 +578,12 @@ new file mode 100644
+ tabspecific="true"
+ noautofocus="true">
+ <hbox id="confirmation-hint-checkmark-animation-container">
-+ <image id="confirmation-hint-checkmark-image"/>
++ <image id="confirmation-hint-checkmark-image"/>
+ </hbox>
-+ <label id="confirmation-hint-message"/>
++ <vbox id="confirmation-hint-message-container">
++ <label id="confirmation-hint-message"/>
++ <label id="confirmation-hint-description"/>
++ </vbox>
+ </panel>
+
+ <menupopup id="pageActionContextMenu"
@@ -843,6 +817,7 @@ new file mode 100644
+ overflowpanel="widget-overflow"
+ context="toolbar-context-menu">
+
++ <toolbartabstop/>
+ <hbox id="nav-bar-customization-target" flex="1">
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&backCmd.label;"
@@ -896,11 +871,13 @@ new file mode 100644
+ <toolbaritem id="urlbar-container" flex="400" persist="width"
+ removable="false"
+ class="chromeclass-location" overflows="false">
++ <toolbartabstop/>
+ <textbox id="urlbar" flex="1"
+ placeholder="&urlbar.placeholder2;"
+ defaultPlaceholder="&urlbar.placeholder2;"
+ focused="true"
+ type="autocomplete"
++ quantumbar="false"
+ autocompletesearch="unifiedcomplete"
+ autocompletesearchparam="enable-actions"
+ autocompletepopup="PopupAutoCompleteRichResult"
@@ -1015,6 +992,7 @@ new file mode 100644
+ <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
+ </box>
+ <hbox id="page-action-buttons" context="pageActionContextMenu">
++ <toolbartabstop/>
+ <hbox id="contextual-feature-recommendation" role="button" hidden="true">
+ <hbox id="cfr-label-container">
+ <label id="cfr-label"/>
@@ -1072,6 +1050,7 @@ new file mode 100644
+ </hbox>
+ </hbox>
+ </textbox>
++ <toolbartabstop/>
+ </toolbaritem>
+
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
@@ -1083,6 +1062,7 @@ new file mode 100644
+ class="toolbarbutton-1 chromeclass-toolbar-additional badged-button"
+ key="key_openDownloads"
+ onmousedown="DownloadsIndicatorView.onCommand(event);"
++ onkeypress="DownloadsIndicatorView.onCommand(event);"
+ ondrop="DownloadsIndicatorView.onDrop(event);"
+ ondragover="DownloadsIndicatorView.onDragOver(event);"
+ ondragenter="DownloadsIndicatorView.onDragOver(event);"
@@ -1115,6 +1095,19 @@ new file mode 100644
+ tooltiptext="&libraryButton.tooltip;"
+ label="&places.library.title;"/>
+
++ <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 badged-button chromeclass-toolbar-additional subviewbutton-nav"
++ onmousedown="gSync.toggleAccountPanel('PanelUI-fxa', event)"
++ onkeypress="gSync.toggleAccountPanel('PanelUI-fxa', event)"
++ consumeanchor="fxa-toolbar-menu-button"
++ closemenu="none"
++ label="&fxa.menu.firefoxAccount;"
++ tooltiptext="&fxa.menu.firefoxAccount;"
++ cui-areatype="toolbar"
++ removable="true">
++ <vbox>
++ <image id="fxa-avatar-image"/>
++ </vbox>
++ </toolbarbutton>
+ </hbox>
+
+ <toolbarbutton id="nav-bar-overflow-button"
@@ -1167,6 +1160,7 @@ new file mode 100644
+ toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
+ collapsed="true"
+ customizable="true">
++ <toolbartabstop skipintoolbarset="true"/>
+ <toolbaritem id="personal-bookmarks"
+ title="&bookmarksToolbarItem.label;"
+ cui-areatype="toolbar"
@@ -1336,7 +1330,9 @@ new file mode 100644
+ align="center"
+ flex="100"
+ persist="width">
++ <toolbartabstop/>
+ <searchbar id="searchbar" flex="1"/>
++ <toolbartabstop/>
+ </toolbaritem>
+ </toolbarpalette>
+ </toolbox>
@@ -1436,70 +1432,10 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
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/build/nsModule.cpp b/browser/components/build/nsModule.cpp
---- a/browser/components/build/nsModule.cpp
-+++ b/browser/components/build/nsModule.cpp
-@@ -8,17 +8,17 @@
- #include "nsBrowserCompsCID.h"
- #include "DirectoryProvider.h"
-
- #if defined(XP_WIN)
- # include "nsWindowsShellService.h"
- #elif defined(XP_MACOSX)
- # include "nsMacShellService.h"
- #elif defined(MOZ_WIDGET_GTK)
--# include "nsGNOMEShellService.h"
-+# include "nsUnixShellService.h"
- #endif
- #include "nsIToolkitShellService.h"
-
- #if defined(MOZ_WIDGET_COCOA)
- # include "nsMacAttribution.h"
- #endif
-
- #if defined(XP_WIN)
-@@ -34,18 +34,16 @@ using namespace mozilla::browser;
-
- /////////////////////////////////////////////////////////////////////////////
-
- NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
- #if defined(XP_WIN)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
- #elif defined(XP_MACOSX)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
--#elif defined(MOZ_WIDGET_GTK)
--NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
- #endif
-
- #if defined(MOZ_WIDGET_COCOA)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacAttributionService)
- #endif
-
- #if defined(XP_WIN)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
-@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_MACATTRIBUTIONSER
- #endif
-
- static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
- // clang-format off
- { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
- #if defined(XP_WIN)
- { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor },
- #elif defined(MOZ_WIDGET_GTK)
-- { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor },
-+ { &kNS_SHELLSERVICE_CID, false, nullptr, nsUnixShellServiceConstructor },
- #elif defined(XP_MACOSX)
- { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
- #endif
- { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create },
- #if defined(XP_WIN)
- { &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor },
- #endif
- #if defined(MOZ_WIDGET_COCOA)
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
-@@ -289,16 +289,23 @@ var gMainPane = {
+@@ -288,16 +288,23 @@ var gMainPane = {
this._backoffIndex++ : backoffTimes.length - 1]);
};
@@ -1523,7 +1459,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
this.updateDefaultPerformanceSettingsPref();
-@@ -1021,16 +1028,27 @@ var gMainPane = {
+@@ -1025,16 +1032,27 @@ var gMainPane = {
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
this._backoffIndex = 0;
@@ -1815,7 +1751,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
-@@ -452,16 +452,18 @@
+@@ -286,16 +286,18 @@
@RESPATH@/browser/defaults/settings/pinning
@RESPATH@/browser/defaults/settings/main
diff --git a/firefox.spec b/firefox.spec
index 03fc0b3..f35ba65 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -236,7 +236,7 @@ Name: firefox
Epoch: 0
# IMPORTANT: When updating, you MUST also update the l10n files by running
# download.sh after editing the version number
-Version: 66.0.5
+Version: 67.0
Release: 1
License: MPLv1+
Group: Networking/WWW
@@ -268,9 +268,8 @@ Source100: firefox.rpmlintrc
)
}
# Patches for kde integration of FF from http://www.rosenauer.org/hg/mozilla/
-Patch11: firefox-66.0-kde.patch
-Patch12: mozilla-66.0-kde.patch
-Patch42: mozilla-42.0-libproxy.patch
+Patch11: firefox-67.0-kde.patch
+Patch12: mozilla-67.0-kde.patch
# from fedora - fix for app chooser
#Patch43: rhbz-1291190-appchooser-crash.patch
@@ -326,7 +325,7 @@ BuildRequires: pkgconfig(libpng) >= 1.6.34
BuildRequires: pkgconfig(libproxy-1.0)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libstartup-notification-1.0)
-BuildRequires: pkgconfig(nspr) >= 4.19.0
+BuildRequires: pkgconfig(nspr) >= 4.21.0
BuildRequires: pkgconfig(nss) >= 3.41
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(opus)
diff --git a/mozilla-42.0-libproxy.patch b/mozilla-42.0-libproxy.patch
deleted file mode 100644
index b2dc207..0000000
--- a/mozilla-42.0-libproxy.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- firefox-47.0/toolkit/system/unixproxy/nsLibProxySettings.cpp.0042~ 2016-06-07 15:05:15.236231597 +0200
-+++ firefox-47.0/toolkit/system/unixproxy/nsLibProxySettings.cpp 2016-06-07 15:05:52.723025518 +0200
-@@ -7,6 +7,7 @@
- #include "mozilla/ModuleUtils.h"
- #include "nsIServiceManager.h"
- #include "nsIURI.h"
-+#include "nsNetCID.h"
- #include "nsString.h"
- #include "nsCOMPtr.h"
- #include "nsNetCID.h"
diff --git a/mozilla-66.0-kde.patch b/mozilla-67.0-kde.patch
similarity index 97%
rename from mozilla-66.0-kde.patch
rename to mozilla-67.0-kde.patch
index 9e86ba4..ba80c56 100644
--- a/mozilla-66.0-kde.patch
+++ b/mozilla-67.0-kde.patch
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent f55e33a10c2a23625826ef6f8dbe18d5a455d29e
+# Parent cafacdb0b7c50666e5dcc927684a23e8733206a5
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
#ifdef XP_WIN
# include "windows.h"
#endif
-@@ -4467,25 +4468,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4493,25 +4494,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
// application pref files for backwards compatibility.
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -65,7 +65,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.
-@@ -4533,17 +4546,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4559,17 +4572,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
}
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -97,21 +97,21 @@ diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
]
+LOCAL_INCLUDES += [
-+ '/toolkit/xre'
++ '/toolkit/xre'
+]
+
+ XPCOM_MANIFESTS += [
+ 'components.conf',
+ ]
+
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
- DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
- DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
- if CONFIG['MOZ_ENABLE_WEBRENDER']:
- DEFINES['MOZ_ENABLE_WEBRENDER'] = True
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
--- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/python/mozbuild/mozpack/chrome/flags.py
-@@ -220,16 +220,17 @@ class Flags(OrderedDict):
+@@ -223,16 +223,17 @@ class Flags(OrderedDict):
'contentaccessible': Flag,
'os': StringFlag,
'osversion': VersionFlag,
@@ -153,7 +153,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
-@@ -41,10 +41,14 @@ EXTRA_JS_MODULES += [
+@@ -41,10 +41,14 @@ XPCOM_MANIFESTS += [
if CONFIG['MOZ_PLACES']:
EXTRA_JS_MODULES += [
@@ -171,25 +171,25 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -65,16 +65,18 @@ toolkit.jar:
+@@ -63,16 +63,18 @@ toolkit.jar:
+ content/global/widgets.css
+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/button.xml (widgets/button.xml)
content/global/bindings/calendar.js (widgets/calendar.js)
- content/global/bindings/checkbox.xml (widgets/checkbox.xml)
content/global/bindings/datekeeper.js (widgets/datekeeper.js)
content/global/bindings/datepicker.js (widgets/datepicker.js)
- content/global/bindings/datetimebox.xml (widgets/datetimebox.xml)
content/global/bindings/datetimebox.css (widgets/datetimebox.css)
* content/global/bindings/dialog.xml (widgets/dialog.xml)
+* 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/menulist.xml (widgets/menulist.xml)
- content/global/bindings/notification.xml (widgets/notification.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)
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
new file mode 100644
--- /dev/null
@@ -702,10 +702,10 @@ new file mode 100644
+ </binding>
+
+</bindings>
-diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
---- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
-+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
-@@ -1033,30 +1033,60 @@ nsUnknownContentTypeDialog.prototype = {
+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 = {
if (params.handlerApp &&
params.handlerApp.executable &&
@@ -794,14 +794,14 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
#include "nsIURI.h"
+#include "nsKDEUtils.h"
+ using namespace mozilla;
+
class nsUnixSystemProxySettings final : public nsISystemProxySettings {
public:
NS_DECL_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS
- nsUnixSystemProxySettings() : mSchemeProxySettings(4) {}
- nsresult Init();
-@@ -42,16 +43,18 @@ class nsUnixSystemProxySettings final :
+@@ -44,16 +45,18 @@ class nsUnixSystemProxySettings final :
nsACString& aResult);
nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost,
int32_t aPort, nsACString& aResult);
@@ -820,7 +820,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
-@@ -488,16 +491,19 @@ nsresult nsUnixSystemProxySettings::GetP
+@@ -487,22 +490,51 @@ nsresult nsUnixSystemProxySettings::GetP
return NS_OK;
}
@@ -840,16 +840,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);
}
-@@ -521,8 +527,34 @@ static const mozilla::Module::CIDEntry k
- static const mozilla::Module::ContractIDEntry kUnixProxyContracts[] = {
- {NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_UNIXSYSTEMPROXYSERVICE_CID},
- {nullptr}};
-
- static const mozilla::Module kUnixProxyModule = {
- mozilla::Module::kVersion, kUnixProxyCIDs, kUnixProxyContracts};
- NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
-+
+nsresult
+nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,
+ const nsACString& aHost,
@@ -875,10 +866,16 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
+ return NS_OK;
+}
+
++
+ NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {
+ auto result = MakeRefPtr<nsUnixSystemProxySettings>();
+ result->Init();
+ return result.forget().downcast<nsISupports>();
+ }
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
-@@ -81,17 +81,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -83,17 +83,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
'../components/printingui',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
@@ -897,7 +894,7 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
'nsNativeAppSupportDefault.cpp',
]
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+ if CONFIG['MOZ_HAS_REMOTE']:
diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
new file mode 100644
--- /dev/null
@@ -1343,7 +1340,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
-@@ -76,17 +76,19 @@ else:
+@@ -80,17 +80,19 @@ else:
SOURCES += [
osdir + '/nsOSHelperAppService.cpp',
]
@@ -1363,7 +1360,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
'android/nsExternalURLHandlerService.cpp',
'android/nsMIMEInfoAndroid.cpp',
]
-@@ -120,16 +122,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -130,16 +132,17 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
@@ -1797,7 +1794,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
-@@ -116,16 +116,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -121,16 +121,17 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
@@ -1914,7 +1911,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -571,16 +598,240 @@ void nsFilePicker::Done(void *file_choos
+@@ -572,16 +599,240 @@ void nsFilePicker::Done(void *file_choos
mCallback->Done(result);
mCallback = nullptr;
} else {
@@ -2315,7 +2312,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
-@@ -44,12 +44,13 @@ LOCAL_INCLUDES += [
+@@ -66,14 +66,15 @@ LOCAL_INCLUDES += [
'!..',
'../base',
'../build',
@@ -2329,6 +2326,8 @@ 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')
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp