mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:a9aa543a508a
+:edb0ebe8cccc
 # HG changeset patch
 # User msirringhaus@suse.de
 # Date 1559294891 -7200
 #      Fri May 31 11:28:11 2019 +0200
 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent  43647626f7204e312a4e38cac0414a461b06667f
+# Parent  a22a4c4e41107a0809c33a83e9d14916738c5a82
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 https://bugzilla.novell.com/show_bug.cgi?id=170055
 #endif
 #ifdef MOZ_MEMORY
 #  include "mozmemory.h"
 #endif
-@@ -4570,25 +4571,37 @@ nsresult Preferences::InitInitialObjects
+@@ -4530,25 +4531,37 @@ nsresult Preferences::InitInitialObjects
 // application pref files for backwards compatibility.
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 NS_WARNING("Error parsing application default preferences.");
 }
 // Load jar:$app/omni.jar!/defaults/preferences/*.js
 // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4634,17 +4647,17 @@ nsresult Preferences::InitInitialObjects
+@@ -4594,17 +4607,17 @@ nsresult Preferences::InitInitialObjects
 }
 nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
 if (!path) {
 continue;
 if (aIsStartup) {
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -117,16 +117,20 @@ EXPORTS.mozilla += [
+@@ -118,16 +118,20 @@ EXPORTS.mozilla += [
 ]
 EXPORTS.mozilla += sorted(['!' + g for g in gen_h])
 UNIFIED_SOURCES += [
 'Preferences.cpp',
 self.base = base
 self.flags = Flags(*flags)
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
-@@ -46,10 +46,14 @@ XPCOM_MANIFESTS += [
+@@ -45,10 +45,14 @@ XPCOM_MANIFESTS += [
 if CONFIG['MOZ_PLACES']:
 EXTRA_JS_MODULES += [
 'DownloadHistory.jsm',
 ]
 NS_IMETHODIMP
 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
 // dbus prevents us from being threadsafe, but this routine should not block
 // anyhow
-@@ -384,21 +387,50 @@ nsresult nsUnixSystemProxySettings::GetP
+@@ -381,21 +384,50 @@ nsresult nsUnixSystemProxySettings::GetP
 return NS_OK;
 }
 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
 const nsACString& aScheme,
 +  {
 +    url += ":";
 +    url += nsPrintfCString("%d", aPort);
 +  }
 +  nsTArray<nsCString> command;
-+  command.AppendElement( NS_LITERAL_CSTRING( "GETPROXY" ));
++  command.AppendElement( "GETPROXY"_ns );
 +  command.AppendElement( url );
 +  nsTArray<nsCString> result;
 +  if( !nsKDEUtils::command( command, &result ) || result.Length() != 1 )
 +    return NS_ERROR_FAILURE;
 +  aResult = result[0];
 +    }
 +
 +static bool getKdeSupport()
 +    {
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING( "CHECK" ));
++    command.AppendElement( "CHECK"_ns );
-+    command.AppendElement( NS_LITERAL_CSTRING( MAKE_STR( KMOZILLAHELPER_VERSION )));
++    command.AppendElement( "KMOZILLAHELPER_VERSION"_ns );
 +    bool kde = nsKDEUtils::command( command );
 +#ifdef DEBUG_KDE
 +    fprintf( stderr, "KDE RUNNING %d\n", kde );
 +#endif
 +    return kde;
 +
 +/* static */ bool
 +nsKDERegistry::HandlerExists(const char *aProtocolScheme)
 +{
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING( "HANDLEREXISTS" ));
++    command.AppendElement( "HANDLEREXISTS"_ns );
 +    command.AppendElement( nsAutoCString( aProtocolScheme ));
 +    return nsKDEUtils::command( command );
 +}
 +
 +/* static */ nsresult
 +nsKDERegistry::LoadURL(nsIURI *aURL)
 +{
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING( "OPEN" ));
++    command.AppendElement( "OPEN"_ns );
 +    nsCString url;
 +    aURL->GetSpec( url );
 +    command.AppendElement( url );
 +    bool rv = nsKDEUtils::command( command );
 +    if (!rv)
 +/* static */ void
 +nsKDERegistry::GetAppDescForScheme(const nsACString& aScheme,
 +                                     nsAString& aDesc)
 +{
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING( "GETAPPDESCFORSCHEME" ));
++    command.AppendElement( "GETAPPDESCFORSCHEME"_ns );
 +    command.AppendElement( aScheme );
 +    nsTArray<nsCString> output;
 +    if( nsKDEUtils::command( command, &output ) && output.Length() == 1 )
 +        CopyUTF8toUTF16( output[ 0 ], aDesc );
 +}
 +/* static */ already_AddRefed<nsMIMEInfoBase>
 +nsKDERegistry::GetFromExtension(const nsACString& aFileExt)
 +{
 +    NS_ASSERTION(aFileExt[0] != '.', "aFileExt shouldn't start with a dot");
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING( "GETFROMEXTENSION" ));
++    command.AppendElement( "GETFROMEXTENSION"_ns );
 +    command.AppendElement( aFileExt );
 +    return GetFromHelper( command );
 +}
 +
 +/* static */ already_AddRefed<nsMIMEInfoBase>
 +nsKDERegistry::GetFromType(const nsACString& aMIMEType)
 +{
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING( "GETFROMTYPE" ));
++    command.AppendElement( "GETFROMTYPE"_ns );
 +    command.AppendElement( aMIMEType );
 +    return GetFromHelper( command );
 +}
 +
 +/* static */ already_AddRefed<nsMIMEInfoBase>
 +  if( nsKDEUtils::kdeSupport()) {
 +    bool supports;
 +    if( NS_SUCCEEDED( GetHasDefaultHandler( &supports )) && supports ) {
 +      nsTArray<nsCString> command;
-+      command.AppendElement( NS_LITERAL_CSTRING( "OPEN" ));
++      command.AppendElement( "OPEN"_ns );
 +      command.AppendElement( nativePath );
-+      command.AppendElement( NS_LITERAL_CSTRING( "MIMETYPE" ));
++      command.AppendElement( "MIMETYPE"_ns );
 +      command.AppendElement( mSchemeOrType );
 +      if( nsKDEUtils::command( command ))
 +        return NS_OK;
 +    }
 +    if (!mDefaultApplication)
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsIFileStreams.h"
 #include "nsILineInputStream.h"
 #include "nsIFile.h"
-@@ -1022,17 +1022,17 @@ nsresult nsOSHelperAppService::GetHandle
+@@ -1019,17 +1019,17 @@ nsresult nsOSHelperAppService::GetHandle
 nsresult nsOSHelperAppService::OSProtocolHandlerExists(
 const char* aProtocolScheme, bool* aHandlerExists) {
 nsresult rv = NS_OK;
 } else {
 *aHandlerExists = false;
 nsCOMPtr<nsIHandlerService> handlerSvc =
 do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
 if (NS_SUCCEEDED(rv) && handlerSvc) {
-@@ -1042,17 +1042,17 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1039,17 +1039,17 @@ nsresult nsOSHelperAppService::OSProtoco
 }
 return rv;
 }
 #endif
 }
 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol(
 const nsACString& aScheme, bool* _retval) {
-@@ -1139,17 +1139,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);
 if (NS_FAILED(rv) || majorType.IsEmpty()) {
 }
 #endif
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
 minorType, mime_types_description, false);
