firefox 102.0-1 (znver1;aarch64) 2022-15077
9999

Status published
Submitter cris [@T] beebames.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/216342
Packages
firefox-102.0-1.znver1.source
firefox-102.0-1.znver1.binary
firefox-af-102.0-1.znver1.binary
firefox-ar-102.0-1.znver1.binary
firefox-ast-102.0-1.znver1.binary
firefox-bg-102.0-1.znver1.binary
firefox-bn-102.0-1.znver1.binary
firefox-br-102.0-1.znver1.binary
firefox-bs-102.0-1.znver1.binary
firefox-ca-102.0-1.znver1.binary
firefox-cs-102.0-1.znver1.binary
firefox-cy-102.0-1.znver1.binary
firefox-da-102.0-1.znver1.binary
firefox-de-102.0-1.znver1.binary
firefox-debuginfo-102.0-1.znver1.debuginfo
firefox-debugsource-102.0-1.znver1.binary
firefox-devel-102.0-1.znver1.binary
firefox-el-102.0-1.znver1.binary
firefox-en_GB-102.0-1.znver1.binary
firefox-eo-102.0-1.znver1.binary
firefox-es_AR-102.0-1.znver1.binary
firefox-es_CL-102.0-1.znver1.binary
firefox-es_ES-102.0-1.znver1.binary
firefox-es_MX-102.0-1.znver1.binary
firefox-et-102.0-1.znver1.binary
firefox-eu-102.0-1.znver1.binary
firefox-fa-102.0-1.znver1.binary
firefox-fi-102.0-1.znver1.binary
firefox-fr-102.0-1.znver1.binary
firefox-fy-102.0-1.znver1.binary
firefox-ga_IE-102.0-1.znver1.binary
firefox-gd-102.0-1.znver1.binary
firefox-gl-102.0-1.znver1.binary
firefox-gu_IN-102.0-1.znver1.binary
firefox-he-102.0-1.znver1.binary
firefox-hi-102.0-1.znver1.binary
firefox-hr-102.0-1.znver1.binary
firefox-hu-102.0-1.znver1.binary
firefox-hy-102.0-1.znver1.binary
firefox-id-102.0-1.znver1.binary
firefox-is-102.0-1.znver1.binary
firefox-it-102.0-1.znver1.binary
firefox-ja-102.0-1.znver1.binary
firefox-kk-102.0-1.znver1.binary
firefox-km-102.0-1.znver1.binary
firefox-kn-102.0-1.znver1.binary
firefox-ko-102.0-1.znver1.binary
firefox-lt-102.0-1.znver1.binary
firefox-lv-102.0-1.znver1.binary
firefox-mk-102.0-1.znver1.binary
firefox-mr-102.0-1.znver1.binary
firefox-nb_NO-102.0-1.znver1.binary
firefox-nl-102.0-1.znver1.binary
firefox-nn_NO-102.0-1.znver1.binary
firefox-pa_IN-102.0-1.znver1.binary
firefox-pl-102.0-1.znver1.binary
firefox-pt_BR-102.0-1.znver1.binary
firefox-pt_PT-102.0-1.znver1.binary
firefox-ro-102.0-1.znver1.binary
firefox-ru-102.0-1.znver1.binary
firefox-si-102.0-1.znver1.binary
firefox-sk-102.0-1.znver1.binary
firefox-sl-102.0-1.znver1.binary
firefox-sq-102.0-1.znver1.binary
firefox-sr-102.0-1.znver1.binary
firefox-sv_SE-102.0-1.znver1.binary
firefox-ta-102.0-1.znver1.binary
firefox-te-102.0-1.znver1.binary
firefox-th-102.0-1.znver1.binary
firefox-tr-102.0-1.znver1.binary
firefox-uk-102.0-1.znver1.binary
firefox-vi-102.0-1.znver1.binary
firefox-zh_CN-102.0-1.znver1.binary
firefox-zh_TW-102.0-1.znver1.binary
firefox-102.0-1.aarch64.binary
firefox-102.0-1.aarch64.source
firefox-af-102.0-1.aarch64.binary
firefox-ar-102.0-1.aarch64.binary
firefox-ast-102.0-1.aarch64.binary
firefox-bg-102.0-1.aarch64.binary
firefox-bn-102.0-1.aarch64.binary
firefox-br-102.0-1.aarch64.binary
firefox-bs-102.0-1.aarch64.binary
firefox-ca-102.0-1.aarch64.binary
firefox-cs-102.0-1.aarch64.binary
firefox-cy-102.0-1.aarch64.binary
firefox-da-102.0-1.aarch64.binary
firefox-de-102.0-1.aarch64.binary
firefox-debuginfo-102.0-1.aarch64.debuginfo
firefox-debugsource-102.0-1.aarch64.binary
firefox-devel-102.0-1.aarch64.binary
firefox-el-102.0-1.aarch64.binary
firefox-en_GB-102.0-1.aarch64.binary
firefox-eo-102.0-1.aarch64.binary
firefox-es_AR-102.0-1.aarch64.binary
firefox-es_CL-102.0-1.aarch64.binary
firefox-es_ES-102.0-1.aarch64.binary
firefox-es_MX-102.0-1.aarch64.binary
firefox-et-102.0-1.aarch64.binary
firefox-eu-102.0-1.aarch64.binary
firefox-fa-102.0-1.aarch64.binary
firefox-fi-102.0-1.aarch64.binary
firefox-fr-102.0-1.aarch64.binary
firefox-fy-102.0-1.aarch64.binary
firefox-ga_IE-102.0-1.aarch64.binary
firefox-gd-102.0-1.aarch64.binary
firefox-gl-102.0-1.aarch64.binary
firefox-gu_IN-102.0-1.aarch64.binary
firefox-he-102.0-1.aarch64.binary
firefox-hi-102.0-1.aarch64.binary
firefox-hr-102.0-1.aarch64.binary
firefox-hu-102.0-1.aarch64.binary
firefox-hy-102.0-1.aarch64.binary
firefox-id-102.0-1.aarch64.binary
firefox-is-102.0-1.aarch64.binary
firefox-it-102.0-1.aarch64.binary
firefox-ja-102.0-1.aarch64.binary
firefox-kk-102.0-1.aarch64.binary
firefox-km-102.0-1.aarch64.binary
firefox-kn-102.0-1.aarch64.binary
firefox-ko-102.0-1.aarch64.binary
firefox-lt-102.0-1.aarch64.binary
firefox-lv-102.0-1.aarch64.binary
firefox-mk-102.0-1.aarch64.binary
firefox-mr-102.0-1.aarch64.binary
firefox-nb_NO-102.0-1.aarch64.binary
firefox-nl-102.0-1.aarch64.binary
firefox-nn_NO-102.0-1.aarch64.binary
firefox-pa_IN-102.0-1.aarch64.binary
firefox-pl-102.0-1.aarch64.binary
firefox-pt_BR-102.0-1.aarch64.binary
firefox-pt_PT-102.0-1.aarch64.binary
firefox-ro-102.0-1.aarch64.binary
firefox-ru-102.0-1.aarch64.binary
firefox-si-102.0-1.aarch64.binary
firefox-sk-102.0-1.aarch64.binary
firefox-sl-102.0-1.aarch64.binary
firefox-sq-102.0-1.aarch64.binary
firefox-sr-102.0-1.aarch64.binary
firefox-sv_SE-102.0-1.aarch64.binary
firefox-ta-102.0-1.aarch64.binary
firefox-te-102.0-1.aarch64.binary
firefox-th-102.0-1.aarch64.binary
firefox-tr-102.0-1.aarch64.binary
firefox-uk-102.0-1.aarch64.binary
firefox-vi-102.0-1.aarch64.binary
firefox-zh_CN-102.0-1.aarch64.binary
firefox-zh_TW-102.0-1.aarch64.binary
Build Date 2022-06-29 16:47:07 +0000 UTC
Last Updated 2022-07-04 19:20:54.931167523 +0000 UTC
$ git diff --patch-with-stat --summary d151c34e08a7d0b5f3835acfe26f9cd06ef7d580..9d96eae44efba6d59e2c428addf8dfe63d747cf5

 .abf.yml                                          | 140 +++++++++++-----------
 firefox-99.0-kde.patch                            |   8 +-
 firefox.spec                                      |   8 +-
 mozilla-99.0-kde.patch => mozilla-101.0-kde.patch | 109 +++++------------
 4 files changed, 109 insertions(+), 156 deletions(-)
 rename mozilla-99.0-kde.patch => mozilla-101.0-kde.patch (96%)

