aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
diff options
context:
space:
mode:
authorMatthias Wolf <matthias@rheinwolf.de>2021-06-17 09:22:35 +0000
committerRene Ladan <rene@FreeBSD.org>2021-06-17 09:32:02 +0000
commit9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0 (patch)
treebd5ba927b4a7b2e0fc9aeef18b17d738079b2edd /www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
parentccd805d32e3522eee71501f122f41f59f99fd1b5 (diff)
downloadports-9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0.tar.gz
ports-9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0.zip
www/chromium: update to 91.0.4472.101
Security: https://vuxml.freebsd.org/freebsd/20b3ab21-c9df-11eb-8558-3065ec8fd3ec.html (cherry picked from commit 06317815238060a3a7f5911f18a3dd7c95779c83)
Diffstat (limited to 'www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc')
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 62f02ab5af67..09d20182d1b7 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-04-14 18:41:07 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-05-12 22:05:57 UTC
+++ net/proxy_resolution/proxy_config_service_linux.cc
@@ -6,7 +6,9 @@
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <map>
-@@ -511,6 +513,7 @@ int StringToIntOrDefault(base::StringPiece value, int
+@@ -512,6 +514,7 @@ int StringToIntOrDefault(base::StringPiece value, int
return default_value;
}
@@ -18,7 +18,7 @@
// This is the KDE version that reads kioslaverc and simulates gsettings.
// Doing this allows the main Delegate code, as well as the unit tests
// for it, to stay the same - and the settings map fairly well besides.
-@@ -1001,6 +1004,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1002,6 +1005,7 @@ class SettingGetterImplKDE : public ProxyConfigService
DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
};
@@ -26,7 +26,7 @@
} // namespace
-@@ -1215,8 +1219,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1216,8 +1220,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::nix::DESKTOP_ENVIRONMENT_KDE3:
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
case base::nix::DESKTOP_ENVIRONMENT_KDE5: