# HG changeset patch # User Wolfgang Rosenauer # Date 1658839520 -7200 # Node ID f871aac898851f7b9a51bca581a03494fbaca196 # Parent 4c6576f9cf04ae55555d661e40f60ccce11ed612 fix includes diff -r 4c6576f9cf04 -r f871aac89885 mozilla-kde.patch --- a/mozilla-kde.patch Sun Jul 10 10:35:20 2022 +0200 +++ b/mozilla-kde.patch Tue Jul 26 14:45:20 2022 +0200 @@ -3,7 +3,7 @@ # Date 1559294891 -7200 # Fri May 31 11:28:11 2019 +0200 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 -# Parent edd7284c391b503b76bb5bb6321f24ab2f5f8bdf +# Parent 64d0c9c59c2e7f31722466406a4c13cdf5c39a6b Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -255,7 +255,7 @@ 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 @@ #include "nsNetUtil.h" #include "nsISupportsPrimitives.h" #include "nsIGSettingsService.h" ++#include "nsPrintfCString.h" +#include "nsKDEUtils.h" using namespace mozilla; @@ -273,7 +274,7 @@ 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 @@ 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; }