diff --git a/.abf.yml b/.abf.yml
index ab0232c..b537323 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,73 +1,73 @@
 sources:
-  af.xpi: f41af8363e002b38725ab3c4af701a4801e56fa9
-  ar.xpi: 470bccdab7aa0ef961c42786864d771103b2a3ca
-  ast.xpi: f29f93a63e43d9d7575bff62f025e3d400486c4b
+  af.xpi: cd9b4a8bdd59649c342d893001b2d0e4544263bc
+  ar.xpi: 023f3bb7c86e7eb234bcef378671316c9643beda
+  ast.xpi: b746ab9e36dfc58599a095e4c4b6158f914ed735
   be.xpi: d2ca74c120a8e42c40c5e5f1d193ee73b1dee572
-  bg.xpi: 4c49e542b724b18512e2b2ba10b341b73770df87
-  bn.xpi: 62aa4cfd5139427a6f66c71d033e8e98cf153693
-  br.xpi: 7536ec85ed1358614dc5fb457f9fc212fa14460f
-  bs.xpi: 38b02e175460dbeeb3e49af66ff21132caec0588
-  ca.xpi: 4359b88687dc07082f089703523571bd08dc2449
+  bg.xpi: 7a6d1d302184d68c0ecf1a3864934a5c646b8170
+  bn.xpi: 711c5bfe10128724007e11ccb987361a303056b6
+  br.xpi: 39aab9840857114d657666496c79f5262479a276
+  bs.xpi: 6612b1bea46d1cabe2b7f218c9c902ca02369db5
+  ca.xpi: 7a3dfeb07b7b07c8e8200ac6f27cff581fb28aee
   cbindgen-vendor.tar.xz: e5b896e6edab51fa5bb92c7ca4b7304cd7ac7cdf
