From 920e7564987c887e131de1659dc95e5e2b6fc325 Mon Sep 17 00:00:00 2001
From: Adis Durakovic <adis.durakovic@gmail.com>
Date: Sun, 24 Mar 2024 18:18:21 +0100
Subject: [PATCH] wip: flatpak

---
 .github/workflows/flatpak.yml                      | 4 ++--
 packaging/flatpak/io.github.ad_on_is.Resticity.yml | 9 ++++++---
 packaging/flatpak/webkit2.yaml                     | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index f4be0c8..658ddf6 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -3,7 +3,7 @@ run-name: ${{ github.ref_name }} - Building Flatpak
 on:
   push:
     tags:
-      - "*"
+      - "flatpak"
 jobs:
   flatpak:
     name: "Flatpak"
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        submodules: 'true'
+        submodules: 'recursive'
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
       with:
         manifest-path: packaging/flatpak/io.github.ad_on_is.Resticity.yml
diff --git a/packaging/flatpak/io.github.ad_on_is.Resticity.yml b/packaging/flatpak/io.github.ad_on_is.Resticity.yml
index 704089f..580b5b6 100644
--- a/packaging/flatpak/io.github.ad_on_is.Resticity.yml
+++ b/packaging/flatpak/io.github.ad_on_is.Resticity.yml
@@ -4,6 +4,8 @@ runtime-version: '45'
 sdk: org.gnome.Sdk
 
 
+
+
 command: resticity
 finish-args:
   - --share=ipc # Share IPC namespace with the host (necessary for X11).
@@ -27,10 +29,10 @@ build-options:
 
 
 modules:
-  - shared-modules/libappindicator/libappindicator-gtk3-12.10.json
+  # - shared-modules/libappindicator/libappindicator-gtk3-12.10.json
   # - shared-modules/libsoup/libsoup-2.4.json
   # - ./unifdef.yaml
-  - ./webkit2.yaml
+  # - ./webkit2.yaml
   # - ./restic.yaml
   # - ./rclone.yaml
 
@@ -43,7 +45,8 @@ modules:
   - name: resticity
     buildsystem: simple
     build-commands:
-      - PATH=$PATH:$GOROOT/bin $GOBIN/wails build -s -webview2 embed
+      - install -Dm00755 packaging/flatpak/lib/* $FLATPAK_DEST/lib/
+      - PATH=$PATH:$GOROOT/bin $GOBIN/wails build -s
       - install -Dm00755 build/bin/resticity $FLATPAK_DEST/bin/resticity
       - install -Dm00644 packaging/$FLATPAK_ID.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/$FLATPAK_ID.png
       - install -Dm00644 packaging/$FLATPAK_ID.desktop $FLATPAK_DEST/share/applications/$FLATPAK_ID.desktop
diff --git a/packaging/flatpak/webkit2.yaml b/packaging/flatpak/webkit2.yaml
index d5bd527..c8ce6d2 100644
--- a/packaging/flatpak/webkit2.yaml
+++ b/packaging/flatpak/webkit2.yaml
@@ -9,6 +9,7 @@ sources:
         version-pattern: LATEST-STABLE-(\d[\.\d]+\d)
         url-template: https://webkitgtk.org/releases/webkitgtk-$version.tar.xz
 buildsystem: cmake-ninja
+
 config-opts:
   - -DPORT=GTK
   - -DCMAKE_BUILD_TYPE=RelWithDebInfo