From 317db67d2001fc9036ea45c3cfad243cbf968233 Mon Sep 17 00:00:00 2001
From: Marcus Crane <marcus@utf9k.net>
Date: Sat, 7 Dec 2024 21:43:10 +1300
Subject: [PATCH] Build webkit2gtk4.0/4.1 versions for Linux + fix codesigning
 for Windows portable

Signed-off-by: Marcus Crane <marcus@utf9k.net>
---
 .github/workflows/release.yaml                | 26 +++++++++++++++----
 build/linux/october_0.0.0_ARCH/DEBIAN/control |  2 +-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 68c80a0..7666c87 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -20,6 +20,10 @@ jobs:
           - platform: darwin/universal
             os: macos-latest
             tag: darwin_universal
+          - arch: amd64
+            platform: linux/amd64
+            os: ubuntu-latest
+            tag: linux_amd64_webkit2gtk40
           - arch: amd64
             platform: linux/amd64
             os: ubuntu-latest
@@ -111,12 +115,24 @@ jobs:
     
       # Build -- app variants
 
-      ## Linux 
-      - name: Build wails app for Linux / macOS
-        if: runner.os == 'Linux' || runner.os == 'macOS'
+      ## Linux (webkit2gtk-4.0) -- We explicitly set 4.0 in this tag because it'll only be less used over time
+      - name: Build wails app for Linux (webkit2gtk-4.0)
+        if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64_webkit2gtk40'
         shell: bash
         run: wails build -platform ${{ matrix.build.platform }} -ldflags "-X main.version=v${{ steps.normalise_version.outputs.version }}"
-      
+
+      ## Linux (webkit2gtk-4.1) -- We set this as the new default as more users will use 24.0x+ over time
+      - name: Build wails app for Linux (webkit2gtk-4.1)
+        if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64'
+        shell: bash
+        run: wails build -platform ${{ matrix.build.platform }} -ldflags "-X main.version=v${{ steps.normalise_version.outputs.version }}"
+
+      ## macOS
+      - name: Build wails app for macOS
+        if: runner.os == 'macOS'
+        shell: bash
+        run: wails build -platform ${{ matrix.build.platform }} -ldflags "-X main.version=v${{ steps.normalise_version.outputs.version }}"
+
       ## Windows
       - name: Build Windows NSIS installer (Normal)
         if: runner.os == 'Windows' && matrix.build.tag == 'windows_amd64'
@@ -153,7 +169,7 @@ jobs:
         working-directory: ./build/bin
 
       - name: Codesign Windows Portable
-        if: runner.os == 'Windows' && matrix.build.portable == 'windows-portable_amd64' && startsWith(github.ref, 'refs/tags/')
+        if: runner.os == 'Windows' && matrix.build.tag == 'windows-portable_amd64' && startsWith(github.ref, 'refs/tags/')
         run: |
           echo "Creating certificate file"
           New-Item -ItemType directory -Path certificate
diff --git a/build/linux/october_0.0.0_ARCH/DEBIAN/control b/build/linux/october_0.0.0_ARCH/DEBIAN/control
index 2d19c89..e9717ae 100644
--- a/build/linux/october_0.0.0_ARCH/DEBIAN/control
+++ b/build/linux/october_0.0.0_ARCH/DEBIAN/control
@@ -3,7 +3,7 @@ Version: 0.0.0
 Section: base
 Priority: optional
 Architecture: ARCH
-Depends: libgtk-3-dev, libwebkit2gtk-4.0-dev
+Depends: libgtk-3-dev, libwebkit2gtk-4.0-dev | libwebkit2gtk-4.1-dev
 Maintainer: Marcus Crane <marcus@utf9k.net>
 Homepage: https://october.utf9k.net
 Description: A tool for syncing your Kobo highlights with Readwise