From ee6c58fd8d0d7f7b58baff70e75873184d3114fb Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Sat, 27 Aug 2022 14:40:40 +0200 Subject: [PATCH] update kde patches for 104 --- patches/mozilla-kde.patch | 53 ++++++++++---------- patches/mozilla-kde_after_unity.patch | 70 +++++++++++++-------------- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/patches/mozilla-kde.patch b/patches/mozilla-kde.patch index 1ae2161..c50ccc1 100644 --- a/patches/mozilla-kde.patch +++ b/patches/mozilla-kde.patch @@ -3,7 +3,7 @@ # Date 1559294891 -7200 # Fri May 31 11:28:11 2019 +0200 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 -# Parent edd7284c391b503b76bb5bb6321f24ab2f5f8bdf +# Parent 65e96e081f6f4b68d6b7998f4182a3764832c2ce Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp #ifdef MOZ_MEMORY # include "mozmemory.h" #endif -@@ -4767,16 +4768,27 @@ nsresult Preferences::InitInitialObjects +@@ -4791,16 +4792,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. -@@ -4841,17 +4853,17 @@ nsresult Preferences::InitInitialObjects +@@ -4865,17 +4877,17 @@ nsresult Preferences::InitInitialObjects } nsCOMPtr path = do_QueryInterface(elem); @@ -255,7 +255,7 @@ diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downlo diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp -@@ -10,16 +10,17 @@ +@@ -10,16 +10,18 @@ #include "prnetdb.h" #include "prenv.h" #include "nsInterfaceHashtable.h" @@ -264,6 +264,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy #include "nsNetUtil.h" #include "nsISupportsPrimitives.h" #include "nsIGSettingsService.h" ++#include "nsPrintfCString.h" +#include "nsKDEUtils.h" using namespace mozilla; @@ -273,7 +274,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy NS_DECL_ISUPPORTS NS_DECL_NSISYSTEMPROXYSETTINGS -@@ -33,16 +34,18 @@ class nsUnixSystemProxySettings final : +@@ -33,16 +35,18 @@ class nsUnixSystemProxySettings final : nsCOMPtr mProxySettings; nsInterfaceHashtable mSchemeProxySettings; @@ -292,7 +293,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 -@@ -378,21 +381,50 @@ nsresult nsUnixSystemProxySettings::GetP +@@ -378,21 +382,50 @@ nsresult nsUnixSystemProxySettings::GetP return NS_OK; } @@ -809,7 +810,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build ] elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": UNIFIED_SOURCES += [ -@@ -130,16 +132,17 @@ include("/ipc/chromium/chromium-config.m +@@ -126,16 +128,17 @@ include("/ipc/chromium/chromium-config.m FINAL_LIBRARY = "xul" LOCAL_INCLUDES += [ @@ -1165,7 +1166,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth #include "nsISupports.h" #include "nsString.h" #include "nsReadableUtils.h" -@@ -1025,17 +1025,17 @@ nsresult nsOSHelperAppService::GetHandle +@@ -1102,17 +1102,17 @@ nsresult nsOSHelperAppService::GetHandle nsresult nsOSHelperAppService::OSProtocolHandlerExists( const char* aProtocolScheme, bool* aHandlerExists) { @@ -1184,7 +1185,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth nsCOMPtr handlerSvc = do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv) && handlerSvc) { -@@ -1045,17 +1045,17 @@ nsresult nsOSHelperAppService::OSProtoco +@@ -1122,17 +1122,17 @@ nsresult nsOSHelperAppService::OSProtoco } return rv; @@ -1203,26 +1204,26 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( const nsACString& aScheme, bool* _retval) { -@@ -1148,17 +1148,17 @@ already_AddRefed nsOSHel +@@ -1227,17 +1227,17 @@ already_AddRefed nsOSHel nsresult rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, minorType, mime_types_description, true); if (NS_FAILED(rv) || majorType.IsEmpty()) { #ifdef MOZ_WIDGET_GTK - LOG(("Looking in GNOME registry\n")); + LOG("Looking in GNOME registry\n"); RefPtr gnomeInfo = - nsGNOMERegistry::GetFromExtension(aFileExt); + nsCommonRegistry::GetFromExtension(aFileExt); if (gnomeInfo) { - LOG(("Got MIMEInfo from GNOME registry\n")); + LOG("Got MIMEInfo from GNOME registry\n"); return gnomeInfo.forget(); } #endif rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, minorType, mime_types_description, false); -@@ -1261,17 +1261,17 @@ already_AddRefed nsOSHel +@@ -1342,17 +1342,17 @@ already_AddRefed nsOSHel // Now look up our extensions nsAutoString extensions, mime_types_description; @@ -1234,17 +1235,17 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth - RefPtr gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); + RefPtr gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); if (gnomeInfo) { - LOG( - ("Got MIMEInfo from GNOME registry without extensions; setting them " - "to %s\n", - NS_LossyConvertUTF16toASCII(extensions).get())); + LOG("Got MIMEInfo from GNOME registry without extensions; setting them " + "to %s\n", + NS_LossyConvertUTF16toASCII(extensions).get()); NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); + return gnomeInfo.forget(); diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -154,16 +154,17 @@ FINAL_LIBRARY = "xul" +@@ -147,16 +147,17 @@ FINAL_LIBRARY = "xul" LOCAL_INCLUDES += [ "/layout/base", @@ -1654,7 +1655,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars int argc; bool ischrome; -@@ -397,16 +398,17 @@ void ParseManifest(NSLocationType aType, +@@ -389,16 +390,17 @@ void ParseManifest(NSLocationType aType, constexpr auto kRemoteEnabled = u"remoteenabled"_ns; constexpr auto kRemoteRequired = u"remoterequired"_ns; constexpr auto kApplication = u"application"_ns; @@ -1672,7 +1673,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars // possible to have conditional manifest contents, so we need to recognize and // discard these tokens even when MOZ_BACKGROUNDTASKS is not set. constexpr auto kBackgroundTask = u"backgroundtask"_ns; -@@ -456,39 +458,44 @@ void ParseManifest(NSLocationType aType, +@@ -448,39 +450,44 @@ void ParseManifest(NSLocationType aType, CopyUTF8toUTF16(s, abi); abi.Insert(char16_t('_'), 0); abi.Insert(osTarget, 0); @@ -1717,7 +1718,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars process = kMain; } -@@ -583,25 +590,27 @@ void ParseManifest(NSLocationType aType, +@@ -571,25 +578,27 @@ void ParseManifest(NSLocationType aType, // When in background task mode, default to not registering // category directivies unless backgroundtask=1 is specified. TriState stBackgroundTask = (BackgroundTasks::IsBackgroundTaskMode() && @@ -1745,7 +1746,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars continue; } -@@ -650,17 +659,17 @@ void ParseManifest(NSLocationType aType, +@@ -638,17 +647,17 @@ void ParseManifest(NSLocationType aType, } LogMessageWithContext( @@ -1788,8 +1789,8 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -54,16 +54,17 @@ - #include "prproces.h" +@@ -46,16 +46,17 @@ + #include "nsString.h" #include "nsIDirectoryEnumerator.h" #include "nsSimpleEnumerator.h" #include "private/pprio.h" @@ -1806,7 +1807,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp # include "prmem.h" # include "plbase64.h" -@@ -2097,20 +2098,29 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -2083,20 +2084,29 @@ nsLocalFile::SetPersistentDescriptor(con NS_IMETHODIMP nsLocalFile::Reveal() { @@ -1838,7 +1839,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp ::CFRelease(url); return rv; } -@@ -2122,16 +2132,23 @@ nsLocalFile::Reveal() { +@@ -2108,16 +2118,23 @@ nsLocalFile::Reveal() { NS_IMETHODIMP nsLocalFile::Launch() { diff --git a/patches/mozilla-kde_after_unity.patch b/patches/mozilla-kde_after_unity.patch index 1d037c8..a7886e8 100644 --- a/patches/mozilla-kde_after_unity.patch +++ b/patches/mozilla-kde_after_unity.patch @@ -1,6 +1,6 @@ -From afe53a3e933a68b0d898288449a7d50a44db354f Mon Sep 17 00:00:00 2001 +From 8c876f93d73edd6ddae693152639b5090e41f5de Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> -Date: Wed, 29 Jun 2022 10:58:45 +0200 +Date: Sat, 27 Aug 2022 14:39:44 +0200 Subject: [PATCH] kde --- @@ -37,7 +37,7 @@ Subject: [PATCH] kde create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp -index 6d0bebd2ee68..c138e63b23dc 100644 +index 4a021270e174..251eb32c566e 100644 --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -93,6 +93,7 @@ @@ -48,7 +48,7 @@ index 6d0bebd2ee68..c138e63b23dc 100644 #ifdef DEBUG # include -@@ -4772,6 +4773,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { +@@ -4796,6 +4797,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { #endif }; @@ -66,7 +66,7 @@ index 6d0bebd2ee68..c138e63b23dc 100644 rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles)); if (NS_FAILED(rv)) { -@@ -4846,7 +4858,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { +@@ -4870,7 +4882,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { } // Do we care if a file provided by this process fails to load? @@ -129,7 +129,7 @@ index d4172e2d73ad..8bd0577bc535 100644 with Files("**"): BUG_COMPONENT = ("Toolkit", "Downloads API") diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm -index 325de51c0c5f..8e5219f0e22f 100644 +index 23a7ed4493ad..b00eb7493b39 100644 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm @@ -1259,26 +1259,56 @@ nsUnknownContentTypeDialog.prototype = { @@ -210,15 +210,15 @@ index 325de51c0c5f..8e5219f0e22f 100644 var nsIFilePicker = Ci.nsIFilePicker; var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp -index ef110b1287bf..d82e149f482f 100644 +index ef110b1287bf..e29e8a5b62de 100644 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp @@ -15,6 +15,8 @@ #include "nsNetUtil.h" #include "nsISupportsPrimitives.h" #include "nsIGSettingsService.h" -+#include "nsKDEUtils.h" +#include "nsPrintfCString.h" ++#include "nsKDEUtils.h" using namespace mozilla; @@ -275,7 +275,7 @@ index ef110b1287bf..d82e149f482f 100644 auto result = MakeRefPtr(); result->Init(); diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build -index 6475c0296aac..83e0184d4938 100644 +index a3ea40edf0a3..96538442ccb3 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -97,7 +97,9 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit": @@ -692,7 +692,7 @@ index dbcc95d95646..5f2542a95065 100644 *aHandlerExists = false; #endif diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build -index 92647a9b3478..fc5068cd2069 100644 +index 260574f3905c..af549112883a 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -83,7 +83,9 @@ else: @@ -705,7 +705,7 @@ index 92647a9b3478..fc5068cd2069 100644 "unix/nsMIMEInfoUnix.cpp", ] elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": -@@ -135,6 +137,7 @@ LOCAL_INCLUDES += [ +@@ -131,6 +133,7 @@ LOCAL_INCLUDES += [ "/dom/ipc", "/netwerk/base", "/netwerk/protocol/http", @@ -1011,7 +1011,7 @@ index 7cbefcce3e94..84083348c8f1 100644 if (!giovfs) { return NS_ERROR_FAILURE; diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp -index b9e7aed3cb5c..367ad9ee2421 100644 +index 8b5820b9fd71..256f94703a92 100644 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp @@ -10,7 +10,7 @@ @@ -1023,7 +1023,7 @@ index b9e7aed3cb5c..367ad9ee2421 100644 # ifdef MOZ_BUILD_APP_IS_BROWSER # include "nsIToolkitShellService.h" # include "nsIGNOMEShellService.h" -@@ -1030,7 +1030,7 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists( +@@ -1107,7 +1107,7 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists( if (!XRE_IsContentProcess()) { #ifdef MOZ_WIDGET_GTK // Check the GNOME registry for a protocol handler @@ -1032,7 +1032,7 @@ index b9e7aed3cb5c..367ad9ee2421 100644 #else *aHandlerExists = false; #endif -@@ -1050,7 +1050,7 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists( +@@ -1127,7 +1127,7 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists( NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription( const nsACString& aScheme, nsAString& _retval) { #ifdef MOZ_WIDGET_GTK @@ -1041,29 +1041,29 @@ index b9e7aed3cb5c..367ad9ee2421 100644 return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK; #else return NS_ERROR_NOT_AVAILABLE; -@@ -1153,7 +1153,7 @@ already_AddRefed nsOSHelperAppService::GetFromExtension( +@@ -1232,7 +1232,7 @@ already_AddRefed nsOSHelperAppService::GetFromExtension( #ifdef MOZ_WIDGET_GTK - LOG(("Looking in GNOME registry\n")); + LOG("Looking in GNOME registry\n"); RefPtr gnomeInfo = - nsGNOMERegistry::GetFromExtension(aFileExt); + nsCommonRegistry::GetFromExtension(aFileExt); if (gnomeInfo) { - LOG(("Got MIMEInfo from GNOME registry\n")); + LOG("Got MIMEInfo from GNOME registry\n"); return gnomeInfo.forget(); -@@ -1266,7 +1266,7 @@ already_AddRefed nsOSHelperAppService::GetFromType( +@@ -1347,7 +1347,7 @@ already_AddRefed nsOSHelperAppService::GetFromType( #ifdef MOZ_WIDGET_GTK if (handler.IsEmpty()) { - RefPtr gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); + RefPtr gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); if (gnomeInfo) { - LOG( - ("Got MIMEInfo from GNOME registry without extensions; setting them " + LOG("Got MIMEInfo from GNOME registry without extensions; setting them " + "to %s\n", diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build -index bf64f7ebdc65..f94b4e017e5e 100644 +index d60d1995b278..693a5a251400 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -169,6 +169,7 @@ LOCAL_INCLUDES += [ +@@ -162,6 +162,7 @@ LOCAL_INCLUDES += [ "/layout/xul", "/other-licenses/atk-1.0", "/third_party/cups/include", @@ -1386,7 +1386,7 @@ index 9b3110aa0048..be9d559c7bf4 100644 GtkFileChooserAction action, const gchar* accept_label); diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp -index f3d0055f2cc6..d13543ab5221 100644 +index 7812bfd946ef..1b11780ac47b 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -43,6 +43,7 @@ @@ -1397,7 +1397,7 @@ index f3d0055f2cc6..d13543ab5221 100644 using namespace mozilla; -@@ -402,6 +403,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, +@@ -394,6 +395,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, constexpr auto kOs = u"os"_ns; constexpr auto kOsVersion = u"osversion"_ns; constexpr auto kABI = u"abi"_ns; @@ -1405,7 +1405,7 @@ index f3d0055f2cc6..d13543ab5221 100644 constexpr auto kProcess = u"process"_ns; #if defined(MOZ_WIDGET_ANDROID) constexpr auto kTablet = u"tablet"_ns; -@@ -461,6 +463,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, +@@ -453,6 +455,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, } nsAutoString osVersion; @@ -1413,7 +1413,7 @@ index f3d0055f2cc6..d13543ab5221 100644 #if defined(XP_WIN) # pragma warning(push) # pragma warning(disable : 4996) // VC12+ deprecates GetVersionEx -@@ -469,14 +472,17 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, +@@ -461,14 +464,17 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", info.dwMajorVersion, info.dwMinorVersion); } @@ -1431,7 +1431,7 @@ index f3d0055f2cc6..d13543ab5221 100644 #elif defined(MOZ_WIDGET_ANDROID) bool isTablet = false; if (mozilla::AndroidBridge::Bridge()) { -@@ -484,6 +490,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, +@@ -476,6 +482,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, "android/os/Build$VERSION", "RELEASE", osVersion); isTablet = java::GeckoAppShell::IsTablet(); } @@ -1439,7 +1439,7 @@ index f3d0055f2cc6..d13543ab5221 100644 #endif if (XRE_IsContentProcess()) { -@@ -588,6 +595,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, +@@ -576,6 +583,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, : eUnspecified; #endif int flags = 0; @@ -1447,7 +1447,7 @@ index f3d0055f2cc6..d13543ab5221 100644 while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) { -@@ -597,6 +605,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, +@@ -585,6 +593,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, if (CheckStringFlag(kApplication, wtoken, appID, stApp) || CheckOsFlag(kOs, wtoken, osTarget, stOs) || CheckStringFlag(kABI, wtoken, abi, stABI) || @@ -1455,7 +1455,7 @@ index f3d0055f2cc6..d13543ab5221 100644 CheckStringFlag(kProcess, wtoken, process, stProcess) || CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || -@@ -655,7 +664,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, +@@ -643,7 +652,7 @@ void ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, } if (!ok || stApp == eBad || stAppVersion == eBad || @@ -1477,10 +1477,10 @@ index 6cf78aa9bec5..dfcf9c7697af 100644 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp -index 410fcc19e435..d7c976e0e4b2 100644 +index 918e2b7955c0..54d6b230cf67 100644 --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -59,6 +59,7 @@ +@@ -51,6 +51,7 @@ #ifdef MOZ_WIDGET_GTK # include "nsIGIOService.h" @@ -1488,7 +1488,7 @@ index 410fcc19e435..d7c976e0e4b2 100644 #endif #ifdef MOZ_WIDGET_COCOA -@@ -2102,10 +2103,19 @@ nsLocalFile::Reveal() { +@@ -2088,10 +2089,19 @@ nsLocalFile::Reveal() { } #ifdef MOZ_WIDGET_GTK @@ -1510,7 +1510,7 @@ index 410fcc19e435..d7c976e0e4b2 100644 return giovfs->RevealFile(this); #elif defined(MOZ_WIDGET_COCOA) CFURLRef url; -@@ -2127,6 +2137,13 @@ nsLocalFile::Launch() { +@@ -2113,6 +2123,13 @@ nsLocalFile::Launch() { } #ifdef MOZ_WIDGET_GTK @@ -1525,5 +1525,5 @@ index 410fcc19e435..d7c976e0e4b2 100644 if (!giovfs) { return NS_ERROR_FAILURE; -- -2.37.0 +2.37.2