-  cs.xpi: 6e16147045313a3972490adbdca20a772a7f7644
-  cy.xpi: 4563b86a49dc65ad44ab0d3420544a5500bbf40e
-  da.xpi: 8165abd603f41faa7843be482c1ab554afed289f
-  de.xpi: b5b7a6cb9e113635d0ab2a303915b7ae49cac394
-  el.xpi: 2e1d856fe2f5c9c6ccbf220968b9b9ba050762d0
-  en-GB.xpi: a305a49d04389a2ddd021c64709c9f21f27a001b
-  eo.xpi: 4fc0624ec7cfa351f92d9ffc8088ad62ddce70d6
-  es-AR.xpi: 852c55aea350ae9d7cf7d6e07c9d6200fb2921ea
-  es-CL.xpi: 3ec8dca377969fdb3ebb4c4665b228322849d6f7
-  es-ES.xpi: f59b2e919fe08ee9151993dbf38a2985b367f6f0
-  es-MX.xpi: 82ca30449fd817cffcbeb4942e8bc9596d449a3c
-  et.xpi: 03e242756b0d66169568cbf5241c34c31134244f
-  eu.xpi: 41157191e3728f6eea602f7ae400711cbc79d2d8
-  fa.xpi: e5dc17ec8358d72c181c9d442750b943572b813e
-  fi.xpi: 0e26c4ffe5906fc1a101cab06bf09a5e1ef00631
-  firefox-101.0.1.source.tar.xz: 7f26904431d499cae374a79854a019c2d2f7ca54
-  fr.xpi: 9b3662830640bcb70238e3efc8487385a9400062
-  fy-NL.xpi: f09fdd45fcb3ea1173bf7c992e7e15c6bf220c53
-  ga-IE.xpi: c1fea424837169597eceb30defa0187988477673
-  gd.xpi: 97186083b029eaf2265f16288f2d60a3b91de7d9
-  gl.xpi: d1bbbed5bef5fab13a50671461d552dcf8a9dd08
-  gu-IN.xpi: 03f75b99610bed2fdc6fe27c85936b070a2ad18c
-  he.xpi: 1368ac0d5c1f07b0076d1469fb29c50f2fe27b50
-  hi-IN.xpi: 2b13269c94e97ea43e41f5a6a424e3e859889af4
-  hr.xpi: b9f0480ec01713091278038f7598419486dc0e41
-  hu.xpi: 43818c0b290f26f0500c2bc3b69577c547ab1b39
-  hy-AM.xpi: 5e850f9c0cfcc015879d30f9425e6e4f8e9674b8
-  id.xpi: 00e8c3598d8a79b52eef20410a157fccf3b9fff1
-  is.xpi: 95ecec49c218e718a18104490d0fceb0af566647
-  it.xpi: bd97f928f09153eebee8f814b7b689ca918e862b
-  ja.xpi: fa044fc921fc47f6d5300515d1ebb505dcaf41cc
-  kk.xpi: af5ec738c9bd87d2aaafe5a54d2701a736b4b13c
-  km.xpi: 170f752cd3d820e48c234c65b301e84ba3ef3478
-  kn.xpi: e2f28734898498921359f04f29a7453e24504d46
-  ko.xpi: 4a0ed5e5b31b880a9379ec74e256733f30dd5166
-  lt.xpi: 2f84ae37f0ab60be022b5dc834a7c40d3bbf627d
-  lv.xpi: 0ddfde01595ef6a6989467d8768b18582160a60a
-  mk.xpi: 363fe955fcc41a9a871ccb815a250489fa6304f0
-  mr.xpi: ef7e26eb03d627fcd63e2bb428f793c8097990a1
-  nb-NO.xpi: 2000722d53d9011a7b0b07670ec6fc39056f8211
-  nl.xpi: 00be0c756ec8c18d645553bd20acf4bac902618b
-  nn-NO.xpi: 63eaccddfb248a5d43a6b61080619d914d8405bd
-  pa-IN.xpi: 2772ae062c109a99d1390577afb989036af1fd64
-  pl.xpi: 9e4c536433fc6873222cde082fa179a96d2feb5f
-  pt-BR.xpi: cb541b0eb5f47ab988c8c907d59d10788b58b847
-  pt-PT.xpi: b7af2e0b2921693ed49ae3be7c1728f9c23b5b34
-  ro.xpi: 8116f8744488730f40934b4a6b182b1e4f9fc84e
-  ru.xpi: 1a6e14eea1e8efe14c27a01255565d3a86aed66f
-  si.xpi: e568e6bf6d8fcbfd2656c5fc40911d086a4365de
-  sk.xpi: 5d3109c984f039b98ecac87b4106e3a595975e0f
-  sl.xpi: 46d85a8bbc8379e3d060278ced83894bf7caef45
-  sq.xpi: 0663b307586f746603b8a860a6d0ecf3caa10ac1
-  sr.xpi: 9a6896d2db40fc2c3cf6afe66083b51fa964791b
-  sv-SE.xpi: fbc1114f273ca321adecea927b4d6d593846d7d4
-  ta.xpi: 350983709638f112cda20db31d7492de3f3bc82a
-  te.xpi: 5d33cc80c1eba9f7d0cc61e665a62ec81c2c23c4
-  th.xpi: 4c00315a5d5ee2b01dbfa26e692eef3e0ec4f51d
-  tr.xpi: d44c26041295daf740c890f93d9574aac625ef7d
-  uk.xpi: 4a5eaee42c5442ee54a0d76b9dffef317da66739
-  vi.xpi: 67ffa0d7017756a157deb0d9025f38201317ec23
-  zh-CN.xpi: aa6a59ee57494157f4e5d8550509e8d4a9d82d73
-  zh-TW.xpi: 67c852cc2bd4be6ef61b10b605827bf76f6fc55a
+  cs.xpi: 9471652aa37e8c24cffc9e05cb7dca8f37bab9a3
+  cy.xpi: a5801e95bb7cb3fa589e4e810a40ee1a35096135
+  da.xpi: fefcc2e3f5c898aa4fa3692f209f0a17d5114092
+  de.xpi: 3f25bb51b30098490e319ef5282fedfff9ddef73
+  el.xpi: 948e8d10ed8180c60e98bbb568910227a715a88e
+  en-GB.xpi: be5d76fc8b624e988286c05c2460340ed2e1f2a4
+  eo.xpi: e3dd058946f582342835f42236210913eec1a0b9
+  es-AR.xpi: 52b3515644e1bdd946cd7ac2f24c1b6398042eeb
+  es-CL.xpi: cd0005efbaf25399ca2e4aca26dc654fd47b6b20
+  es-ES.xpi: 73fb95624074fce1b5d52e6cf55712592f58211c
+  es-MX.xpi: 3c12403fe08a535b74628799abd2397b204a564f
+  et.xpi: 74d630cbf7522f6f0f71f04b4df0126f24490e90
+  eu.xpi: 24e2b4e6ef8f804723669c406def9e27f1714143
+  fa.xpi: 2739ccc8190d84bbdf487dd67fae40f63687da70
+  fi.xpi: f36bcf9b506f4b939aed4923d0401b91d775486b
+  firefox-102.0.source.tar.xz: 41ca8672b0c1ef7a549177ddc5ff0dcd74ff2fc4
+  fr.xpi: e1f51141fe31f787811303f52ec68a59a4b47806
+  fy-NL.xpi: f6d850b72e1db750012cea59b3d3ba44f2dacdbe
+  ga-IE.xpi: a354831bf55c5b993f26c3823bf38fa653141088
+  gd.xpi: 4c7544639ed20ca1b3170ec8a8a573740c770a0e
+  gl.xpi: c1ccada4c5ebb25e0f9051b9cfcd55f4621d3e95
+  gu-IN.xpi: 4b9ff499af8c1e5a3a37741097ff9c5f16deca29
+  he.xpi: 55b76c889c19995a2a33922e31c34decee22a0e5
+  hi-IN.xpi: 51d4e0fc99d5171e8ad616df223053300ac4cb3a
+  hr.xpi: dc1de656c0696abe0c9a61fa3824fad678c1aed3
+  hu.xpi: 799e27cf89116f49defa8f36d2f0d9dfe287b8f4
+  hy-AM.xpi: f98848bf9c0663569d9141069eec0573f4b30240
+  id.xpi: 27e03f2a071c64c6b9dee8d03e7ad599d1b936c9
+  is.xpi: b539ae548b180cfbab13c8dc951827d51a1fd0ea
+  it.xpi: 630a6c9b8e840cdd02f5043894a9fe6c24c792cc
+  ja.xpi: 62f94d8c96f8303d0339c4df692411153129e140
+  kk.xpi: 4b593addefc0c4c685d5a6bd1f21a1e3bca8d52d
+  km.xpi: afaa20539ccb3cc22333abb5063ad91c18c49398
+  kn.xpi: f6f201860f4da58dae09ba0e1708935c8f6d9b7f
+  ko.xpi: d3eafd86379fa9d3935c413fd8245b028e168f06
+  lt.xpi: 490dddec97c0e2768ed5c65f1fead2d78d68b448
+  lv.xpi: 82ca5f992b7d32218adb6fe2b327b4374828f7c7
+  mk.xpi: 90375dfe79893af2f02358e998ca0c9c50d268d3
+  mr.xpi: 2f46afc77b7b3b0b22f002c610d540a561efd057
+  nb-NO.xpi: fb3eeb55a0d60b839ff12bfbead1a7c53fbab6ce
+  nl.xpi: f17fad55f44d1fabaebd99d88ad491a09576dc09
+  nn-NO.xpi: cc8fb882a4364eb69def841cbe217d35b6a96796
+  pa-IN.xpi: 5db4b84309c9e80df1099d0cdb13f1ee9877b721
+  pl.xpi: 396d005abeb2d6999f6173250fde753c8c22efb5
+  pt-BR.xpi: 3d329cf7be57ba6c940e7c3f1cde3df30bc13b7a
+  pt-PT.xpi: bbbcabe541e79dc13539b7086c2d927719af6c04
+  ro.xpi: dc76e9dc26adea6979ba6126737ca562a9432367
+  ru.xpi: 820ec7b8e38420f040d62123acedff35095c5e2a
+  si.xpi: 161f625f573cb3ec4a2478a923cbeaa4767ad569
+  sk.xpi: 59eb91a55113cd1c7de1b3aec667310637caa662
+  sl.xpi: 7bad516891c877cebced6611c360736d65158023
+  sq.xpi: afcd2d5df9161c347d53b063668de5c0c6c2f898
+  sr.xpi: c22d969e5179ac792e5da45de0d57d084c3e335f
+  sv-SE.xpi: c97664a1cdbc072d868fe980d03cb6786ad8787a
+  ta.xpi: 594f33abdb7bb8b8a417601e3bfda87766f47385
+  te.xpi: 9850915af06a461a0386ecaad2589e141fd2abdf
+  th.xpi: 41b3a833c2b4b075043a00933278bfdd936a25ad
+  tr.xpi: 4d75d52172acff6ab307c5ddb15c04589d41fa5d
+  uk.xpi: e37291edb9de1a878ad31d68cab4817fb6937548
+  vi.xpi: eb56b048b3abf46b85a6d944b71a1a6b98d01cd7
+  zh-CN.xpi: f2e568aea43f65de77b46a2a2ccf351cb44c8040
+  zh-TW.xpi: 7f1b141431acb12dee529bb11669a7d9b5dcaeec
diff --git a/firefox-99.0-kde.patch b/firefox-99.0-kde.patch
index e1521ef..6f366ed 100644
--- a/firefox-99.0-kde.patch
+++ b/firefox-99.0-kde.patch
@@ -260,11 +260,11 @@ new file mode 100644
 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init)
 +
 +NS_IMETHODIMP
