mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-10 07:50:19 +00:00
Merge pull request #69 from ZoiteChat/update-shared-modules
Updated the flatpak/shared-modules submodule to the latest upstream c…
This commit is contained in:
5
.github/workflows/flatpak-build.yml
vendored
5
.github/workflows/flatpak-build.yml
vendored
@@ -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:
|
||||
@@ -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
|
||||
|
||||
@@ -22,61 +22,117 @@
|
||||
<file alias="tree_util.png" preprocess="to-pixdata">icons/tree_util.png</file>
|
||||
|
||||
<file alias="menu/light/new.png" preprocess="to-pixdata">icons/menu/light/new.png</file>
|
||||
<file alias="menu/light/new.svg">icons/menu/light/new.svg</file>
|
||||
<file alias="menu/light/network-list.png" preprocess="to-pixdata">icons/menu/light/network-list.png</file>
|
||||
<file alias="menu/light/network-list.svg">icons/menu/light/network-list.svg</file>
|
||||
<file alias="menu/light/load-plugin.png" preprocess="to-pixdata">icons/menu/light/load-plugin.png</file>
|
||||
<file alias="menu/light/load-plugin.svg">icons/menu/light/load-plugin.svg</file>
|
||||
<file alias="menu/light/detach.png" preprocess="to-pixdata">icons/menu/light/detach.png</file>
|
||||
<file alias="menu/light/detach.svg">icons/menu/light/detach.svg</file>
|
||||
<file alias="menu/light/close.png" preprocess="to-pixdata">icons/menu/light/close.png</file>
|
||||
<file alias="menu/light/close.svg">icons/menu/light/close.svg</file>
|
||||
<file alias="menu/light/quit.png" preprocess="to-pixdata">icons/menu/light/quit.png</file>
|
||||
<file alias="menu/light/quit.svg">icons/menu/light/quit.svg</file>
|
||||
<file alias="menu/light/disconnect.png" preprocess="to-pixdata">icons/menu/light/disconnect.png</file>
|
||||
<file alias="menu/light/disconnect.svg">icons/menu/light/disconnect.svg</file>
|
||||
<file alias="menu/light/connect.png" preprocess="to-pixdata">icons/menu/light/connect.png</file>
|
||||
<file alias="menu/light/connect.svg">icons/menu/light/connect.svg</file>
|
||||
<file alias="menu/light/join.png" preprocess="to-pixdata">icons/menu/light/join.png</file>
|
||||
<file alias="menu/light/join.svg">icons/menu/light/join.svg</file>
|
||||
<file alias="menu/light/chanlist.png" preprocess="to-pixdata">icons/menu/light/chanlist.png</file>
|
||||
<file alias="menu/light/chanlist.svg">icons/menu/light/chanlist.svg</file>
|
||||
<file alias="menu/light/preferences.png" preprocess="to-pixdata">icons/menu/light/preferences.png</file>
|
||||
<file alias="menu/light/preferences.svg">icons/menu/light/preferences.svg</file>
|
||||
<file alias="menu/light/clear.png" preprocess="to-pixdata">icons/menu/light/clear.png</file>
|
||||
<file alias="menu/light/clear.svg">icons/menu/light/clear.svg</file>
|
||||
<file alias="menu/light/copy.png" preprocess="to-pixdata">icons/menu/light/copy.png</file>
|
||||
<file alias="menu/light/copy.svg">icons/menu/light/copy.svg</file>
|
||||
<file alias="menu/light/delete.png" preprocess="to-pixdata">icons/menu/light/delete.png</file>
|
||||
<file alias="menu/light/delete.svg">icons/menu/light/delete.svg</file>
|
||||
<file alias="menu/light/add.png" preprocess="to-pixdata">icons/menu/light/add.png</file>
|
||||
<file alias="menu/light/add.svg">icons/menu/light/add.svg</file>
|
||||
<file alias="menu/light/remove.png" preprocess="to-pixdata">icons/menu/light/remove.png</file>
|
||||
<file alias="menu/light/remove.svg">icons/menu/light/remove.svg</file>
|
||||
<file alias="menu/light/spell-check.png" preprocess="to-pixdata">icons/menu/light/spell-check.png</file>
|
||||
<file alias="menu/light/spell-check.svg">icons/menu/light/spell-check.svg</file>
|
||||
<file alias="menu/light/save.png" preprocess="to-pixdata">icons/menu/light/save.png</file>
|
||||
<file alias="menu/light/save.svg">icons/menu/light/save.svg</file>
|
||||
<file alias="menu/light/save-as.png" preprocess="to-pixdata">icons/menu/light/save-as.png</file>
|
||||
<file alias="menu/light/save-as.svg">icons/menu/light/save-as.svg</file>
|
||||
<file alias="menu/light/refresh.png" preprocess="to-pixdata">icons/menu/light/refresh.png</file>
|
||||
<file alias="menu/light/refresh.svg">icons/menu/light/refresh.svg</file>
|
||||
<file alias="menu/light/search.png" preprocess="to-pixdata">icons/menu/light/search.png</file>
|
||||
<file alias="menu/light/search.svg">icons/menu/light/search.svg</file>
|
||||
<file alias="menu/light/find.png" preprocess="to-pixdata">icons/menu/light/find.png</file>
|
||||
<file alias="menu/light/find.svg">icons/menu/light/find.svg</file>
|
||||
<file alias="menu/light/previous.png" preprocess="to-pixdata">icons/menu/light/previous.png</file>
|
||||
<file alias="menu/light/previous.svg">icons/menu/light/previous.svg</file>
|
||||
<file alias="menu/light/next.png" preprocess="to-pixdata">icons/menu/light/next.png</file>
|
||||
<file alias="menu/light/next.svg">icons/menu/light/next.svg</file>
|
||||
<file alias="menu/light/help.png" preprocess="to-pixdata">icons/menu/light/help.png</file>
|
||||
<file alias="menu/light/help.svg">icons/menu/light/help.svg</file>
|
||||
<file alias="menu/light/about.png" preprocess="to-pixdata">icons/menu/light/about.png</file>
|
||||
<file alias="menu/light/about.svg">icons/menu/light/about.svg</file>
|
||||
<file alias="menu/light/update.png" preprocess="to-pixdata">icons/menu/light/update.png</file>
|
||||
<file alias="menu/light/update.svg">icons/menu/light/update.svg</file>
|
||||
<file alias="menu/light/emoji.png" preprocess="to-pixdata">icons/menu/light/emoji.png</file>
|
||||
<file alias="menu/light/emoji.svg">icons/menu/light/emoji.svg</file>
|
||||
|
||||
<file alias="menu/dark/new.png" preprocess="to-pixdata">icons/menu/dark/new.png</file>
|
||||
<file alias="menu/dark/new.svg">icons/menu/dark/new.svg</file>
|
||||
<file alias="menu/dark/network-list.png" preprocess="to-pixdata">icons/menu/dark/network-list.png</file>
|
||||
<file alias="menu/dark/network-list.svg">icons/menu/dark/network-list.svg</file>
|
||||
<file alias="menu/dark/load-plugin.png" preprocess="to-pixdata">icons/menu/dark/load-plugin.png</file>
|
||||
<file alias="menu/dark/load-plugin.svg">icons/menu/dark/load-plugin.svg</file>
|
||||
<file alias="menu/dark/detach.png" preprocess="to-pixdata">icons/menu/dark/detach.png</file>
|
||||
<file alias="menu/dark/detach.svg">icons/menu/dark/detach.svg</file>
|
||||
<file alias="menu/dark/close.png" preprocess="to-pixdata">icons/menu/dark/close.png</file>
|
||||
<file alias="menu/dark/close.svg">icons/menu/dark/close.svg</file>
|
||||
<file alias="menu/dark/quit.png" preprocess="to-pixdata">icons/menu/dark/quit.png</file>
|
||||
<file alias="menu/dark/quit.svg">icons/menu/dark/quit.svg</file>
|
||||
<file alias="menu/dark/disconnect.png" preprocess="to-pixdata">icons/menu/dark/disconnect.png</file>
|
||||
<file alias="menu/dark/disconnect.svg">icons/menu/dark/disconnect.svg</file>
|
||||
<file alias="menu/dark/connect.png" preprocess="to-pixdata">icons/menu/dark/connect.png</file>
|
||||
<file alias="menu/dark/connect.svg">icons/menu/dark/connect.svg</file>
|
||||
<file alias="menu/dark/join.png" preprocess="to-pixdata">icons/menu/dark/join.png</file>
|
||||
<file alias="menu/dark/join.svg">icons/menu/dark/join.svg</file>
|
||||
<file alias="menu/dark/chanlist.png" preprocess="to-pixdata">icons/menu/dark/chanlist.png</file>
|
||||
<file alias="menu/dark/chanlist.svg">icons/menu/dark/chanlist.svg</file>
|
||||
<file alias="menu/dark/preferences.png" preprocess="to-pixdata">icons/menu/dark/preferences.png</file>
|
||||
<file alias="menu/dark/preferences.svg">icons/menu/dark/preferences.svg</file>
|
||||
<file alias="menu/dark/clear.png" preprocess="to-pixdata">icons/menu/dark/clear.png</file>
|
||||
<file alias="menu/dark/clear.svg">icons/menu/dark/clear.svg</file>
|
||||
<file alias="menu/dark/copy.png" preprocess="to-pixdata">icons/menu/dark/copy.png</file>
|
||||
<file alias="menu/dark/copy.svg">icons/menu/dark/copy.svg</file>
|
||||
<file alias="menu/dark/delete.png" preprocess="to-pixdata">icons/menu/dark/delete.png</file>
|
||||
<file alias="menu/dark/delete.svg">icons/menu/dark/delete.svg</file>
|
||||
<file alias="menu/dark/add.png" preprocess="to-pixdata">icons/menu/dark/add.png</file>
|
||||
<file alias="menu/dark/add.svg">icons/menu/dark/add.svg</file>
|
||||
<file alias="menu/dark/remove.png" preprocess="to-pixdata">icons/menu/dark/remove.png</file>
|
||||
<file alias="menu/dark/remove.svg">icons/menu/dark/remove.svg</file>
|
||||
<file alias="menu/dark/spell-check.png" preprocess="to-pixdata">icons/menu/dark/spell-check.png</file>
|
||||
<file alias="menu/dark/spell-check.svg">icons/menu/dark/spell-check.svg</file>
|
||||
<file alias="menu/dark/save.png" preprocess="to-pixdata">icons/menu/dark/save.png</file>
|
||||
<file alias="menu/dark/save.svg">icons/menu/dark/save.svg</file>
|
||||
<file alias="menu/dark/save-as.png" preprocess="to-pixdata">icons/menu/dark/save-as.png</file>
|
||||
<file alias="menu/dark/save-as.svg">icons/menu/dark/save-as.svg</file>
|
||||
<file alias="menu/dark/refresh.png" preprocess="to-pixdata">icons/menu/dark/refresh.png</file>
|
||||
<file alias="menu/dark/refresh.svg">icons/menu/dark/refresh.svg</file>
|
||||
<file alias="menu/dark/search.png" preprocess="to-pixdata">icons/menu/dark/search.png</file>
|
||||
<file alias="menu/dark/search.svg">icons/menu/dark/search.svg</file>
|
||||
<file alias="menu/dark/find.png" preprocess="to-pixdata">icons/menu/dark/find.png</file>
|
||||
<file alias="menu/dark/find.svg">icons/menu/dark/find.svg</file>
|
||||
<file alias="menu/dark/previous.png" preprocess="to-pixdata">icons/menu/dark/previous.png</file>
|
||||
<file alias="menu/dark/previous.svg">icons/menu/dark/previous.svg</file>
|
||||
<file alias="menu/dark/next.png" preprocess="to-pixdata">icons/menu/dark/next.png</file>
|
||||
<file alias="menu/dark/next.svg">icons/menu/dark/next.svg</file>
|
||||
<file alias="menu/dark/help.png" preprocess="to-pixdata">icons/menu/dark/help.png</file>
|
||||
<file alias="menu/dark/help.svg">icons/menu/dark/help.svg</file>
|
||||
<file alias="menu/dark/about.png" preprocess="to-pixdata">icons/menu/dark/about.png</file>
|
||||
<file alias="menu/dark/about.svg">icons/menu/dark/about.svg</file>
|
||||
<file alias="menu/dark/update.png" preprocess="to-pixdata">icons/menu/dark/update.png</file>
|
||||
<file alias="menu/dark/update.svg">icons/menu/dark/update.svg</file>
|
||||
<file alias="menu/dark/emoji.png" preprocess="to-pixdata">icons/menu/dark/emoji.png</file>
|
||||
<file alias="menu/dark/emoji.svg">icons/menu/dark/emoji.svg</file>
|
||||
</gresource>
|
||||
</gresources>
|
||||
|
||||
@@ -7,10 +7,14 @@
|
||||
"command": "zoitechat",
|
||||
"finish-args": [
|
||||
"--share=ipc",
|
||||
"--socket=wayland",
|
||||
"--socket=x11",
|
||||
"--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",
|
||||
|
||||
@@ -18,7 +22,7 @@
|
||||
],
|
||||
"add-extensions": {
|
||||
"net.zoite.Zoitechat.Plugin": {
|
||||
"version": "20.08",
|
||||
"version": "49",
|
||||
"directory": "extensions",
|
||||
"add-ld-path": "lib",
|
||||
"merge-dirs": "lib/zoitechat/plugins",
|
||||
@@ -29,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",
|
||||
@@ -40,7 +44,7 @@
|
||||
{
|
||||
"type": "git",
|
||||
"url": "https://github.com/pavouk/lgi.git",
|
||||
"commit": "95418635aa8151a516d43166227ea2b9d4c4403f"
|
||||
"commit": "c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -48,7 +52,6 @@
|
||||
"name": "zoitechat",
|
||||
"buildsystem": "meson",
|
||||
"config-opts": [
|
||||
"--buildtype=release",
|
||||
"-Dgtk3=true",
|
||||
"-Ddbus-service-use-appid=true",
|
||||
"-Dwith-perl=false",
|
||||
@@ -56,7 +59,7 @@
|
||||
"-Dwith-lua=lua"
|
||||
],
|
||||
"build-options": {
|
||||
"cflags": "-Wno-error=missing-include-dirs"
|
||||
"cflags": "-Dgtk3=true -Wno-error=missing-include-dirs"
|
||||
},
|
||||
"cleanup": [
|
||||
"/share/man"
|
||||
|
||||
Submodule flatpak/shared-modules updated: 137a4f488c...55a86b3da4
Reference in New Issue
Block a user