From 5ffceffbd0f1be8c47a034cb861981bff280c570 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Wed, 8 May 2024 10:46:03 -0500 Subject: [PATCH 1/3] 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 32969a1baa5..59399799e81 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 169b68ab531..e6ff7204c2d 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 21156a4c584..877975333c7 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 3feb9f32d79..69b29198410 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 */ import "C" diff --git a/v3/pkg/application/application_linux.go b/v3/pkg/application/application_linux.go index 22fd6da5c76..87df91085c9 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 a820cb1df1e..18bc5f29717 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 #include From 47b561f778fe41e5883f771dbbde28a1e6384530 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Wed, 8 May 2024 11:30:18 -0500 Subject: [PATCH 2/3] 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 59399799e81..a76a7273cca 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 e6ff7204c2d..c687e862cc0 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 877975333c7..b17d26818ff 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 69b29198410..46f3aff1b01 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 87df91085c9..dba825f700c 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 18bc5f29717..98c510563e6 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 From 0b4c98b4d5c69282e4586c2bcf2348056d88d8b8 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Wed, 8 May 2024 17:42:52 -0500 Subject: [PATCH 3/3] chore: golang.org/x/net -> v0.23.0 --- v3/go.mod | 2 +- v3/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/v3/go.mod b/v3/go.mod index fe490577d89..26b295666c1 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -84,7 +84,7 @@ require ( golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/image v0.15.0 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/term v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/v3/go.sum b/v3/go.sum index e2b1eb14c63..75460375012 100644 --- a/v3/go.sum +++ b/v3/go.sum @@ -264,6 +264,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=