diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 58a7d287b99..47b0c4ba37f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,10 +19,14 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Install linux dependencies - if: matrix.os == 'ubuntu-latest' + - name: Install linux dependencies ( 22.04 ) + if: matrix.os == 'ubuntu-22.04' run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config + - name: Install linux dependencies ( 24.04 ) + if: matrix.os == 'ubuntu-24.04' + run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config + - name: Setup Go uses: actions/setup-go@v4 with: @@ -73,7 +77,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest, ubuntu-24.04] template: [ svelte, @@ -107,10 +111,14 @@ jobs: go install wails -help - - name: Install linux dependencies - if: matrix.os == 'ubuntu-latest' + - name: Install linux dependencies ( 22.04 ) + if: matrix.os == 'ubuntu-22.04' run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config + - name: Install linux dependencies ( 24.04 ) + if: matrix.os == 'ubuntu-24.04' + run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config + - name: Generate template '${{ matrix.template }}' run: | mkdir -p ./test-${{ matrix.template }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0973cb65e01..2b1593af930 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -62,10 +62,14 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Install linux dependencies - if: matrix.os == 'ubuntu-latest' + - name: Install linux dependencies ( 22.04 ) + if: matrix.os == 'ubuntu-22.04' run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config + - name: Install linux dependencies ( 24.04 ) + if: matrix.os == 'ubuntu-24.04' + run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config + - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/v2/internal/frontend/desktop/linux/window.c b/v2/internal/frontend/desktop/linux/window.c index 49de5197803..0dee24f4256 100644 --- a/v2/internal/frontend/desktop/linux/window.c +++ b/v2/internal/frontend/desktop/linux/window.c @@ -507,7 +507,7 @@ GtkWidget *SetupWebview(void *contentManager, GtkWindow *window, int hideWindowO if(disableWebViewDragAndDrop) { - gtk_drag_dest_unset(G_OBJECT(webview)); + gtk_drag_dest_unset(webview); } if(enableDragAndDrop)