[V3-Linux] Upgrade to Webkitgtk4.1 (#3461)

* webkitgtk4.0->webkitgtk4.1 changelog * Update mkdocs-website/docs/en/changelog.md * Update deps in pipeline * Update deps in pipeline * Install 4.1 only when v3 * Install 4.1 only when v3 --------- Co-authored-by: Lea Anthony <[email protected]>
wailsapp · May 8, 2024 · 71b2edc · 71b2edc
1 parent 7661cd1
commit 71b2edc
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/build-and-test-alpha.yml b/.github/workflows/build-and-test-alpha.yml
@@ -23,7 +23,7 @@ jobs:
 
  - name: Install linux dependencies
  if: matrix.os == 'ubuntu-latest'
- run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev javascriptcoregtk-4.1-dev build-essential pkg-config
+ run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev javascriptcoregtk-4.1-dev build-essential pkg-config
 
  - name: Setup Go
  uses: actions/setup-go@v3
@@ -122,7 +122,7 @@ jobs:
 
  - name: Install linux dependencies
  if: matrix.os == 'ubuntu-latest'
- run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev javascriptcoregtk-4.1-dev build-essential pkg-config
+ run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev javascriptcoregtk-4.1-dev build-essential pkg-config
 
  - name: Build Wails3 CLI
  run: |

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -62,8 +62,12 @@ jobs:
  - name: Checkout code
  uses: actions/checkout@v3
 
- - name: Install linux dependencies
- if: matrix.os == 'ubuntu-latest'
+ - name: Install linux dependencies (v3)
+ if: ${{ matrix.os == 'ubuntu-latest' && github.event.pull_request.base.ref == 'v3-alpha' }}
+ run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config
+
+ - name: Install linux dependencies (v2)
+ if: ${{ matrix.os == 'ubuntu-latest' && github.event.pull_request.base.ref == 'master' }}
  run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
 
  - name: Setup Go

diff --git a/mkdocs-website/docs/en/changelog.md b/mkdocs-website/docs/en/changelog.md
@@ -68,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Update linux webkit dependency to webkit2gtk-4.1 over webkitgtk2-4.0 to support Ubuntu 24.04 LTS by [atterpac](https://github.com/atterpac) in [#3461](https://github.com/wailsapp/wails/pull/3461)
 - The bundled JS runtime script is now an ESM module: script tags importing it must have the `type="module"` attribute. By [@fbbdev](https://github.com/fbbdev) in [#3295](https://github.com/wailsapp/wails/pull/3295)
 - The `@wailsio/runtime` package does not publish its API on the `window.wails` object, and does not start the WML system. This has been done to improve encapsulation. The WML system can be started manually if desired by calling the new `WML.Enable` method. The bundled JS runtime script still performs both operations automatically. By [@fbbdev](https://github.com/fbbdev) in [#3295](https://github.com/wailsapp/wails/pull/3295)
 - The Window API module `@wailsio/runtime/src/window` now exposes the containing window object as a default export. It is not possible anymore to import individual methods through ESM named or namespace import syntax.

diff --git a/v3/internal/assetserver/webview/request_linux.go b/v3/internal/assetserver/webview/request_linux.go
@@ -4,7 +4,7 @@
 package webview
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 gio-unix-2.0
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1 gio-unix-2.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
@@ -3,7 +3,7 @@
 package webview
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 gio-unix-2.0
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1 gio-unix-2.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
@@ -3,7 +3,7 @@
 package webview
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 libsoup-2.4
+#cgo linux pkg-config: gtk+-3.0 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
@@ -1,7 +1,7 @@
 package operatingsystem
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1
 #include <webkit2/webkit2.h>
 */
 import "C"

diff --git a/v3/pkg/application/linux_cgo.go b/v3/pkg/application/linux_cgo.go
@@ -15,7 +15,7 @@ import (
 )
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 gdk-3.0
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.1 gdk-3.0
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>