From 47b561f778fe41e5883f771dbbde28a1e6384530 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Wed, 8 May 2024 11:30:18 -0500 Subject: [PATCH] update to support `go install` - default to webkit2gtk-4.1 if not overridden to be 4.0 --- v3/internal/assetserver/webview/request_linux.go | 2 +- v3/internal/assetserver/webview/responsewriter_linux.go | 2 +- v3/internal/assetserver/webview/webkit2.go | 2 +- v3/internal/operatingsystem/webkit_linux.go | 2 +- v3/pkg/application/application_linux.go | 6 +++--- v3/pkg/application/linux_cgo.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/v3/internal/assetserver/webview/request_linux.go b/v3/internal/assetserver/webview/request_linux.go index 59399799..a76a7273 100644 --- a/v3/internal/assetserver/webview/request_linux.go +++ b/v3/internal/assetserver/webview/request_linux.go @@ -6,7 +6,7 @@ package webview /* #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 +#cgo !webkit2_40 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 e6ff7204..c687e862 100644 --- a/v3/internal/assetserver/webview/responsewriter_linux.go +++ b/v3/internal/assetserver/webview/responsewriter_linux.go @@ -5,7 +5,7 @@ package webview /* #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 +#cgo !webkit2_40 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 87797533..b17d2681 100644 --- a/v3/internal/assetserver/webview/webkit2.go +++ b/v3/internal/assetserver/webview/webkit2.go @@ -5,7 +5,7 @@ package webview /* #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 +#cgo !webkit2_40 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 69b29198..46f3aff1 100644 --- a/v3/internal/operatingsystem/webkit_linux.go +++ b/v3/internal/operatingsystem/webkit_linux.go @@ -3,7 +3,7 @@ package operatingsystem /* #cgo linux pkg-config: gtk+-3.0 #cgo webkit2_40 pkg-config: webkit2gtk-4.0 -#cgo webkit2_41 pkg-config: webkit2gtk-4.1 +#cgo !webkit2_40 pkg-config: webkit2gtk-4.1 #include */ diff --git a/v3/pkg/application/application_linux.go b/v3/pkg/application/application_linux.go index 87df9108..dba825f7 100644 --- a/v3/pkg/application/application_linux.go +++ b/v3/pkg/application/application_linux.go @@ -3,9 +3,9 @@ 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 + #cgo linux pkg-config: gtk+-3.0 + #cgo webkit2_40 pkg-config: webkit2gtk-4.0 libsoup-2.4 + #cgo !webkit2_40 pkg-config: webkit2gtk-4.1 libsoup-3.0 #include "gtk/gtk.h" #include "webkit2/webkit2.h" diff --git a/v3/pkg/application/linux_cgo.go b/v3/pkg/application/linux_cgo.go index 18bc5f29..98c51056 100644 --- a/v3/pkg/application/linux_cgo.go +++ b/v3/pkg/application/linux_cgo.go @@ -17,7 +17,7 @@ import ( /* #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 +#cgo !webkit2_40 pkg-config: webkit2gtk-4.1 #include #include