waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

allow builds for webkit2gtk-4.1

Browse Source 
changelog
This commit is contained in:
atterpac
2024-05-08 11:03:36 -06:00
parent 1193fe9799
commit 18d28c9ab5
15 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2/internal/frontend/desktop/linux/clipboard.go
+3 -1
View File
@@ -4,7 +4,9 @@
package linux
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
v2/internal/frontend/desktop/linux/frontend.go
+3 -1
View File
@@ -4,7 +4,9 @@
package linux
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
v2/internal/frontend/desktop/linux/gtk.go
+3 -1
View File
@@ -4,7 +4,9 @@
package linux
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
v2/internal/frontend/desktop/linux/keys.go
+4 -1
View File
@@ -4,7 +4,10 @@
package linux
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
v2/internal/frontend/desktop/linux/menu.go
+3 -1
View File
@@ -4,7 +4,9 @@
package linux
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
v2/internal/frontend/desktop/linux/screen.go
+4 -1
View File
@@ -4,7 +4,10 @@
package linux
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#cgo CFLAGS: -w
#include <stdio.h>
#include "webkit2/webkit2.h"
v2/internal/frontend/desktop/linux/webkit2.go
+2 -1
View File
@@ -3,7 +3,8 @@
package linux
/*
#cgo linux pkg-config: webkit2gtk-4.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "webkit2/webkit2.h"
*/
import "C"
v2/internal/frontend/desktop/linux/window.go
+3 -1
View File
@@ -4,7 +4,9 @@
package linux
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include <JavaScriptCore/JavaScript.h>
#include <gtk/gtk.h>
v2/pkg/assetserver/webview/request_linux.go
+3 -1
View File
@@ -4,7 +4,9 @@
package webview
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 gio-unix-2.0
#cgo linux pkg-config: gtk+-3.0 gio-unix-2.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
v2/pkg/assetserver/webview/responsewriter_linux.go
+3 -1
View File
@@ -4,7 +4,9 @@
package webview
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 gio-unix-2.0
#cgo linux pkg-config: gtk+-3.0 gio-unix-2.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
v2/pkg/assetserver/webview/webkit2_36+.go
+4 -2
View File
@@ -1,9 +1,11 @@
//go:build linux && (webkit2_36 || webkit2_40)
//go:build linux && (webkit2_36 || webkit2_40 || webkit2_41 )
package webview
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 libsoup-2.4
#cgo linux pkg-config: gtk+-3.0
#cgo !webkit2_41 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"
v2/pkg/assetserver/webview/webkit2_40+.go
+4 -2
View File
@@ -1,9 +1,11 @@
//go:build linux && webkit2_40
//go:build linux && (webkit2_40 || webkit2_41)
package webview
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 gio-unix-2.0
#cgo linux pkg-config: gtk+-3.0 gio-unix-2.0
#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
#cgo webkit2_41 pkg-config: webkit2gtk-4.1
#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
v2/pkg/assetserver/webview/webkit2_41.go
+5
View File
@@ -0,0 +1,5 @@
//go:build linux && webkit2_41
package webview
const Webkit2MinMinorVersion = 41
v2/pkg/assetserver/webview/webkit2_legacy.go
+1 -1
View File
@@ -1,4 +1,4 @@
//go:build linux && !(webkit2_36 || webkit2_40)
//go:build linux && !(webkit2_36 || webkit2_40 || webkit2_41)
package webview
website/src/pages/changelog.mdx
+3
View File
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- Support for compiling with `libwebkit2gtk-4.1` instead of `4.0` to support latest Ubuntu release by [atterpac](https://github.com/atterpac) in [#3465](https://github.com/wailsapp/wails/pull/3465)
## v2.8.2 - 2024-05-08
### Breaking Change