diff --git a/.github/workflows/build-and-test-v3.yml b/.github/workflows/build-and-test-v3.yml index 4a5df3b40..d08c95baa 100644 --- a/.github/workflows/build-and-test-v3.yml +++ b/.github/workflows/build-and-test-v3.yml @@ -125,10 +125,10 @@ jobs: if: matrix.os == 'ubuntu-latest' with: packages: libgtk-3-dev libwebkit2gtk-4.1-dev libwayland-dev build-essential pkg-config xvfb x11-xserver-utils at-spi2-core xdg-desktop-portal-gtk - version: 1.0 + version: 1.1 - - name: Install linux dependencies (GTK4) - webkit-gtk6-support branch only - if: matrix.os == 'ubuntu-latest' && github.head_ref == 'feature/webkit-gtk6-support' + - name: Install linux dependencies (GTK4) + if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev @@ -160,7 +160,7 @@ jobs: echo "Example compilation tests (GTK3) completed successfully" - name: Build Examples (GTK4 experimental) - if: matrix.os == 'ubuntu-latest' && github.head_ref == 'feature/webkit-gtk6-support' + if: matrix.os == 'ubuntu-latest' working-directory: v3 run: | echo "Starting example compilation tests (GTK4)..." @@ -190,7 +190,7 @@ jobs: ' - name: Run tests (ubuntu) - GTK4 experimental - if: matrix.os == 'ubuntu-latest' && github.head_ref == 'feature/webkit-gtk6-support' + if: matrix.os == 'ubuntu-latest' working-directory: v3 # Skip all service tests that hang in CI due to GTK4 display requirements # The services tests require a fully functional GTK4 display which xvfb cannot provide @@ -255,8 +255,8 @@ jobs: packages: libgtk-3-dev libwebkit2gtk-4.1-dev libwayland-dev build-essential pkg-config version: 1.1 - - name: Install linux dependencies (GTK4) - webkit-gtk6-support branch only - if: matrix.os == 'ubuntu-latest' && github.head_ref == 'feature/webkit-gtk6-support' + - name: Install linux dependencies (GTK4) + if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev diff --git a/v3/pkg/application/linux_cgo_gtk4.h b/v3/pkg/application/linux_cgo_gtk4.h index ff1d6a93a..72bf6408d 100644 --- a/v3/pkg/application/linux_cgo_gtk4.h +++ b/v3/pkg/application/linux_cgo_gtk4.h @@ -29,7 +29,7 @@ typedef struct WindowEvent { uint event; } WindowEvent; -typedef struct Screen { +typedef struct WailsScreen { const char* id; const char* name; int p_width; @@ -43,7 +43,7 @@ typedef struct Screen { float scaleFactor; double rotation; bool isPrimary; -} Screen; +} WailsScreen; typedef struct MenuItemData { guint id;