diff --git a/.github/workflows/build-and-test-alpha.yml b/.github/workflows/build-and-test-alpha.yml index 6c07d2a68..7ceba547c 100644 --- 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 index ea226507f..3e84db008 100644 --- 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 index 8aaf1da73..b8db3c290 100644 --- 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 index 101ee12fb..32969a1ba 100644 --- 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 index 8d93b6388..169b68ab5 100644 --- 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 index 2682dc81f..21156a4c5 100644 --- 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 index a13f6eebf..3feb9f32d 100644 --- 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 */ import "C" diff --git a/v3/pkg/application/linux_cgo.go b/v3/pkg/application/linux_cgo.go index ccec7a28c..a820cb1df 100644 --- 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 #include