github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 18:10:48 +08:00
Code Projects Activity

allow builds for webkit2gtk-4.1 (#3465)

Browse Source
This commit is contained in:
Atterpac 2024-05-08 18:26:27 -06:00 committed by GitHub
parent 1193fe9799
commit 05bdeb0844
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pr.yml vendored
View File

@ -56,7 +56,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macos-latest] os: [ubuntu-latest, windows-latest, macos-latest]
go-version: ['1.20'] go-version: ['1.22']
steps: steps:
- name: Checkout code - name: Checkout code

4
v2/internal/frontend/desktop/linux/clipboard.go
View File

@ -4,7 +4,9 @@
package linux 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 "gtk/gtk.h"
#include "webkit2/webkit2.h" #include "webkit2/webkit2.h"

4
v2/internal/frontend/desktop/linux/frontend.go
View File

@ -4,7 +4,9 @@
package linux 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 "gtk/gtk.h"
#include "webkit2/webkit2.h" #include "webkit2/webkit2.h"

4
v2/internal/frontend/desktop/linux/gtk.go
View File

@ -4,7 +4,9 @@
package linux 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 "gtk/gtk.h"

5
v2/internal/frontend/desktop/linux/keys.go
View File

@ -4,7 +4,10 @@
package linux 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 "gtk/gtk.h"

4
v2/internal/frontend/desktop/linux/menu.go
View File

@ -4,7 +4,9 @@
package linux 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 "gtk/gtk.h"

5
v2/internal/frontend/desktop/linux/screen.go
View File

@ -4,7 +4,10 @@
package linux 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 #cgo CFLAGS: -w
#include <stdio.h> #include <stdio.h>
#include "webkit2/webkit2.h" #include "webkit2/webkit2.h"

3
v2/internal/frontend/desktop/linux/webkit2.go
View File

@ -3,7 +3,8 @@
package linux 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" #include "webkit2/webkit2.h"
*/ */
import "C" import "C"

4
v2/internal/frontend/desktop/linux/window.go
View File

@ -4,7 +4,9 @@
package linux 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 <JavaScriptCore/JavaScript.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>

4
v2/pkg/assetserver/webview/request_linux.go
View File

@ -4,7 +4,9 @@
package webview 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 "gtk/gtk.h"
#include "webkit2/webkit2.h" #include "webkit2/webkit2.h"

4
v2/pkg/assetserver/webview/responsewriter_linux.go
View File

@ -4,7 +4,9 @@
package webview 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 "gtk/gtk.h"
#include "webkit2/webkit2.h" #include "webkit2/webkit2.h"

6
v2/pkg/assetserver/webview/webkit2_36+.go
View File

@ -1,9 +1,11 @@
//go:build linux && (webkit2_36 || webkit2_40) //go:build linux && (webkit2_36 || webkit2_40 || webkit2_41 )
package webview 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 "gtk/gtk.h"
#include "webkit2/webkit2.h" #include "webkit2/webkit2.h"

6
v2/pkg/assetserver/webview/webkit2_40+.go
View File

@ -1,9 +1,11 @@
//go:build linux && webkit2_40 //go:build linux && (webkit2_40 || webkit2_41)
package webview 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 "gtk/gtk.h"
#include "webkit2/webkit2.h" #include "webkit2/webkit2.h"

5
v2/pkg/assetserver/webview/webkit2_41.go Normal file
View File

@ -0,0 +1,5 @@
//go:build linux && webkit2_41
package webview
const Webkit2MinMinorVersion = 41

2
v2/pkg/assetserver/webview/webkit2_legacy.go
View File

@ -1,4 +1,4 @@
//go:build linux && !(webkit2_36 || webkit2_40) //go:build linux && !(webkit2_36 || webkit2_40 || webkit2_41)
package webview package webview

3
website/src/pages/changelog.mdx
View File

@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [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 ## v2.8.2 - 2024-05-08
### Breaking Change ### Breaking Change