-+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
++nsUnixShellServiceConstructor(REFNSIID aIID, void **aResult)
 +{
 +    if( nsKDEUtils::kdeSupport())
-+        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
-+    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
++        return nsKDEShellServiceConstructor( aIID, aResult );
++    return nsGNOMEShellServiceConstructor( aIID, aResult );
 +}
 diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
 new file mode 100644
@@ -283,6 +283,6 @@ new file mode 100644
 +#include "nsIGNOMEShellService.h"
 +
 +NS_IMETHODIMP
-+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
++nsUnixShellServiceConstructor(REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
diff --git a/firefox.spec b/firefox.spec
index 8724fb6..5e4e0b8 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -239,7 +239,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:	101.0.1
+Version:	102.0
 Release:	%{?beta:0.%{beta}.}1
 License:	MPLv1+
 Group:		Networking/WWW
@@ -269,8 +269,8 @@ Source100:      firefox.rpmlintrc
 }
 
 # Patches for kde integration of FF  from http://www.rosenauer.org/hg/mozilla/
-#Patch11:	firefox-99.0-kde.patch
-#Patch12:	mozilla-99.0-kde.patch
+Patch11:	firefox-99.0-kde.patch
+Patch12:	mozilla-101.0-kde.patch
 
 Patch14:	build-aarch64-skia.patch
 Patch15:	build-arm-libopus.patch
