Update webkitgtk to 2.20.5

Author: bauerj

README.md

@@ -16,7 +16,7 @@ NOTE: These libraries can require additional installations if you haven't such.
 - `zeromq=4.3` distributed messaging
 - `spdlog=1.4.1` logging library
 - `gtest=1.8.1` for tests
-- `webkitgtk>=2.4.10` web content rendering
+- `webkit2gtk>=2.20.5` web content rendering
 - `Boost.System, Boost.Filesystem, Boost.Date_Time, Boost.Thread=1.70` 
 
 ### Building with Docker (only for Ubuntu 18.04)

player/CMakeLists.txt

@@ -12,7 +12,7 @@ pkg_check_modules(GSTREAMER REQUIRED
     gstreamer-pbutils-1.0>=1.16.2
     gstreamer-plugins-base-1.0>=1.16.2
     gstreamer-video-1.0>=1.16.2)
-pkg_check_modules(WEBKITGTK REQUIRED webkitgtk-3.0>=2.4.10)
+pkg_check_modules(WEBKITGTK REQUIRED webkit2gtk-4.0>=2.20.5)
 pkg_check_modules(GTKMM REQUIRED gtkmm-3.0>=3.22.0)
 pkg_check_modules(GLIBMM REQUIRED glibmm-2.4>=2.56.0)
 pkg_check_modules(X11 REQUIRED x11)

player/control/media/webview/WebViewGtk.cpp

@@ -2,7 +2,7 @@
 
 #include "common/types/Uri.hpp"
 
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 namespace ph = std::placeholders;
 
@@ -50,7 +50,9 @@ void WebViewGtk::enableTransparency()
     handler_.signal_screen_changed().connect(std::bind(&WebViewGtk::screenChanged, this, ph::_1));
     screenChanged(handler_.get_screen());
 
-    webkit_web_view_set_transparent(webView_, true);
+    GdkRGBA background_color;
+    gdk_rgba_parse(&background_color, "rgba(0,0,0,0)");
+    webkit_web_view_set_background_color(webView_, &background_color);
 }
 
 void WebViewGtk::screenChanged(const Glib::RefPtr<Gdk::Screen>& screen)

snap/snapcraft.yaml

@@ -37,7 +37,7 @@ parts:
       - wget
       - unzip
       - libgtkmm-3.0-dev 
-      - libwebkitgtk-3.0-dev
+      - libwebkit2gtk-4.0-dev
       - libxss-dev
       - libglibmm-2.4-dev
       - libssl-dev
@@ -197,7 +197,7 @@ parts:
       - libboost1.70
       - libgtkmm-3.0-1v5
       - libcanberra-gtk3-module
-      - libwebkitgtk-3.0-0
+      - libwebkit2gtk-4.0-dev
       - libgpm2 # gstreamer warning
       - libslang2 # gstreamer warning
     after: [zmq, boost, spdlog, gtest]