Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V3 feature/webkit2 40 41 #3467

Closed
wants to merge 3 commits into from
Closed

V3 feature/webkit2 40 41 #3467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ffceff
build tags for supporting webkit2gtk 4.0 and 4.1
tmclane May 8, 2024
47b561f
update to support `go install`
tmclane May 8, 2024
0b4c98b
chore: golang.org/x/net -> v0.23.0
tmclane May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion v3/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions v3/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 3 additions & 1 deletion v3/internal/assetserver/webview/request_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_40 pkg-config: webkit2gtk-4.1 libsoup-3.0

#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
Expand Down
4 changes: 3 additions & 1 deletion v3/internal/assetserver/webview/responsewriter_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_40 pkg-config: webkit2gtk-4.1 libsoup-3.0

#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
Expand Down
4 changes: 3 additions & 1 deletion v3/internal/assetserver/webview/webkit2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_40 pkg-config: webkit2gtk-4.1 libsoup-3.0

#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
Expand Down
5 changes: 4 additions & 1 deletion v3/internal/operatingsystem/webkit_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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_40 pkg-config: webkit2gtk-4.1

#include <webkit2/webkit2.h>
*/
import "C"
Expand Down
4 changes: 4 additions & 0 deletions v3/pkg/application/application_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_40 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; }
Expand Down
4 changes: 3 additions & 1 deletion v3/pkg/application/linux_cgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_40 pkg-config: webkit2gtk-4.1

#include <gtk/gtk.h>
#include <gdk/gdk.h>
Expand Down
Loading