Attachment 203142 Details for Bug 236787 – Patch, that disables KDE support (originally taken from www/chromium, included in www/qt5-webengine 5.12.1)

[patch] Patch, that disables KDE support (originally taken from www/chromium, included in www/qt5-webengine 5.12.1)

patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc (text/plain), 1.26 KB, created by Kai Knoblich on 2019-03-25 17:07:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-03-25 17:07:06 UTC

Size: 1.26 KB

patch

obsolete

>--- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig	2018-11-13 18:25:11 UTC
>+++ src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc
>@@ -6,7 +6,9 @@
> 
> #include <errno.h>
> #include <limits.h>
>+#if !defined(OS_BSD)
> #include <sys/inotify.h>
>+#endif
> #include <unistd.h>
> 
> #include <map>
>@@ -493,6 +495,7 @@ int StringToIntOrDefault(base::StringPiece value, int 
>   return default_value;
> }
> 
>+#if !defined(OS_BSD)
> // 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.
>@@ -982,6 +985,7 @@ class SettingGetterImplKDE : public ProxyConfigService
> 
>   DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
> };
>+#endif
> 
> }  // namespace
> 
>@@ -1197,8 +1201,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
>     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
>     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
>     case base::nix::DESKTOP_ENVIRONMENT_KDE5:
>+#if !defined(OS_BSD)
>       setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get()));
>       break;
>+#endif
>     case base::nix::DESKTOP_ENVIRONMENT_XFCE:
>     case base::nix::DESKTOP_ENVIRONMENT_OTHER:
>       break;

Actions: View | Diff

Attachments on bug 236787: 203141 | 203142 | 203143