$ git diff --patch-with-stat --summary 9ee0eaa52875c36e2b4201e1d434352aff64b485..f14fbc0e042e53a14fb771ac5cb49992c03cb630
.abf.yml | 155 +++++++++++------------
firefox-65.0-kde.patch => firefox-66.0-kde.patch | 108 +++++++++-------
firefox.spec | 14 +-
mozilla-65.0-kde.patch => mozilla-66.0-kde.patch | 104 +++++++++------
4 files changed, 214 insertions(+), 167 deletions(-)
rename firefox-65.0-kde.patch => firefox-66.0-kde.patch (97%)
rename mozilla-65.0-kde.patch => mozilla-66.0-kde.patch (96%)
diff --git a/.abf.yml b/.abf.yml
index 15e5d0d..93dca55 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,80 +1,79 @@
sources:
- af.xpi: a5cbd51aaaabc6392761f1f96448b220a03567d2
- ar.xpi: 0863386e81128714c58ddcdde616bc6d9a182b0f
- as.xpi: 1df2ff9a625ceeb6dfcd8b20b23d8bfdcb062d1f
- ast.xpi: ef71fbd0784a66e33726825169aab34a014fba23
+ af.xpi: 712981a0c1305dd3461a7b568d2c099f6fd3ec75
+ ar.xpi: 49a10274bf59078bb51dd7a5349c7df426f4e2d5
+ as.xpi: cb10626a83868e48666c7fce48d80e5a128511a9
+ ast.xpi: 3c76f1846158ec4acd5a46b8fe8a8df50f941acd
autoconf-2.13.tar.gz: e4826c8bd85325067818f19b2b2ad2b625da66fc
- bg.xpi: a6c841bb78e8eb6fad5c9c392ac0af8b7ab8c693
- bn-BD.xpi: 9b0dd824e99140ae8a6689484ddff3cf3b2799aa
- bn-IN.xpi: dba64910b747cf8846397c734d6e711bdd4a4e5a
- br.xpi: 4630649e6b20ba0878cb288b70ed8614f474ec63
- bs.xpi: 2b042d68ffd8076ef299341d053b98c07538b1d6
- ca.xpi: bc009949a5ec500e055d783d3168c5947c1df9a5
- cbindgen-vendor.tar.xz: 7efa6255e73d8e3c9dc674822d2e29ebc0e3391b
- cs.xpi: 08f9e2967ad4f118f7f54c3f746eb85934c2585f
- cy.xpi: d92bf46b047df6adef4da0252f0cf4d99edc4018
- da.xpi: ce35906574ffb2d7f489f4d193699a42b650c84c
- de.xpi: 56842156886b4ddf2c143218c4e42bff1f2d9084
- el.xpi: 9e8845e059324dc7d8a299a3ffc74aa7bd83fb34
- en-GB.xpi: a6b9c14b5b054ab47d2a5b29f1a6c554359b349d
- en-ZA.xpi: a3e7f3bb018df7c0e031a1d4100a811914dbef0f
- eo.xpi: e230c75538a8f5ab87e75f85fcd2bf6bcf7698e1
- es-AR.xpi: 5e6e4926b7353cf44250ba74f75260734bdbd249
- es-CL.xpi: aa2a8d5f1b2514433eb9a2b5bfd0ff9f37a53722
- es-ES.xpi: c733e3e94abe1b149491fb54b956fddbbdb3d6f8
- es-MX.xpi: 82f34441a65403b3d7859437adead3ac5f58b2fd
- et.xpi: 01272f546793f9310d4da755421bdc1de4f2ece3
- eu.xpi: 624bddd00336c8846c3d89b518d383c29e582da9
- fa.xpi: 0971ee1f5dcb97eddedeb92941ac88e264de68bf
- fi.xpi: 33f1cbeda25dd879cc86915afbf2fb382e6f81ed
- firefox-65.0.1.source.tar.xz: 5b3a64d5c843f4e23cb3220a3211077bc58cba34
- firefox-65.0.source.tar.xz: fb79c84b58da18ca9248058c68b95bbcea829512
- fr.xpi: effb669cc5093966830655a47383d40dfce897bc
- fy-NL.xpi: 6f3382affbc18b2b0a4f45edcdebb50a7c2a05f5
- ga-IE.xpi: 0323d16420371505b6bc69168a7a2bd6caa9b285
- gd.xpi: d4a12583da9fd56cba78115d7bf74f532879c8c6
- gl.xpi: 0e9136eab729c157f8734029da8a1c53e9d58884
- gu-IN.xpi: b0705750302ddec61fe918bebba4667ebbdc09ee
- he.xpi: 15b747dbc9fcb4e68a00f9f970f16712812ffb3e
- hi-IN.xpi: 21842e3646b7fe9a89caeff380ba2391ede0ed79
- hr.xpi: 9bb8e9dd4181ff8a62aa04f42fd13ce46b7345ed
- hu.xpi: 596db010fa0d39e76b6d17f592c94f8b03ba9efc
- hy-AM.xpi: dca128d25041e663dcb0f7ce6a11d181760aeb58
- id.xpi: 555c295be9a000f9d1b593b70ed971eadf5be40d
- is.xpi: 689a42ae81c214a355da0926f448f0f74b8812ea
- it.xpi: 11b62e6b9fd5c68ebdee37ba475b1989e5b9fc27
- ja.xpi: 676dbc7c6dd6bfe3ed3641ea18ddfac99e4ce7ba
- kk.xpi: 1896b609b91fd1ac1cb6b8c84c4aa340795b3001
- km.xpi: be5822020f42648de7040f01d0047dac357da618
- kn.xpi: 8b3b88825c2d7d79053df69d0a4d2ed5c6397f7a
- ko.xpi: b5be71260f1969841fd35a53f98fa9dfec723ea3
- lt.xpi: e357018e151ed5c746e3c48496c44e63990bcda6
- lv.xpi: f57e9e9e15d9acf0c2176f007500311a14083e4d
- mai.xpi: b8170ecc99ee3e1d3ae7ecbd4547d9da3343569d
- mk.xpi: 99330e10e350c1541dc97d673cf987c758b9c894
- ml.xpi: c2fab30038ff5258da13f9e5e85455f626a881b5
- mr.xpi: 62b91ff8f4b08f0098319d05653c5640e30e9f20
- nb-NO.xpi: f2899dffffcef6b32c33e46968b7ed50cd0ac608
- nl.xpi: 37c198595ebf40600a14f32393d23b9d71c71fa3
- nn-NO.xpi: 1ef4462aeaadc6b26a29f63938a0f501e4f690cd
- or.xpi: 5c0f55b95191b6618a27f2d1b1fe083e208ae748
- pa-IN.xpi: 45637ce8984fb691df95423fc96d0b3947a853e7
- pl.xpi: d148ee255c07195247319c87f16709b9b784841e
- pt-BR.xpi: d8e022dafdb7a7dcdd0a26aca8689aa8b7bdd153
- pt-PT.xpi: 662e22dd706cc6e90dbe49cdc434655133fed9ad
- ro.xpi: 6e228f777b3954d5042fb62d90ba34d4cf99ebd7
- ru.xpi: 8f9313ff0e9467beded72d6948574ac63ee4c961
- si.xpi: 6bbe4945e73968f4bcef91ce8598df5771ae085a
- sk.xpi: 6c761769b9d030dccadfdd1bf31e6e449fcbb1ff
- sl.xpi: 265bc8abb364a98663fad0987e6da532bb5c6899
- sq.xpi: 40e16d9af7e92bb5baddb8098f53d31ab26bc94d
- sr.xpi: b4860293a3f259268158ec8ec8d05ab0ad360de0
- sv-SE.xpi: ca83a565a784453e97e6c8119f91d64660668368
- ta.xpi: ca580a7a457fd2b019f57979db612bb1a38edcf4
- te.xpi: be6ae2f941e0aabb2d1e0c363f8108533fa8161d
- th.xpi: 7f1396f4fb40741861766762fd4e34dc9f467c17
- tr.xpi: 7450de73bdec49db1dc2e78f51d407b1d00d14a8
- uk.xpi: 7719d29aeb733cddd25f07a247eb8af6fd694973
- vi.xpi: 64a51b0f37c55b09d8c28f17ff2c2e86b194e7ae
- zh-CN.xpi: ddb5d833a4e4eab5f3fc1b47ea4c2fb214bef0c7
- zh-TW.xpi: 24bb91df32696ed1ff4fc61dfec36a34bd963623
+ bg.xpi: 606cb0e0325471fadf6de609c8f9d8c8800507bc
+ bn-BD.xpi: b069039b887943928c253afc215b9de6e45ff067
+ bn-IN.xpi: 916787efd3ab747cf8f4c5a1edabde935fbfb51b
+ br.xpi: 0b401ac4059fb4cc2e227cdd66a3000fff522467
+ bs.xpi: 00302932f2a9a2fc19a6f918724e1bb38e4d44e9
+ ca.xpi: aafe9787198d4ff1994afcb02b536543452db562
+ cbindgen-vendor.tar.xz: 4be157dcf0eec0ad6e1bc333c15b3dc84a12d78b
+ cs.xpi: 5ca8007362fe428ec39ac295c7f600402e176992
+ cy.xpi: adea98f473e2a96890820219b149e8ec6b600350
+ da.xpi: ae3b9b5815b31d66f5e4cc1f85a7b38bfeecea2f
+ de.xpi: 7245ae9a8e751d0ab23f0029e06af94b70852d95
+ el.xpi: 1180cb0f3789b30a574fd735f7c18f5dc7bb2fc4
+ en-GB.xpi: 3b194ee8759f2931a8920d147ab5e94b9fad89ff
+ en-ZA.xpi: 898c04bd3f7f5694cdfef1839672ae92c7389f83
+ eo.xpi: c9d9454d57b385679aba068de449303e7513c78d
+ es-AR.xpi: de9e619621c9ef08eee1d41ac8d0f18582b62393
+ es-CL.xpi: 70dacee3427a902dd93d16d4fa34e7478cc77222
+ es-ES.xpi: 100fb0ae4a303c7235660fa7d9bdd57b1b770805
+ es-MX.xpi: b9cc8a9143472ea40e357e3ba7d602ce481527ac
+ et.xpi: d79207d8536a04b6bc53ca54e04e767d20564e03
+ eu.xpi: 4050f32b362f6465751fd4e03e86c601086e974c
+ fa.xpi: 61a56b77c34e86211edc480e3034cd972f488e21
+ fi.xpi: abb92d2625f242bc984e3228a53d05a2a23634e9
+ firefox-66.0.2.source.tar.xz: e54ee04bbe2bdda29a8f56009cd2851d97f63f1e
+ fr.xpi: fcaeff7879f35dbe91267e4459d62747147d7d8e
+ fy-NL.xpi: e7bd2ce1f8a0de1fb128a193348fc05104080a28
+ ga-IE.xpi: 3bfc3af3e0cc6ae74697a8992c1718cfadda7d98
+ gd.xpi: 564303fef0860e68b9da49fd1e151cba6234f795
+ gl.xpi: b3f9f27a379dccd310961b4623e4d353c89c6baa
+ gu-IN.xpi: a7e945efedd969dd30075b17297d91c5e8855e71
+ he.xpi: 896d02929c78f202069e0bf9e796a14a6aa0bd0c
+ hi-IN.xpi: dee0f6d44c6cad414027ce49ebc2eae2a5eb542e
+ hr.xpi: 9d5bf27c3abdbddfc060293f366c64efd0e5ee46
+ hu.xpi: 3a62204a0b0413076f3ba23632020f42bc90b9dc
+ hy-AM.xpi: 2c793a1c689b551db7dd3a524eaca92e22a82dd8
+ id.xpi: 27c91c5f0232fbf86945e193bd08a7929d5a2b0c
+ is.xpi: 9afd2686cb89ec02631dc9addc18751dd13792b6
+ it.xpi: 6b2041298ec4697a4abb251cc853586835dcc6b1
+ ja.xpi: dd8d6e9636dd55ec1870887965028ad2c48e397b
+ kk.xpi: 3304b317f4ba526ec04cfda75d06b3fdc098df00
+ km.xpi: fe1515f7fcde12800dfa705fd8ee2b4b6349df2d
+ kn.xpi: e8fe741198d804788f45c467f9a7097b4d3fbaf1
+ ko.xpi: 60a068f317fe99ffe44e57fec90f51967da69bde
+ lt.xpi: 83b1d8c6b5a0fae941cd5ea4806277e2b0060ec3
+ lv.xpi: 68f4a8a63d9fc0c0d2a3f60454eec7959e7ce904
+ mai.xpi: 03c296bf8c82f32bafd83582594045ff61d269c0
+ mk.xpi: 93137249f0eb794816bfcb568da55b7a88c3983f
+ ml.xpi: ba3f8e84db1bc50c042240c3cf8b9c20f552dac0
+ mr.xpi: 4fc61087958e663aabcad1072a3d462281013cf2
+ nb-NO.xpi: 47ad5069e4ea14c2ae4ae736c33b342ac105a3eb
+ nl.xpi: 51a1d94cc865c99dbae03d551d42b70b1e32742d
+ nn-NO.xpi: 8f13ec884a7e82af95ea894c5fb27958175a370d
+ or.xpi: 1dbe013fae7ff293388826b5dcc9274ac0e72e2e
+ pa-IN.xpi: cfc0cb5f62b073cfadf15f478ea31204c869000e
+ pl.xpi: 473182a3e841c1553e528cab27b0b9959dd78cf8
+ pt-BR.xpi: f8d3c9ef9e0d1aef96b37195cabe652b58537324
+ pt-PT.xpi: d3fc2a941c3d9a5667f33b054579d2559d6be537
+ ro.xpi: 865d003ac015c1ee62bcaad960082832ad987714
+ ru.xpi: 2b3850da98739e712fb1257107be927301c77d49
+ si.xpi: 38625658b4b7f291fb9747219d39e0d9dc9a2392
+ sk.xpi: 945ee386d83b925d8da4ebcc71ea64457ac12224
+ sl.xpi: 79cb14dfff1be882d8b529426c37ccf0b6d7fb06
+ sq.xpi: d5a9246e462339416413ef778f8871b17ff31f00
+ sr.xpi: 77f3d985da2df08f3671ffb08719b4240e60cfa8
+ sv-SE.xpi: 0ee472bf22ddab78d5702848a1c7f00ae5679f13
+ ta.xpi: eabb52abbe9855891faae7fdd36e53f673533c18
+ te.xpi: b22086e1b82e84deed43dfcc2a3434d128bbe6b2
+ th.xpi: 433bbc85598797998a40b9419d2967bb8493eb27
+ tr.xpi: 874e6b5197f763f9f69e48147450c9c2d99ca3b9
+ uk.xpi: 430c00237d76f4456dbcd0e920a8f1a7391fc877
+ vi.xpi: e8f21f84d5a435c876a21ef684ab226d52244bfb
+ zh-CN.xpi: feffad9fa11ae7f59c7d6d44d1bd4221ec5f4d6d
+ zh-TW.xpi: 77eabafacb4d6997034c3fe1e34ba95da11326e2
diff --git a/firefox-65.0-kde.patch b/firefox-66.0-kde.patch
similarity index 97%
rename from firefox-65.0-kde.patch
rename to firefox-66.0-kde.patch
index 069773e..f5af168 100644
--- a/firefox-65.0-kde.patch
+++ b/firefox-66.0-kde.patch
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent 693f0baece29cc958a7d91b89fd12e3b89a502e3
+# Parent 87262204aa945e6fce864193d103a93659bf76f6
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,1395 @@
+@@ -0,0 +1,1408 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -276,6 +276,8 @@ new file mode 100644
+ noautofocus="true"
+ hidden="true"
+ flip="none"
++ consumeoutsideclicks="never"
++ norolluponanchor="true"
+ level="parent">
+ <html:div class="urlbarView-body-outer">
+ <html:div class="urlbarView-body-inner">
@@ -579,6 +581,7 @@ new file mode 100644
+ position="bottomcenter topright"
+ tabspecific="true"
+ noautofocus="true"
++ pocket-title="&saveToPocketCmd.label;"
+ copyURL-title="&pageAction.copyLink.label;"
+ emailLink-title="&emailPageCmd.label;"
+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"
@@ -771,13 +774,11 @@ new file mode 100644
+ aria-label="&tabsToolbar.label;"
+ context="toolbar-context-menu"
+ flex="1">
-+ <vbox flex="1" class="toolbar-items">
-+ <spacer flex="1000"/>
+
-+ <hbox id="TabsToolbar-customization-target" flex="1">
-+ <hbox class="titlebar-spacer" type="pre-tabs"
-+ skipintoolbarset="true"/>
++ <hbox class="titlebar-spacer" type="pre-tabs"/>
+
++ <hbox flex="1" align="end" class="toolbar-items">
++ <hbox id="TabsToolbar-customization-target" flex="1">
+ <tabs id="tabbrowser-tabs"
+ flex="1"
+ setfocus="false"
@@ -805,19 +806,15 @@ new file mode 100644
+ label="&listAllTabs.label;"
+ tooltiptext="&listAllTabs.label;"
+ removable="false"/>
-+
-+ <hbox class="titlebar-spacer" type="post-tabs"
-+ ordinal="1000"
-+ skipintoolbarset="true"/>
+ </hbox>
-+ </vbox>
++ </hbox>
++
++ <hbox class="titlebar-spacer" type="post-tabs"/>
+
+#ifndef XP_MACOSX
+ <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
-+ ordinal="1000"
-+ aria-live="polite" skipintoolbarset="true"/>
-+ <hbox class="private-browsing-indicator" skipintoolbarset="true"
-+ ordinal="1000"/>
++ aria-live="polite"/>
++ <hbox class="private-browsing-indicator"/>
+#endif
+
+#include titlebar-items.inc.xul
@@ -1045,7 +1042,22 @@ new file mode 100644
+ class="urlbar-icon urlbar-page-action"
+ role="button"
+ tooltiptext="&pageActionButton.tooltip;"
-+ onmousedown="BrowserPageActions.mainButtonClicked(event);"/>
++ onmousedown="BrowserPageActions.mainButtonClicked(event);"
++ onkeypress="BrowserPageActions.mainButtonClicked(event);"/>
++ <hbox id="pocket-button-box"
++ hidden="true"
++ class="urlbar-icon-wrapper urlbar-page-action"
++ onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('pocket'), event, this);">
++ <image id="pocket-button"
++ class="urlbar-icon"
++ tooltiptext="&pocketButton.tooltiptext;"
++ role="button"/>
++ <hbox id="pocket-button-animatable-box">
++ <image id="pocket-button-animatable-image"
++ tooltiptext="&pocketButton.tooltiptext;"
++ role="presentation"/>
++ </hbox>
++ </hbox>
+ <hbox id="star-button-box"
+ hidden="true"
+ class="urlbar-icon-wrapper urlbar-page-action"
@@ -1097,6 +1109,7 @@ new file mode 100644
+ <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
+ removable="true"
+ onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);"
++ onkeypress="PanelUI.showSubView('appMenu-libraryView', this, event);"
+ closemenu="none"
+ cui-areatype="toolbar"
+ tooltiptext="&libraryButton.tooltip;"
@@ -1431,21 +1444,21 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
#include "DirectoryProvider.h"
#if defined(XP_WIN)
- #include "nsWindowsShellService.h"
+ # include "nsWindowsShellService.h"
#elif defined(XP_MACOSX)
- #include "nsMacShellService.h"
+ # include "nsMacShellService.h"
#elif defined(MOZ_WIDGET_GTK)
--#include "nsGNOMEShellService.h"
-+#include "nsUnixShellService.h"
+-# include "nsGNOMEShellService.h"
++# include "nsUnixShellService.h"
#endif
+ #include "nsIToolkitShellService.h"
#if defined(MOZ_WIDGET_COCOA)
- #include "nsMacAttribution.h"
+ # include "nsMacAttribution.h"
#endif
#if defined(XP_WIN)
- #include "nsIEHistoryEnumerator.h"
-@@ -33,18 +33,16 @@ using namespace mozilla::browser;
+@@ -34,18 +34,16 @@ using namespace mozilla::browser;
/////////////////////////////////////////////////////////////////////////////
@@ -1464,7 +1477,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
#if defined(XP_WIN)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
-@@ -67,17 +65,17 @@ NS_DEFINE_NAMED_CID(NS_MACATTRIBUTIONSER
+@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_MACATTRIBUTIONSER
#endif
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
@@ -1475,12 +1488,12 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
#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 },
- #elif defined(XP_MACOSX)
- { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
#endif
#if defined(MOZ_WIDGET_COCOA)
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
@@ -1510,7 +1523,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
this.updateDefaultPerformanceSettingsPref();
-@@ -1012,16 +1019,27 @@ var gMainPane = {
+@@ -1021,16 +1028,27 @@ var gMainPane = {
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
this._backoffIndex = 0;
@@ -1541,30 +1554,30 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
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
-@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
- ]
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- SOURCES += [
- 'nsMacShellService.cpp',
+@@ -29,16 +29,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+ XPIDL_SOURCES += [
+ 'nsIGNOMEShellService.idl',
+ ]
+
SOURCES += [
'nsGNOMEShellService.cpp',
+ 'nsKDEShellService.cpp',
+ 'nsUnixShellService.cpp',
]
-
- if SOURCES:
- FINAL_LIBRARY = 'browsercomps'
-
- EXTRA_JS_MODULES += [
- 'HeadlessShell.jsm',
- 'ShellService.jsm',
+ 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
-@@ -0,0 +1,153 @@
+@@ -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
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1598,13 +1611,10 @@ new file mode 100644
+NS_IMPL_ISUPPORTS(nsKDEShellService, nsIGNOMEShellService, nsIShellService)
+
+NS_IMETHODIMP
-+nsKDEShellService::IsDefaultBrowser(bool aStartupCheck,
-+ bool aForAllTypes,
++nsKDEShellService::IsDefaultBrowser(bool aForAllTypes,
+ bool* aIsDefaultBrowser)
+{
+ *aIsDefaultBrowser = false;
-+ if (aStartupCheck)
-+ mCheckedThisSession = true;
+
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
+ if (!command)
@@ -1722,7 +1732,7 @@ diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/s
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/nsKDEShellService.h
-@@ -0,0 +1,30 @@
+@@ -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
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1732,10 +1742,12 @@ new file mode 100644
+#define nskdeshellservice_h____
+
+#include "nsIGNOMEShellService.h"
++#include "nsToolkitShellService.h"
+#include "nsString.h"
+#include "mozilla/Attributes.h"
+
-+class nsKDEShellService final : public nsIGNOMEShellService
++class nsKDEShellService final : public nsIGNOMEShellService,
++ public nsToolkitShellService
+{
+public:
+ nsKDEShellService() : mCheckedThisSession(false) { }
@@ -1803,7 +1815,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
-@@ -451,16 +451,18 @@
+@@ -452,16 +452,18 @@
@RESPATH@/browser/defaults/settings/pinning
@RESPATH@/browser/defaults/settings/main
diff --git a/firefox.spec b/firefox.spec
index c6033f0..836e942 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: 65.0.1
+Version: 66.0.2
Release: 1
License: MPLv1+
Group: Networking/WWW
@@ -268,8 +268,8 @@ Source100: firefox.rpmlintrc
)
}
# Patches for kde integration of FF from http://www.rosenauer.org/hg/mozilla/
-Patch11: firefox-65.0-kde.patch
-Patch12: mozilla-65.0-kde.patch
+Patch11: firefox-66.0-kde.patch
+Patch12: mozilla-66.0-kde.patch
Patch42: mozilla-42.0-libproxy.patch
# from fedora - fix for app chooser
@@ -348,10 +348,12 @@ BuildRequires: llvm-devel
BuildRequires: valgrind
BuildRequires: pkgconfig(valgrind)
BuildRequires: yasm >= 1.0.1
+BuildRequires: nasm
%endif
BuildRequires: rust >= 1.29.0
BuildRequires: cargo >= 0.30.0
BuildRequires: nodejs >= 8.12
+BuildRequires: pkgconfig(jemalloc)
Requires: indexhtml
# fixes bug #42096
Requires: mailcap
@@ -499,7 +501,9 @@ ac_add_options --with-system-zlib
ac_add_options --with-system-libevent
ac_add_options --with-system-icu
%endif
+%if %mdvver <= 3000000
ac_add_options --with-system-libvpx
+%endif
ac_add_options --enable-system-pixman
ac_add_options --disable-gconf
ac_add_options --disable-updater
@@ -512,6 +516,8 @@ ac_add_options --enable-libproxy
ac_add_options --with-system-bz2
ac_add_options --with-system-jpeg
ac_add_options --with-system-png
+ac_add_options --enable-jemalloc
+ac_add_options --enable-replace-malloc
%if %mdvver > 3000000
ac_add_options --enable-system-sqlite
# https://bugzilla.mozilla.org/show_bug.cgi?id=1432751 - system cairo is no longer supported and will be removed
@@ -535,7 +541,7 @@ ac_add_options --disable-webrtc
%ifnarch %mips
ac_add_options --with-valgrind
%endif
-ac_add_options --with-google-api-keyfile=../google-api-key
+#ac_add_options --with-google-api-keyfile=../google-api-key
ac_add_options --enable-release
%ifarch %{x86_64} aarch64
ac_add_options --enable-rust-simd
diff --git a/mozilla-65.0-kde.patch b/mozilla-66.0-kde.patch
similarity index 96%
rename from mozilla-65.0-kde.patch
rename to mozilla-66.0-kde.patch
index 1e07967..9e86ba4 100644
--- a/mozilla-65.0-kde.patch
+++ b/mozilla-66.0-kde.patch
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent ff3da33eabc1d8760ec41a87afbaf44ded300ede
+# Parent f55e33a10c2a23625826ef6f8dbe18d5a455d29e
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -21,13 +21,13 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
+#include "nsKDEUtils.h"
#ifdef MOZ_MEMORY
- #include "mozmemory.h"
+ # include "mozmemory.h"
#endif
#ifdef XP_WIN
- #include "windows.h"
+ # include "windows.h"
#endif
-@@ -4466,25 +4467,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4467,25 +4468,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
// application pref files for backwards compatibility.
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -37,10 +37,10 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#elif defined(XP_UNIX)
"unix.js"
+ , "" // placeholder for KDE (empty is otherwise harmless)
- #if defined(_AIX)
+ # if defined(_AIX)
,
"aix.js"
- #endif
+ # endif
#elif defined(XP_BEOS)
"beos.js"
#endif
@@ -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.
-@@ -4532,17 +4545,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
+@@ -4533,17 +4546,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co
}
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -171,12 +171,12 @@ 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
-@@ -67,16 +67,18 @@ toolkit.jar:
+@@ -65,16 +65,18 @@ toolkit.jar:
+ 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/datetimepopup.xml (widgets/datetimepopup.xml)
content/global/bindings/datetimebox.xml (widgets/datetimebox.xml)
content/global/bindings/datetimebox.css (widgets/datetimebox.css)
* content/global/bindings/dialog.xml (widgets/dialog.xml)
@@ -186,15 +186,15 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
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/numberbox.xml (widgets/numberbox.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)
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,477 @@
+@@ -0,0 +1,507 @@
+<?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
@@ -229,7 +229,7 @@ new file mode 100644
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
+#elif XP_UNIX
+ >
-+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
++ <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+ <xul:spacer anonid="spacer" flex="1"/>
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
@@ -266,6 +266,11 @@ new file mode 100644
+ event.preventDefault();
+ })</field>
+
++ <!-- Gets populated by elements that are passed to document.l10n.setAttributes
++ to localize the dialog buttons. Needed to properly size the dialog after
++ the asynchronous translation. -->
++ <field name="_l10nButtons">[]</field>
++
+ <property name="buttons"
+ onget="return this.getAttribute('buttons');"
+ onset="this._configureButtons(val); return val;"/>
@@ -365,16 +370,32 @@ new file mode 100644
+ this._configureButtons(this.buttons);
+
+ // listen for when window is closed via native close buttons
-+ window.addEventListener("close", this._closeHandler);
++ window.addEventListener("close", this);
+
+ // for things that we need to initialize after onload fires
-+ window.addEventListener("load", this.postLoadInit);
++ window.addEventListener("load", this);
+
+ window.moveToAlertPosition = this.moveToAlertPosition;
+ window.centerWindowOnScreen = this.centerWindowOnScreen;
+ ]]>
+ </constructor>
+
++ <method name="handleEvent">
++ <parameter name="aEvent"/>
++ <body><![CDATA[
++ switch (aEvent.type) {
++ case "close": {
++ this._closeHandler(aEvent);
++ break;
++ }
++ case "load": {
++ this.postLoadInit(aEvent);
++ break;
++ }
++ }
++ ]]></body>
++ </method>
++
+ <method name="postLoadInit">
+ <parameter name="aEvent"/>
+ <body>
@@ -422,6 +443,12 @@ new file mode 100644
+
+ // Give focus after onload completes, see bug 103197.
+ setTimeout(focusInit, 0);
++
++ if (this._l10nButtons.length) {
++ document.l10n.translateElements(this._l10nButtons).then(() => {
++ window.sizeToContent();
++ });
++ }
+ ]]>
+ </body>
+ </method>
@@ -490,13 +517,14 @@ new file mode 100644
+ button.setAttribute("label", this.getAttribute("buttonlabel" + dlgtype));
+ if (this.hasAttribute("buttonaccesskey" + dlgtype))
+ button.setAttribute("accesskey", this.getAttribute("buttonaccesskey" + dlgtype));
++ } else if (this.hasAttribute("buttonid" + dlgtype)) {
++ document.l10n.setAttributes(button, this.getAttribute("buttonid" + dlgtype));
++ this._l10nButtons.push(button);
+ } else if (dlgtype != "extra1" && dlgtype != "extra2") {
+ button.setAttribute("label", this.mStrBundle.GetStringFromName("button-" + dlgtype));
+ var accessKey = this.mStrBundle.GetStringFromName("accesskey-" + dlgtype);
+ if (accessKey)
+ button.setAttribute("accesskey", accessKey);
-+ } else if (this.hasAttribute("buttonid" + dlgtype)) {
-+ document.l10n.setAttributes(button, this.getAttribute("buttonid" + dlgtype));
+ }
+ }
+ // allow specifying alternate icons in the dialog header
@@ -664,7 +692,9 @@ new file mode 100644
+ <handler event="focus" phase="capturing">
+ var btn = this.getButton(this.defaultButton);
+ if (btn)
-+ btn.setAttribute("default", event.originalTarget == btn || !(event.originalTarget instanceof Ci.nsIDOMXULButtonElement));
++ btn.setAttribute("default", event.originalTarget == btn ||
++ !(event.originalTarget.localName == "button" ||
++ event.originalTarget.localName == "toolbarbutton"));
+ </handler>
+#endif
+ </handlers>
@@ -675,7 +705,7 @@ new file mode 100644
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
-@@ -1030,30 +1030,60 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1033,30 +1033,60 @@ nsUnknownContentTypeDialog.prototype = {
if (params.handlerApp &&
params.handlerApp.executable &&
@@ -848,7 +878,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
-@@ -73,17 +73,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -81,17 +81,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
'../components/printingui',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
@@ -1281,8 +1311,8 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
#include "ContentHandlerService.h"
#include "nsStringEnumerator.h"
#ifdef MOZ_WIDGET_GTK
--#include "unix/nsGNOMERegistry.h"
-+#include "unix/nsCommonRegistry.h"
+-# include "unix/nsGNOMERegistry.h"
++# include "unix/nsCommonRegistry.h"
#endif
using mozilla::dom::ContentHandlerService;
@@ -1591,7 +1621,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
#include "nsIIOService.h"
#include "nsAutoPtr.h"
#ifdef MOZ_ENABLE_DBUS
- #include "nsDBusHandlerApp.h"
+ # include "nsDBusHandlerApp.h"
#endif
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
+#include "nsKDEUtils.h"
@@ -1678,8 +1708,8 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
#include "nsOSHelperAppService.h"
#include "nsMIMEInfoUnix.h"
#ifdef MOZ_WIDGET_GTK
--#include "nsGNOMERegistry.h"
-+#include "nsCommonRegistry.h"
+-# include "nsGNOMERegistry.h"
++# include "nsCommonRegistry.h"
#endif
#include "nsISupports.h"
#include "nsString.h"
@@ -1688,7 +1718,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
#include "nsIURL.h"
#include "nsIFileStreams.h"
#include "nsILineInputStream.h"
-@@ -1031,17 +1031,17 @@ nsresult nsOSHelperAppService::GetHandle
+@@ -1025,17 +1025,17 @@ nsresult nsOSHelperAppService::GetHandle
nsresult nsOSHelperAppService::OSProtocolHandlerExists(
const char* aProtocolScheme, bool* aHandlerExists) {
@@ -1707,7 +1737,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
nsCOMPtr<nsIHandlerService> handlerSvc =
do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv) && handlerSvc) {
-@@ -1051,17 +1051,17 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1045,17 +1045,17 @@ nsresult nsOSHelperAppService::OSProtoco
}
return rv;
@@ -1726,7 +1756,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
nsresult nsOSHelperAppService::GetFileTokenForPath(
const char16_t* platformAppPath, nsIFile** aFile) {
-@@ -1142,17 +1142,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1136,17 +1136,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
nsresult rv =
LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
minorType, mime_types_description, true);
@@ -1745,7 +1775,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
minorType, mime_types_description, false);
-@@ -1254,17 +1254,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1248,17 +1248,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
// Now look up our extensions
nsAutoString extensions, mime_types_description;
@@ -2201,15 +2231,15 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
nsAutoString osVersion;
+ nsAutoString desktop;
#if defined(XP_WIN)
- #pragma warning(push)
- #pragma warning(disable : 4996) // VC12+ deprecates GetVersionEx
+ # pragma warning(push)
+ # pragma warning(disable : 4996) // VC12+ deprecates GetVersionEx
OSVERSIONINFO info = {sizeof(OSVERSIONINFO)};
if (GetVersionEx(&info)) {
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", info.dwMajorVersion,
info.dwMinorVersion);
}
+ desktop = NS_LITERAL_STRING("win");
- #pragma warning(pop)
+ # pragma warning(pop)
#elif defined(MOZ_WIDGET_COCOA)
SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
@@ -2310,15 +2340,15 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#include "prlink.h"
#ifdef MOZ_WIDGET_GTK
- #include "nsIGIOService.h"
-+#include "nsKDEUtils.h"
+ # include "nsIGIOService.h"
++# include "nsKDEUtils.h"
#endif
#ifdef MOZ_WIDGET_COCOA
- #include <Carbon/Carbon.h>
- #include "CocoaFileUtils.h"
- #include "prmem.h"
- #include "plbase64.h"
+ # include <Carbon/Carbon.h>
+ # include "CocoaFileUtils.h"
+ # include "prmem.h"
+ # include "plbase64.h"
@@ -1902,62 +1903,77 @@ nsLocalFile::SetPersistentDescriptor(con