Compare commits

..

3 Commits

Author SHA1 Message Date
Travis McLane 0b4c98b4d5 chore: golang.org/x/net -> v0.23.0 2024-05-08 17:42:52 -05:00
Travis McLane 47b561f778 update to support go install
- default to webkit2gtk-4.1 if not overridden to be 4.0
2024-05-08 17:33:55 -05:00
Travis McLane 5ffceffbd0 build tags for supporting webkit2gtk 4.0 and 4.1 2024-05-08 10:46:03 -05:00
13 changed files with 31 additions and 11 deletions
-1
View File
@@ -37,7 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fixed react template css to show footer by [atterpac](https://github.com/atterpac) in [#3477](https://github.com/wailsapp/wails/pull/3477)
- Fixed zombie processes when working in devmode by updating to latest refresh by [Atterpac](https://github.com/atterpac) in [#3320](https://github.com/wailsapp/wails/pull/3320).
- Fixed appimage webkit file sourcing by [Atterpac](https://github.com/atterpac) in [#3306](https://github.com/wailsapp/wails/pull/3306).
- Fixed Doctor apt package verify by [Atterpac](https://github.com/Atterpac) in [#2972](https://github.com/wailsapp/wails/pull/2972).
+1 -1
View File
@@ -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
+2
View File
@@ -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=
@@ -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"
@@ -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"
+3 -1
View File
@@ -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"
+4 -1
View File
@@ -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"
@@ -114,6 +114,7 @@ h1 {
margin-top: 1rem;
align-content: center;
text-align: center;
color: rgba(255, 255, 255, 0.67);
}
@media (prefers-color-scheme: light) {
@@ -157,4 +158,4 @@ h1 {
.input-box .input:focus {
border: none;
background-color: rgba(255, 255, 255, 1);
}
}
@@ -114,6 +114,7 @@ h1 {
margin-top: 1rem;
align-content: center;
text-align: center;
color: rgba(255, 255, 255, 0.67);
}
@media (prefers-color-scheme: light) {
@@ -157,4 +158,4 @@ h1 {
.input-box .input:focus {
border: none;
background-color: rgba(255, 255, 255, 1);
}
}
@@ -114,6 +114,7 @@ h1 {
margin-top: 1rem;
align-content: center;
text-align: center;
color: rgba(255, 255, 255, 0.67);
}
@media (prefers-color-scheme: light) {
@@ -157,4 +158,4 @@ h1 {
.input-box .input:focus {
border: none;
background-color: rgba(255, 255, 255, 1);
}
}
@@ -114,6 +114,7 @@ h1 {
margin-top: 1rem;
align-content: center;
text-align: center;
color: rgba(255, 255, 255, 0.67);
}
@media (prefers-color-scheme: light) {
@@ -157,4 +158,4 @@ h1 {
.input-box .input:focus {
border: none;
background-color: rgba(255, 255, 255, 1);
}
}
+4
View File
@@ -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; }
+3 -1
View File
@@ -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>