From 5ffceffbd0f1be8c47a034cb861981bff280c570 Mon Sep 17 00:00:00 2001
From: Travis McLane <tmclane@gmail.com>
Date: Wed, 8 May 2024 10:46:03 -0500
Subject: [PATCH] build tags for supporting webkit2gtk 4.0 and 4.1

---
 v3/internal/assetserver/webview/request_linux.go        | 4 +++-
 v3/internal/assetserver/webview/responsewriter_linux.go | 4 +++-
 v3/internal/assetserver/webview/webkit2.go              | 4 +++-
 v3/internal/operatingsystem/webkit_linux.go             | 5 ++++-
 v3/pkg/application/application_linux.go                 | 4 ++++
 v3/pkg/application/linux_cgo.go                         | 4 +++-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/v3/internal/assetserver/webview/request_linux.go b/v3/internal/assetserver/webview/request_linux.go
index 32969a1b..59399799 100644
--- a/v3/internal/assetserver/webview/request_linux.go
+++ b/v3/internal/assetserver/webview/request_linux.go
@@ -4,7 +4,9 @@
 package webview
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1 gio-unix-2.0
+#cgo linux pkg-config: gtk+-3.0 gio-unix-2.0
+#cgo webkit2_40 pkg-config: webkit2gtk-4.0 libsoup-2.4
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1 libsoup-3.0
 
 #include "gtk/gtk.h"
 #include "webkit2/webkit2.h"
diff --git a/v3/internal/assetserver/webview/responsewriter_linux.go b/v3/internal/assetserver/webview/responsewriter_linux.go
index 169b68ab..e6ff7204 100644
--- a/v3/internal/assetserver/webview/responsewriter_linux.go
+++ b/v3/internal/assetserver/webview/responsewriter_linux.go
@@ -3,7 +3,9 @@
 package webview
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1 gio-unix-2.0
+#cgo linux pkg-config: gtk+-3.0 gio-unix-2.0
+#cgo webkit2_40 pkg-config: webkit2gtk-4.0 libsoup-2.4
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1 libsoup-3.0
 
 #include "gtk/gtk.h"
 #include "webkit2/webkit2.h"
diff --git a/v3/internal/assetserver/webview/webkit2.go b/v3/internal/assetserver/webview/webkit2.go
index 21156a4c..87797533 100644
--- a/v3/internal/assetserver/webview/webkit2.go
+++ b/v3/internal/assetserver/webview/webkit2.go
@@ -3,7 +3,9 @@
 package webview
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1 libsoup-3.0
+#cgo pkg-config: gtk+-3.0
+#cgo webkit2_40 pkg-config: webkit2gtk-4.0 libsoup-2.4
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1 libsoup-3.0
 
 #include "gtk/gtk.h"
 #include "webkit2/webkit2.h"
diff --git a/v3/internal/operatingsystem/webkit_linux.go b/v3/internal/operatingsystem/webkit_linux.go
index 3feb9f32..69b29198 100644
--- a/v3/internal/operatingsystem/webkit_linux.go
+++ b/v3/internal/operatingsystem/webkit_linux.go
@@ -1,7 +1,10 @@
 package operatingsystem
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1
+#cgo linux pkg-config: gtk+-3.0
+#cgo webkit2_40 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
+
 #include <webkit2/webkit2.h>
 */
 import "C"
diff --git a/v3/pkg/application/application_linux.go b/v3/pkg/application/application_linux.go
index 22fd6da5..87df9108 100644
--- a/v3/pkg/application/application_linux.go
+++ b/v3/pkg/application/application_linux.go
@@ -3,6 +3,10 @@
 package application
 
 /*
+    #cgo linux pkg-config: gtk+-3.0
+    #cgo webkit2_40 pkg-config: webkit2gtk-4.0 libsoup-2.4
+    #cgo webkit2_41 pkg-config: webkit2gtk-4.1 libsoup-3.0
+
 	#include "gtk/gtk.h"
 	#include "webkit2/webkit2.h"
 	static guint get_compiled_gtk_major_version() { return GTK_MAJOR_VERSION; }
diff --git a/v3/pkg/application/linux_cgo.go b/v3/pkg/application/linux_cgo.go
index a820cb1d..18bc5f29 100644
--- a/v3/pkg/application/linux_cgo.go
+++ b/v3/pkg/application/linux_cgo.go
@@ -15,7 +15,9 @@ import (
 )
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1  gdk-3.0
+#cgo linux pkg-config: gdk-3.0 gtk+-3.0
+#cgo webkit2_40 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>