@@ -335,7 +335,7 @@ BuildRequires:	pkgconfig(libproxy-1.0)
 BuildRequires:	pkgconfig(libpulse)
 BuildRequires:	pkgconfig(libstartup-notification-1.0)
 BuildRequires:	pkgconfig(nspr) >= 4.32.0
-BuildRequires:	pkgconfig(nss) >= 3.78
+BuildRequires:	pkgconfig(nss) >= 3.79
 BuildRequires:	pkgconfig(ogg)
 BuildRequires:	pkgconfig(opus)
 BuildRequires:	pkgconfig(libpulse)
diff --git a/mozilla-99.0-kde.patch b/mozilla-101.0-kde.patch
similarity index 96%
rename from mozilla-99.0-kde.patch
rename to mozilla-101.0-kde.patch
index 5671dcc..8eed4d8 100644
--- a/mozilla-99.0-kde.patch
+++ b/mozilla-101.0-kde.patch
@@ -3,7 +3,7 @@
 # Date 1559294891 -7200
 #      Fri May 31 11:28:11 2019 +0200
 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent  8d1110b6918acc4e7d3f655d1e55f4b4ff630abe
+# Parent  eeedc49c16aba3b50d1547315a88091a1c765904
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -13,12 +13,12 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
-@@ -84,16 +84,17 @@
- #include "plbase64.h"
+@@ -88,16 +88,17 @@
  #include "PLDHashTable.h"
  #include "plstr.h"
  #include "prlink.h"
  #include "xpcpublic.h"