-@@ -1251,17 +1251,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1247,17 +1247,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
 // Now look up our extensions
 nsAutoString extensions, mime_types_description;
 LookUpExtensionsAndDescription(majorType, minorType, extensions,
 mime_types_description);
 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
 @@ -133,16 +133,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/layout/base',
 '/layout/generic',
 '/layout/xul',
 '/other-licenses/atk-1.0',
+'/third_party/cups/include',
 +    '/toolkit/xre',
 '/widget',
 '/widget/headless',
 ]
 +        selected.AppendInt( mSelectedType );
 +        command.AppendElement( selected );
 +        }
 +    command.AppendElement( title );
 +    if( mMode == nsIFilePicker::modeOpenMultiple )
-+        command.AppendElement( NS_LITERAL_CSTRING( "MULTIPLE" ));
++        command.AppendElement( "MULTIPLE"_ns );
 +    if( PRInt32 xid = windowToXid( mParentWidget ))
 +        {
-+        command.AppendElement( NS_LITERAL_CSTRING( "PARENT" ));
++        command.AppendElement( "PARENT"_ns );
 +        nsAutoCString parent;
 +        parent.AppendInt( xid );
 +        command.AppendElement( parent );
 +        }
 +
 +
 +    nsCString title;
 +    title.Adopt(ToNewUTF8String(mTitle));
 +
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING( "APPSDIALOG" ));
++    command.AppendElement( "APPSDIALOG"_ns );
 +    command.AppendElement( title );
 +    if( PRInt32 xid = windowToXid( mParentWidget ))
 +        {
-+        command.AppendElement( NS_LITERAL_CSTRING( "PARENT" ));
++        command.AppendElement( "PARENT"_ns );
 +        nsAutoCString parent;
 +        parent.AppendInt( xid );
 +        command.AppendElement( parent );
 +        }
 +
 struct ManifestDirective {
 const char* directive;
 int argc;
 bool ischrome;
-@@ -394,16 +395,17 @@ void ParseManifest(NSLocationType aType,
+@@ -393,16 +394,17 @@ void ParseManifest(NSLocationType aType,
-NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
+constexpr auto kRemoteEnabled = u"remoteenabled"_ns;
-NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
+constexpr auto kRemoteRequired = u"remoterequired"_ns;
-NS_NAMED_LITERAL_STRING(kApplication, "application");
+constexpr auto kApplication = u"application"_ns;
-NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
+constexpr auto kAppVersion = u"appversion"_ns;
-NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
+constexpr auto kGeckoVersion = u"platformversion"_ns;
-NS_NAMED_LITERAL_STRING(kOs, "os");
+constexpr auto kOs = u"os"_ns;
-NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
+constexpr auto kOsVersion = u"osversion"_ns;
-NS_NAMED_LITERAL_STRING(kABI, "abi");
+constexpr auto kABI = u"abi"_ns;
-+  NS_NAMED_LITERAL_STRING(kDesktop, "desktop");
++  constexpr auto kDesktop = u"desktop"_ns;
-NS_NAMED_LITERAL_STRING(kProcess, "process");
+constexpr auto kProcess = u"process"_ns;
 #if defined(MOZ_WIDGET_ANDROID)
-NS_NAMED_LITERAL_STRING(kTablet, "tablet");
+constexpr auto kTablet = u"tablet"_ns;
 #endif
-NS_NAMED_LITERAL_STRING(kMain, "main");
+constexpr auto kMain = u"main"_ns;
-NS_NAMED_LITERAL_STRING(kContent, "content");
+constexpr auto kContent = u"content"_ns;
-@@ -449,39 +451,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);
 }
 }
 OSVERSIONINFO info = {sizeof(OSVERSIONINFO)};
 if (GetVersionEx(&info)) {
 nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", info.dwMajorVersion,
 info.dwMinorVersion);
 }
