wip: add support for webkitgtk 4.12754-switch-to-libsoup3

3 files changed, 66 insertions, 3 deletions

diff --git a/cmake/FindWEBKIT2GTK.cmake b/cmake/FindWEBKIT2GTK.cmake
index 391fdfe9d..0af554cff 100644
--- a/cmake/FindWEBKIT2GTK.cmake
+++ b/cmake/FindWEBKIT2GTK.cmake
@@ -33,7 +33,8 @@
 find_package(PkgConfig)
 
 if(PKG_CONFIG_FOUND)
-    pkg_check_modules(_WEBKIT2GTK webkit2gtk-4.0)
+    #pkg_check_modules(_WEBKIT2GTK webkit2gtk-4.0)
+    pkg_search_module(_WEBKIT2GTK webkit2gtk-4.1 webkit2gtk-4.0)
 endif(PKG_CONFIG_FOUND)
 
 set(WEBKIT2GTK_DEFINITIONS ${_WEBKIT2GTK_CFLAGS_OTHER})
@@ -42,7 +43,8 @@ find_path(WEBKIT2GTK_INCLUDE_DIR NAMES webkit2/webkit2.h
     HINTS ${_WEBKIT2GTK_INCLUDEDIR} ${_WEBKIT2GTK_INCLUDE_DIRS}
 )
 
-find_library(WEBKIT2GTK_LIB webkit2gtk-4.0
+find_library(WEBKIT2GTK_LIB
+    NAMES webkit2gtk-4.1 webkit2gtk-4.0
     HINTS
     ${_WEBKIT2GTK_LIBDIR}
     ${_WEBKIT2GTK_LIBRARY_DIRS}
diff --git a/flatpak/org.remmina.Remmina-local.json b/flatpak/org.remmina.Remmina-local.json
index 780a11f59..7163f7f6e 100644
--- a/flatpak/org.remmina.Remmina-local.json
+++ b/flatpak/org.remmina.Remmina-local.json
@@ -69,6 +69,7 @@
         "shared-modules/dbus-glib/dbus-glib.json",
         "shared-modules/libappindicator/libappindicator-gtk3-12.10.json",
         "shared-modules/libusb/libusb.json",
+        "requirements/webkit.json",
         {
             /**
             * libfreerdp uses xprop to try to detect keyboard layout
@@ -523,7 +524,7 @@
                 "-DWITH_CUPS:BOOL=ON",
                 "-DWITH_PYTHONLIBS:BOOL=ON",
                 "-DWITH_MANPAGES:BOOL=OFF",
-                "-DWITH_WWW=OFF"
+                "-DWITH_WWW=ON"
             ],
             "sources": [
                 {
diff --git a/flatpak/requirements/webkit.json b/flatpak/requirements/webkit.json
new file mode 100644
index 000000000..429b2dcb4
--- /dev/null
+++ b/flatpak/requirements/webkit.json
@@ -0,0 +1,60 @@
+/*
+Shared module for building and installing webkit2gtk
+
+This file was written by hand.
+
+File based on gfeeds:
+commit f3e8575d62b1701e885b0bda54222634130c6864
+
+Changes applied to this version of the file:
+* added this header
+* reformatted
+*/
+{
+  "name": "webkit2gtk-5",
+  "buildsystem": "cmake-ninja",
+  "config-opts": [
+    "-DPORT=GTK",
+    "-DCMAKE_BUILD_TYPE=Release",
+    "-DCMAKE_INSTALL_PREFIX=/app",
+    "-DCMAKE_INSTALL_LIBDIR=lib",
+    "-DCMAKE_INSTALL_LIBEXECDIR=lib",
+    "-DCMAKE_SKIP_RPATH=ON",
+    "-DUSE_GTK4=ON",
+    "-DENABLE_GAMEPAD=OFF",
+    "-DENABLE_GTKDOC=OFF"
+  ],
+  "modules": [
+    {
+      "name": "bubblewrap",
+      "buildsystem": "meson",
+      "config-opts": [],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/containers/bubblewrap/archive/refs/tags/v0.6.1.tar.gz",
+          "sha256": "2b21ee6d2bead1aaf7c35742e5e53b061ec6eb1644889a4379fda662b03e8121"
+        }
+      ]
+    },
+    {
+      "name": "xdg-dbus-proxy",
+      "buildsystem": "autotools",
+      "config-opts": [],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/flatpak/xdg-dbus-proxy/archive/refs/tags/0.1.3.tar.gz",
+          "sha256": "a1d57f0d478bee4cc2be67e84ac6fcfe729460345d8a4fadd6555ae83b14a789"
+        }
+      ]
+    }
+  ],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://webkitgtk.org/releases/webkitgtk-2.36.1.tar.xz",
+      "sha256": "0149ea5fb1d20f2a9981677d45c952a047330001ea24a8dc29035239f12c0c8f"
+    }
+  ]
+}