+ #include "js/RootingAPI.h"
  #ifdef MOZ_BACKGROUNDTASKS
  #  include "mozilla/BackgroundTasks.h"
  #endif
@@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  #ifdef MOZ_MEMORY
  #  include "mozmemory.h"
  #endif
-@@ -4634,16 +4635,27 @@ nsresult Preferences::InitInitialObjects
+@@ -4767,16 +4768,27 @@ nsresult Preferences::InitInitialObjects
      "unix.js"
  #  if defined(_AIX)
      ,
@@ -59,7 +59,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.
-@@ -4708,17 +4720,17 @@ nsresult Preferences::InitInitialObjects
+@@ -4841,17 +4853,17 @@ nsresult Preferences::InitInitialObjects
        }
  
        nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -118,16 +118,20 @@ EXPORTS.mozilla += [
+@@ -120,16 +120,20 @@ EXPORTS.mozilla += [
  ]
  EXPORTS.mozilla += sorted(["!" + g for g in gen_h])
  
@@ -256,14 +256,14 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 @@ -13,16 +13,17 @@
- #include "nsPrintfCString.h"
- #include "nsNetCID.h"
+ #include "prnetdb.h"
+ #include "prenv.h"
+ #include "nsInterfaceHashtable.h"
+ #include "nsHashtablesFwd.h"
+ #include "nsHashKeys.h"
  #include "nsNetUtil.h"
  #include "nsISupportsPrimitives.h"
  #include "nsIGSettingsService.h"
- #include "nsInterfaceHashtable.h"
- #include "mozilla/Attributes.h"
- #include "nsIURI.h"
 +#include "nsKDEUtils.h"
  
  using namespace mozilla;
@@ -786,25 +786,6 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
  
  /*
   * Check if a handler exists for the provided protocol. Check the datastore
-@@ -328,17 +328,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
@@ -828,7 +809,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
      ]
  elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
      UNIFIED_SOURCES += [
-@@ -126,16 +128,17 @@ include("/ipc/chromium/chromium-config.m
+@@ -130,16 +132,17 @@ include("/ipc/chromium/chromium-config.m
  FINAL_LIBRARY = "xul"
  
  LOCAL_INCLUDES += [
@@ -1263,7 +1244,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
-@@ -136,16 +136,17 @@ FINAL_LIBRARY = "xul"
+@@ -154,16 +154,17 @@ FINAL_LIBRARY = "xul"
  
  LOCAL_INCLUDES += [
      "/layout/base",
@@ -1277,7 +1258,7 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
      "/widget/headless",
  ]
  
- if CONFIG["MOZ_X11"]:
+ if CONFIG["MOZ_X11"] or CONFIG["MOZ_WAYLAND"]:
      LOCAL_INCLUDES += [
          "/widget/x11",
      ]
@@ -1825,7 +1806,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #  include "prmem.h"
  #  include "plbase64.h"
  
-@@ -2071,62 +2072,77 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -2071,20 +2072,29 @@ nsLocalFile::SetPersistentDescriptor(con
  
  NS_IMETHODIMP
  nsLocalFile::Reveal() {
@@ -1834,47 +1815,10 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
    }
  
  #ifdef MOZ_WIDGET_GTK
--  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
--  if (!giovfs) {
--    return NS_ERROR_FAILURE;
--  }
 +  nsAutoCString url;
- 
-   bool isDirectory;
-   if (NS_FAILED(IsDirectory(&isDirectory))) {
-     return NS_ERROR_FAILURE;
-   }
- 
-+  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-   if (isDirectory) {
--    return giovfs->ShowURIForInput(mPath);
-+    url = mPath;
-   }
-   if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
-     return NS_OK;
-   }
-   nsCOMPtr<nsIFile> parentDir;
-   nsAutoCString dirPath;
-   if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
-     return NS_ERROR_FAILURE;
-   }
-   if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
-     return NS_ERROR_FAILURE;
-   }
- 
--  return giovfs->ShowURIForInput(dirPath);
-+  url = dirPath;
- #elif defined(MOZ_WIDGET_COCOA)
-   CFURLRef url;
-   if (NS_SUCCEEDED(GetCFURL(&url))) {
-     nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
-     ::CFRelease(url);
-     return rv;
-   }
-   return NS_ERROR_FAILURE;
- #else
-   return NS_ERROR_FAILURE;
- #endif
+   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+-  if (!giovfs) {
++  url = mPath;
 +  if(nsKDEUtils::kdeSupport()) {
 +    nsTArray<nsCString> command;
 +    command.AppendElement( "REVEAL"_ns );
@@ -1883,10 +1827,18 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 +  }
 +
 +  if (!giovfs)
-+    return NS_ERROR_FAILURE;
+     return NS_ERROR_FAILURE;
+-  }
 +
-+  return giovfs->ShowURIForInput(url);
- }
+   return giovfs->RevealFile(this);
+ #elif defined(MOZ_WIDGET_COCOA)
+   CFURLRef url;
+   if (NS_SUCCEEDED(GetCFURL(&url))) {
+     nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
+     ::CFRelease(url);
+     return rv;
+   }
+@@ -2096,16 +2106,23 @@ nsLocalFile::Reveal() {
  
  NS_IMETHODIMP
  nsLocalFile::Launch() {
@@ -1901,11 +1853,12 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 +    command.AppendElement( mPath );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +  }
++
    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
    if (!giovfs) {
      return NS_ERROR_FAILURE;
    }
  
-   return giovfs->ShowURIForInput(mPath);
+   return giovfs->LaunchFile(mPath);
  #elif defined(MOZ_WIDGET_ANDROID)
    // Not supported on GeckoView
Not Available

benbullard79 [@T] cox.netNo Comment.632d 22hrs
benbullard79 [@T] cox.netNo Comment.632d 22hrs