-+  desktop = NS_LITERAL_STRING("win");
++  desktop = u"win"_ns;
 #  pragma warning(pop)
 #elif defined(MOZ_WIDGET_COCOA)
 SInt32 majorVersion = nsCocoaFeatures::macOSVersionMajor();
 SInt32 minorVersion = nsCocoaFeatures::macOSVersionMinor();
 nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", majorVersion, minorVersion);
-+  desktop = NS_LITERAL_STRING("macosx");
++  desktop = u"macosx"_ns);
 #elif defined(MOZ_WIDGET_GTK)
 nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version,
 gtk_minor_version);
-+  desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
++  desktop = nsKDEUtils::kdeSession() ? u"kde"_ns : u"gnome"_ns;
 #elif defined(MOZ_WIDGET_ANDROID)
 bool isTablet = false;
 if (mozilla::AndroidBridge::Bridge()) {
 mozilla::AndroidBridge::Bridge()->GetStaticStringField(
 "android/os/Build$VERSION", "RELEASE", osVersion);
 isTablet = java::GeckoAppShell::IsTablet();
 }
-+  desktop = NS_LITERAL_STRING("android");
++  desktop = u"android"_ns;
 #endif
 if (XRE_IsContentProcess()) {
 process = kContent;
 } else {
 process = kMain;
 }
-@@ -568,25 +575,27 @@ void ParseManifest(NSLocationType aType,
+@@ -567,25 +574,27 @@ void ParseManifest(NSLocationType aType,
 TriState stOsVersion = eUnspecified;
 TriState stOs = eUnspecified;
 TriState stABI = eUnspecified;
 TriState stProcess = eUnspecified;
 #if defined(MOZ_WIDGET_ANDROID)
 CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion,
 stGeckoVersion)) {
 continue;
 }
-@@ -623,17 +632,17 @@ void ParseManifest(NSLocationType aType,
+@@ -622,17 +631,17 @@ void ParseManifest(NSLocationType aType,
 }
 LogMessageWithContext(
 aFile, line, "Unrecognized chrome manifest modifier '%s'.", token);
 ok = false;
 #else
 return NS_ERROR_FAILURE;
 #endif
 +  if(nsKDEUtils::kdeSupport()) {
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING("REVEAL") );
++    command.AppendElement( "REVEAL"_ns );
 +    command.AppendElement( mPath );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +  }
 +
 +  if (!giovfs)
 }
 #ifdef MOZ_WIDGET_GTK
 +  if( nsKDEUtils::kdeSupport()) {
 +    nsTArray<nsCString> command;
-+    command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
++    command.AppendElement( "OPEN"_ns );
 +    command.AppendElement( mPath );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +  }
 nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 if (!giovfs) {

branch	firefox80
changeset 1141	edb0ebe8cccc
parent 1140	a9aa543a508a
child 1144	8a43aff7e982