From e4b8c641b10eff9a9fc7af8d0d2478104f0fb199 Mon Sep 17 00:00:00 2001 From: deepend Date: Sat, 21 Feb 2026 14:38:59 -0700 Subject: [PATCH 01/12] Updated the flatpak/shared-modules submodule to the latest upstream commit from the configured shared-modules repository link (https://github.com/flathub/shared-modules.git). --- flatpak/shared-modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/shared-modules b/flatpak/shared-modules index 137a4f48..55a86b3d 160000 --- a/flatpak/shared-modules +++ b/flatpak/shared-modules @@ -1 +1 @@ -Subproject commit 137a4f488c7fc4cca531a379076f78a8e6f7c22d +Subproject commit 55a86b3da4969984f7de8fb02b3370247c9a266d From 724211362b4117bf7e0882f0dfd4b7e4d897f287 Mon Sep 17 00:00:00 2001 From: deepend Date: Sat, 21 Feb 2026 14:53:49 -0700 Subject: [PATCH 02/12] fixed one clear Flatpak metadata mismatch: the plugin extension version was still 20.08 while the runtime is GNOME 49. I updated the extension version to 49 so Flatpak metadata is internally consistent. --- flatpak/net.zoite.Zoitechat.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json index 154e4e16..13e97168 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/net.zoite.Zoitechat.json @@ -18,7 +18,7 @@ ], "add-extensions": { "net.zoite.Zoitechat.Plugin": { - "version": "20.08", + "version": "49", "directory": "extensions", "add-ld-path": "lib", "merge-dirs": "lib/zoitechat/plugins", From 3c2b0a8986145eead1b3b1d413099054fe219e82 Mon Sep 17 00:00:00 2001 From: deepend Date: Sat, 21 Feb 2026 15:46:43 -0700 Subject: [PATCH 03/12] =?UTF-8?q?Good=20catch=20on=20data/icons/menu=20?= =?UTF-8?q?=E2=80=94=20I=20updated=20the=20resource=20bundle=20to=20includ?= =?UTF-8?q?e=20the=20new=20SVG=20menu=20icons=20(for=20both=20light=20and?= =?UTF-8?q?=20dark=20variants),=20not=20just=20PNG=20entries.=20This=20ens?= =?UTF-8?q?ures=20those=20assets=20are=20actually=20packaged=20and=20avail?= =?UTF-8?q?able=20at=20runtime=20(including=20Flatpak).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kept existing PNG entries intact and added SVG entries alongside them so the current icon-loading fallback behavior continues to work while enabling the newer icon files. --- data/zoitechat.gresource.xml | 56 ++++++++++++++++++++++++++++++++ flatpak/net.zoite.Zoitechat.json | 4 +++ 2 files changed, 60 insertions(+) diff --git a/data/zoitechat.gresource.xml b/data/zoitechat.gresource.xml index 93f45143..45b158f2 100644 --- a/data/zoitechat.gresource.xml +++ b/data/zoitechat.gresource.xml @@ -22,61 +22,117 @@ icons/tree_util.png icons/menu/light/new.png + icons/menu/light/new.svg icons/menu/light/network-list.png + icons/menu/light/network-list.svg icons/menu/light/load-plugin.png + icons/menu/light/load-plugin.svg icons/menu/light/detach.png + icons/menu/light/detach.svg icons/menu/light/close.png + icons/menu/light/close.svg icons/menu/light/quit.png + icons/menu/light/quit.svg icons/menu/light/disconnect.png + icons/menu/light/disconnect.svg icons/menu/light/connect.png + icons/menu/light/connect.svg icons/menu/light/join.png + icons/menu/light/join.svg icons/menu/light/chanlist.png + icons/menu/light/chanlist.svg icons/menu/light/preferences.png + icons/menu/light/preferences.svg icons/menu/light/clear.png + icons/menu/light/clear.svg icons/menu/light/copy.png + icons/menu/light/copy.svg icons/menu/light/delete.png + icons/menu/light/delete.svg icons/menu/light/add.png + icons/menu/light/add.svg icons/menu/light/remove.png + icons/menu/light/remove.svg icons/menu/light/spell-check.png + icons/menu/light/spell-check.svg icons/menu/light/save.png + icons/menu/light/save.svg icons/menu/light/save-as.png + icons/menu/light/save-as.svg icons/menu/light/refresh.png + icons/menu/light/refresh.svg icons/menu/light/search.png + icons/menu/light/search.svg icons/menu/light/find.png + icons/menu/light/find.svg icons/menu/light/previous.png + icons/menu/light/previous.svg icons/menu/light/next.png + icons/menu/light/next.svg icons/menu/light/help.png + icons/menu/light/help.svg icons/menu/light/about.png + icons/menu/light/about.svg icons/menu/light/update.png + icons/menu/light/update.svg icons/menu/light/emoji.png + icons/menu/light/emoji.svg icons/menu/dark/new.png + icons/menu/dark/new.svg icons/menu/dark/network-list.png + icons/menu/dark/network-list.svg icons/menu/dark/load-plugin.png + icons/menu/dark/load-plugin.svg icons/menu/dark/detach.png + icons/menu/dark/detach.svg icons/menu/dark/close.png + icons/menu/dark/close.svg icons/menu/dark/quit.png + icons/menu/dark/quit.svg icons/menu/dark/disconnect.png + icons/menu/dark/disconnect.svg icons/menu/dark/connect.png + icons/menu/dark/connect.svg icons/menu/dark/join.png + icons/menu/dark/join.svg icons/menu/dark/chanlist.png + icons/menu/dark/chanlist.svg icons/menu/dark/preferences.png + icons/menu/dark/preferences.svg icons/menu/dark/clear.png + icons/menu/dark/clear.svg icons/menu/dark/copy.png + icons/menu/dark/copy.svg icons/menu/dark/delete.png + icons/menu/dark/delete.svg icons/menu/dark/add.png + icons/menu/dark/add.svg icons/menu/dark/remove.png + icons/menu/dark/remove.svg icons/menu/dark/spell-check.png + icons/menu/dark/spell-check.svg icons/menu/dark/save.png + icons/menu/dark/save.svg icons/menu/dark/save-as.png + icons/menu/dark/save-as.svg icons/menu/dark/refresh.png + icons/menu/dark/refresh.svg icons/menu/dark/search.png + icons/menu/dark/search.svg icons/menu/dark/find.png + icons/menu/dark/find.svg icons/menu/dark/previous.png + icons/menu/dark/previous.svg icons/menu/dark/next.png + icons/menu/dark/next.svg icons/menu/dark/help.png + icons/menu/dark/help.svg icons/menu/dark/about.png + icons/menu/dark/about.svg icons/menu/dark/update.png + icons/menu/dark/update.svg icons/menu/dark/emoji.png + icons/menu/dark/emoji.svg diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json index 13e97168..f05e4535 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/net.zoite.Zoitechat.json @@ -11,6 +11,10 @@ "--share=network", "--socket=pulseaudio", "--filesystem=xdg-download", + "--filesystem=xdg-data/themes:ro", + "--filesystem=xdg-data/icons:ro", + "--filesystem=~/.themes:ro", + "--filesystem=~/.icons:ro", "--talk-name=org.freedesktop.Notifications", From cc9b1e249afe39fb37917d4bffd8adc4bb2662bf Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Sat, 21 Feb 2026 16:19:22 -0700 Subject: [PATCH 04/12] Update socket and Lua version in Zoitechat config --- flatpak/net.zoite.Zoitechat.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json index f05e4535..6f8ebe73 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/net.zoite.Zoitechat.json @@ -7,7 +7,7 @@ "command": "zoitechat", "finish-args": [ "--share=ipc", - "--socket=wayland", + "--socket=x11", "--share=network", "--socket=pulseaudio", "--filesystem=xdg-download", @@ -33,7 +33,7 @@ }, "modules": [ "shared-modules/dbus-glib/dbus-glib.json", - "shared-modules/lua5.3/lua-5.3.5.json", + "shared-modules/lua5.4/lua-5.4.json", "shared-modules/libcanberra/libcanberra.json", "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json", "python3-cffi.json", @@ -44,7 +44,7 @@ { "type": "git", "url": "https://github.com/pavouk/lgi.git", - "commit": "95418635aa8151a516d43166227ea2b9d4c4403f" + "commit": "0fdcf8c677094d0c109dfb199031fdbc0c9c47ea" } ] }, From ee40f3842beca3faced697260645249480a30a23 Mon Sep 17 00:00:00 2001 From: deepend Date: Sat, 21 Feb 2026 16:27:11 -0700 Subject: [PATCH 05/12] =?UTF-8?q?Updated=20the=20Flatpak=20manifest?= =?UTF-8?q?=E2=80=99s=20lgi=20module=20pin=20from=20the=20old=20commit=20t?= =?UTF-8?q?o=20c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a,=20which=20matches?= =?UTF-8?q?=20the=20meson=20buildsystem=20expectation=20and=20avoids=20the?= =?UTF-8?q?=20Can't=20find=20meson.build=20failure=20for=20that=20module?= =?UTF-8?q?=20checkout=20path.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flatpak/net.zoite.Zoitechat.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json index 6f8ebe73..af9a8f8d 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/net.zoite.Zoitechat.json @@ -44,7 +44,7 @@ { "type": "git", "url": "https://github.com/pavouk/lgi.git", - "commit": "0fdcf8c677094d0c109dfb199031fdbc0c9c47ea" + "commit": "c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a" } ] }, From faf55e0d06f83fda70a17758a910d273882c768f Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Sat, 21 Feb 2026 16:36:58 -0700 Subject: [PATCH 06/12] Change branch for Flatpak build workflow --- .github/workflows/flatpak-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index 3362592a..ee3600e3 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -2,9 +2,9 @@ name: Flatpak Build on: push: - branches: [master] + branches: [update-shared-modules] pull_request: - branches: [master] + branches: [update-shared-modules] jobs: flatpak_build: From 3d450a3b33a72e730b8aaa0d6f0de52973b76d93 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Sat, 21 Feb 2026 16:54:03 -0700 Subject: [PATCH 07/12] Remove release build type from Zoitechat config --- flatpak/net.zoite.Zoitechat.json | 1 - 1 file changed, 1 deletion(-) diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json index af9a8f8d..4cf90697 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/net.zoite.Zoitechat.json @@ -52,7 +52,6 @@ "name": "zoitechat", "buildsystem": "meson", "config-opts": [ - "--buildtype=release", "-Dgtk3=true", "-Ddbus-service-use-appid=true", "-Dwith-perl=false", From 5080c3b1d2915620a375739eecbcfeeaea897d62 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:03:47 -0700 Subject: [PATCH 08/12] Enable GTK3 support in Zoitechat build config --- flatpak/net.zoite.Zoitechat.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json index 4cf90697..a2bacc47 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/net.zoite.Zoitechat.json @@ -52,14 +52,13 @@ "name": "zoitechat", "buildsystem": "meson", "config-opts": [ - "-Dgtk3=true", "-Ddbus-service-use-appid=true", "-Dwith-perl=false", "-Dwith-python=false", "-Dwith-lua=lua" ], "build-options": { - "cflags": "-Wno-error=missing-include-dirs" + "cflags": "-Dgtk3=true -Wno-error=missing-include-dirs" }, "cleanup": [ "/share/man" From e4e5689bc54f800c67878e30931c5ea64470663b Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:08:07 -0700 Subject: [PATCH 09/12] Enable GTK3 support in Zoitechat build options --- flatpak/net.zoite.Zoitechat.json | 1 + 1 file changed, 1 insertion(+) diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json index a2bacc47..d7578d37 100644 --- a/flatpak/net.zoite.Zoitechat.json +++ b/flatpak/net.zoite.Zoitechat.json @@ -52,6 +52,7 @@ "name": "zoitechat", "buildsystem": "meson", "config-opts": [ + "-Dgtk3=true", "-Ddbus-service-use-appid=true", "-Dwith-perl=false", "-Dwith-python=false", From fcaedd41ce7a4cba0528f45c593e953ed312d5f8 Mon Sep 17 00:00:00 2001 From: deepend Date: Sat, 21 Feb 2026 17:21:25 -0700 Subject: [PATCH 10/12] Updated the Flatpak GitHub Actions workflow to fully disable Flatpak builder caching by setting cache: false and restore-cache: false in the flatpak-builder step (and removing the previous cache-key usage) --- .github/workflows/flatpak-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index ee3600e3..487a803e 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -31,7 +31,8 @@ jobs: with: bundle: zoitechat.flatpak manifest-path: flatpak/net.zoite.Zoitechat.json - cache-key: flatpak-builder-${{ github.sha }} + cache: false + restore-cache: false - name: Upload Flatpak Bundle id: upload_flatpak From 19a19b42374bd03ffaa281655acaa1cef2efde80 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:30:00 -0700 Subject: [PATCH 11/12] Change branch triggers from update-shared-modules to master --- .github/workflows/flatpak-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index 487a803e..37f2e04a 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -2,13 +2,13 @@ name: Flatpak Build on: push: - branches: [update-shared-modules] + branches: [master] pull_request: - branches: [update-shared-modules] + branches: [master] jobs: flatpak_build: - runs-on: ubuntu-latest + runs-on: debian-latest permissions: contents: read From 7e8a830fdac959a2d98b3ecd80ffa228befdeb6f Mon Sep 17 00:00:00 2001 From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:33:34 -0700 Subject: [PATCH 12/12] Update CI to use Ubuntu and new Flatpak image --- .github/workflows/flatpak-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index 37f2e04a..66b039d4 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -8,7 +8,7 @@ on: jobs: flatpak_build: - runs-on: debian-latest + runs-on: ubuntu-latest permissions: contents: read @@ -17,7 +17,7 @@ jobs: artifact-metadata: write container: - image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-49 + image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.9 options: --privileged steps: