firefox 101.0.1-2 (x86_64;znver1) 2022-15067
9999
Status | published | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Submitter | cris [@T] beebames.com | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Platform | rolling | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Repository | main | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
URL | https://abf.openmandriva.org/build_lists/212017 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Packages |
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Build Date | 2022-06-14 18:57:02 +0000 UTC | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Last Updated | 2022-06-18 01:07:55.742278437 +0000 UTC |
$ git diff --patch-with-stat --summary 62b11b9c87be120b8e40a7562d0b30c6bfbf8d0b..9ce8186a586c31eb2858a83fc468394ba7b7a8ed .abf.yml | 140 +++++++++++----------- firefox.spec | 39 ++++-- mozilla-99.0-kde.patch => mozilla-101.0-kde.patch | 80 ++++--------- 3 files changed, 124 insertions(+), 135 deletions(-) rename mozilla-99.0-kde.patch => mozilla-101.0-kde.patch (97%) diff --git a/.abf.yml b/.abf.yml index 8a802db..ab0232c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,73 +1,73 @@ sources: - af.xpi: 71b441b23061bd3ab4d03e6f5bcf12d299cc458f - ar.xpi: d4f3855b10851140d9f715e3e80639df989fdca3 - ast.xpi: 10de2eb94da86fc35d1c46ce5cac51ac2810b93c + af.xpi: f41af8363e002b38725ab3c4af701a4801e56fa9 + ar.xpi: 470bccdab7aa0ef961c42786864d771103b2a3ca + ast.xpi: f29f93a63e43d9d7575bff62f025e3d400486c4b be.xpi: d2ca74c120a8e42c40c5e5f1d193ee73b1dee572 - bg.xpi: 77a47d85cc4648205b6300e31f77b06355b952f8 - bn.xpi: f2b70f5aa0b0533cc4eaae78564c2b071e616061 - br.xpi: f6448365d7106819acc474c7a10be1271fc46728 - bs.xpi: 1534aaa5712d20b7ec44c1024a135f021ecee562 - ca.xpi: 3a4858dac04ba63025406c90c21cae36bb07d5f9 + bg.xpi: 4c49e542b724b18512e2b2ba10b341b73770df87 + bn.xpi: 62aa4cfd5139427a6f66c71d033e8e98cf153693 + br.xpi: 7536ec85ed1358614dc5fb457f9fc212fa14460f + bs.xpi: 38b02e175460dbeeb3e49af66ff21132caec0588 + ca.xpi: 4359b88687dc07082f089703523571bd08dc2449 cbindgen-vendor.tar.xz: e5b896e6edab51fa5bb92c7ca4b7304cd7ac7cdf - cs.xpi: a9fc317e8fc49b1311f6b430762d626e19a5b517 - cy.xpi: 80efeffa0b8fb28645349e755244bbad51d9978d - da.xpi: e954e45c6cbf5f9cb91185a38c60ce9e4679c247 - de.xpi: 2adbc28543760702309d00121e529a2bff939d00 - el.xpi: 4131313ffebc03aea7de5b0b2e82fc260f66e048 - en-GB.xpi: 04e4167dfef5c3d6538a4938f98c6ff3d9b340e9 - eo.xpi: 5f6c9d11f87e5fdb97386878cdf170cafdabfaf6 - es-AR.xpi: 53d90929873d87cf6e8165dca7d2fe9ee8f1868a - es-CL.xpi: 504207f0b9fd68033ea93cc55d03d82025f07960 - es-ES.xpi: 57d59a507fd70754d05e001dfdedca7392f143ed - es-MX.xpi: f5ba735df004fea7c0d07bd1b953c488a53fb41b - et.xpi: 9b1cb369d006d1f82625aae17971b107ffd377ea - eu.xpi: 68ef7b2224aa1c757470f446793a7483d3d90437 - fa.xpi: be543c3f65bed7550a98c3104437085057dafd78 - fi.xpi: 318c8c3ae55211bdb6f27a7625c84c9e8351acc9 - firefox-101.0.source.tar.xz: b6551b114ee78ec221f19d5d512e4132ba2ecbbe - fr.xpi: 987455cad1b78946573cc016189eaf075e525a7a - fy-NL.xpi: 1a451fd7b0b64fc4dbee7a8ce5241bd4230080f7 - ga-IE.xpi: 9079e94fe5c96dc996df332413cfcc4833cc7aaa - gd.xpi: 89fdd8c62737f7d25575834ebe1eb15d19eff4ba - gl.xpi: dc130d263d407028579c3be11fe45ef69c13aac9 - gu-IN.xpi: 44ab83fd5d82340feee5d44433b03a3158c673a3 - he.xpi: 28f1193de0fdb8f3eacdc99149aa28a93c8f05c0 - hi-IN.xpi: 4fdddd47f5933198a42d15290641081769949ca5 - hr.xpi: 1fcdc32c524da551befaf9758743757337596330 - hu.xpi: f1fdf7d2ce1283785024a92775ec874f8c7ecf88 - hy-AM.xpi: 686f5a1d9dc8cad13dc78c902dc9379e580d25f3 - id.xpi: b782d1f990e3261b335514ef3954b7dc35feaad9 - is.xpi: f9a3e5c88b33f32242a42d05d493934445178f88 - it.xpi: beafe31dc90d7464b5974df4891121d1ba374ceb - ja.xpi: c676fbc470c08c6f319f572aad4dfbf3d476945d - kk.xpi: 23b47e84e44465827e1302bec497f584adc6dd74 - km.xpi: 5ac39711db8c3c23a2dbf0a9588a924eb9874f51 - kn.xpi: c67807832f94492efc3e2517bde556631147dcc1 - ko.xpi: eb9267f585323bcbec54d3714ec7527260c28913 - lt.xpi: 2b7beae406a700416ba58ce3d5828f81e9562d8b - lv.xpi: c0b8b7dc537df881955ac18560b76bf2887863c7 - mk.xpi: 256ebeda1a2062c8ecd5a7e713b60ddc1747528f - mr.xpi: 806307c8790fc670a759de0e4a574f11f13692e1 - nb-NO.xpi: 5a3b842dc1a96c5935710bfed487ed3f9897e466 - nl.xpi: a3a7b3ff98a9a34c5cb6b0f40d8fd237a12be87e - nn-NO.xpi: e1a69e98fedb0210501b1f6fb4df356e0b6a39f0 - pa-IN.xpi: ebe7d61d56e564a5a59a73c53fc46e25b91f066d - pl.xpi: 9fba27673080f2ac7517be0e7fe20a569b0feffa - pt-BR.xpi: bcbf5cce40c303e9c6d7932cb00f1481a74e79e7 - pt-PT.xpi: a60df3768653dda1393f092d4776bb700dde3265 - ro.xpi: 0f93257019ba140796a4b004bbb9e2b41def8d19 - ru.xpi: 412aa8f6cd88fcdfafaf1ae1158c70f60a3f5e2d - si.xpi: 6052a6c14000b05f0eaa8dd1919304733f6818f0 - sk.xpi: 31504fd36230ecb0223648d4a7a359eb1c1a70d6 - sl.xpi: 32bfd42c9b09926e8aaa9d581fb452d227848ce3 - sq.xpi: 8d14d4a4257f0363b383efbaeee9ad5ab2b5db4f - sr.xpi: 98775cfaf6c18849e7deeeeebfd084ed14d3e82f - sv-SE.xpi: 0174e09049f2f8db336b3964f7a58624d1eb8d54 - ta.xpi: 75ee7357a118f520e67792a2aee46014ca2d7cf8 - te.xpi: 368e12e00868bb61600fb4ab96dfad85ce9a10cd - th.xpi: a2321e49a87b3449e21f6d43e8a7339f7d4ea1e8 - tr.xpi: 68ae36324e678403a17fb23153ca600f58982ba7 - uk.xpi: 73331996037f09c2cd3c802ec04e453856fa9204 - vi.xpi: 3c6329225cbca9f5d6d6b510b004c6a56d6f40a3 - zh-CN.xpi: 51c2da04c66739a5b6fc92c9ffb762ac48722313 - zh-TW.xpi: 35d1137620f9c814d619099a9368c567319afc24 + 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 diff --git a/firefox.spec b/firefox.spec index 2b47840..3f3105b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -36,6 +36,16 @@ %bcond_with pgo +%if %omvver > 4050000 +%define build_py python3.9 +%else +%define build_py python3 +%endif + +# enable use system python modules +# currently broken +%bcond_with system_python + # this seems fragile, so require the exact version or later (#58754) %define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0) %define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0) @@ -229,8 +239,8 @@ 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 -Release: %{?beta:0.%{beta}.}1 +Version: 101.0.1 +Release: %{?beta:0.%{beta}.}2 License: MPLv1+ Group: Networking/WWW Url: http://www.mozilla.com/firefox/ @@ -259,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 @@ -270,8 +280,13 @@ Patch50: firefox-100.0-python-3.11.patch BuildRequires: doxygen BuildRequires: makedepend +BuildRequires: glibc-static-devel +%if %omvver <= 4050000 BuildRequires: pkgconfig(python) -BuildRequires: python-distribute +%else +BuildRequires: pkgconfig(python-3.9) +%endif +%if %{with system_python} BuildRequires: python3dist(aiohttp) BuildRequires: python3dist(attrs) BuildRequires: python3dist(argparse) @@ -296,14 +311,13 @@ BuildRequires: python3dist(urllib3) BuildRequires: python3dist(wheel) BuildRequires: python3dist(yarl) BuildRequires: python3dist(zipp) -BuildRequires: python-pkg-resources +%endif BuildRequires: rootcerts >= 1:20110830.00 BuildRequires: unzip BuildRequires: wget BuildRequires: zip BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libjpeg) -BuildRequires: libiw-devel BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbus-glib-1) @@ -426,6 +440,7 @@ mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 export MOZ_MAKE_FLAGS="%{_smp_mflags}" export MOZ_SERVICES_SYNC=1 +export PYTHON3=%build_py mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj ac_add_options --enable-default-toolkit=cairo-gtk3-wayland ac_add_options --with-system-icu @@ -538,19 +553,21 @@ export MOZ_LEGACY_PROFILES="1" export LDFLAGS+="%{build_ldflags} -Wl,--no-keep-memory" export RUSTFLAGS="-Cdebuginfo=0" +%if %{with system_python} # FIXME We should enable system python, but need to sort out dependencies # Current status: builds locally on developer boxes, but fails inside abf # (tpg) use system python -#export MACH_USE_SYSTEM_PYTHON=1 +export MACH_USE_SYSTEM_PYTHON=1 # FF seems to always sees its own in-tree stuff before system versions. # Remove obsolete bits and pieces that don't actually work with system # bits it does try to use... -#rm -rf third_party/python/{aiohttp,colorama,jsonschema,multidict,pip,pip_tools,ply,pyrsistent,setuptools,wheel,yarl,zipp} +rm -rf third_party/python/{aiohttp,colorama,jsonschema,multidict,pip,pip_tools,ply,pyrsistent,setuptools,wheel,yarl,zipp} +%endif %if %{with pgo} -GDK_BACKEND=x11 xvfb-run ./mach build -v 2>&1 | cat - +GDK_BACKEND=x11 xvfb-run %build_py ./mach build -v 2>&1 | cat - %else -./mach build -v +%build_py ./mach build -v %endif %install diff --git a/mozilla-99.0-kde.patch b/mozilla-101.0-kde.patch similarity index 97% rename from mozilla-99.0-kde.patch rename to mozilla-101.0-kde.patch index 5671dcc..f7c713b 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]) @@ -828,7 +828,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 +1263,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 +1277,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 +1825,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 +1834,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 +1846,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 +1872,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.net | No Comment. | 650d 10hrs |
benbullard79 [@T] cox.net | No Comment. | 650d 10hrs |