fix syntax error

Flatpak: missed changes to flatpak app id.
Tighten Flatpak D-Bus permissions
2026-06-10 08:50:18 +00:00 · 2026-05-22 01:55:53 -06:00 · 2026-05-22 01:35:49 -06:00 · 2026-05-22 00:34:09 -06:00 · 2026-05-22 00:29:13 -06:00 · 2026-05-22 00:23:42 -06:00
16 changed files with 169 additions and 171 deletions
--- a/.github/workflows/appimage-build.yml
+++ b/.github/workflows/appimage-build.yml
@@ -261,8 +261,8 @@ jobs:

          ./linuxdeploy-x86_64.AppImage \
            --appdir AppDir \
-            --desktop-file AppDir/usr/share/applications/net.zoite.Zoitechat.desktop \
-            --icon-file AppDir/usr/share/icons/hicolor/48x48/apps/net.zoite.Zoitechat.png \
+            --desktop-file AppDir/usr/share/applications/org.zoitechat.ZoiteChat.desktop \
+            --icon-file AppDir/usr/share/icons/hicolor/48x48/apps/org.zoitechat.ZoiteChat.png \
            --custom-apprun ./AppRun \
            --plugin gtk \
            --output appimage
--- a/.github/workflows/flatpak-build.yml
+++ b/.github/workflows/flatpak-build.yml
@@ -33,7 +33,7 @@ jobs:
        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
        with:
          bundle: zoitechat.flatpak
-          manifest-path: flatpak/net.zoite.Zoitechat.json
+          manifest-path: flatpak/org.zoitechat.ZoiteChat.json
          cache: false
          restore-cache: false

--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,11 +1,11 @@
 icondir = join_paths(get_option('datadir'), 'icons/hicolor')
 install_data(
  'zoitechat.png',
-  rename: 'net.zoite.Zoitechat.png',
+  rename: 'org.zoitechat.ZoiteChat.png',
  install_dir: join_paths(icondir, '48x48/apps')
 )
 install_data(
  'zoitechat.svg',
-  rename: 'net.zoite.Zoitechat.svg',
+  rename: 'org.zoitechat.ZoiteChat.svg',
  install_dir: join_paths(icondir, 'scalable/apps')
 )
--- a/data/misc/meson.build
+++ b/data/misc/meson.build
@@ -6,8 +6,8 @@ desktop_utils = find_program('desktop-file-validate', required: false)
 if get_option('gtk-frontend')
  if get_option('install-appdata')
    zoitechat_appdata = i18n.merge_file(
-      input: 'net.zoite.Zoitechat.appdata.xml.in',
-      output: 'net.zoite.Zoitechat.appdata.xml',
+      input: 'org.zoitechat.ZoiteChat.metainfo.xml.in',
+      output: 'org.zoitechat.ZoiteChat.metainfo.xml',
      po_dir: '../../po',
      install: true,
      install_dir: metainfodir
@@ -15,7 +15,7 @@ if get_option('gtk-frontend')

    appstreamcli = find_program('appstreamcli', required: false)
    if appstreamcli.found()
-      test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli,
+      test('Validate org.zoitechat.ZoiteChat.metainfo.xml', appstreamcli,
        args: ['validate', zoitechat_appdata]
      )
    endif
@@ -29,14 +29,14 @@ if get_option('gtk-frontend')
  endif

  desktop_file = configure_file(
-    input: 'net.zoite.Zoitechat.desktop.in.in',
-    output: 'net.zoite.Zoitechat.desktop.in',
+    input: 'org.zoitechat.ZoiteChat.desktop.in.in',
+    output: 'org.zoitechat.ZoiteChat.desktop.in',
    configuration: desktop_conf
  )

  zoitechat_desktop = i18n.merge_file(
    input: desktop_file,
-    output: 'net.zoite.Zoitechat.desktop',
+    output: 'org.zoitechat.ZoiteChat.desktop',
    po_dir: '../../po',
    type: 'desktop',
    install: true,
@@ -44,7 +44,7 @@ if get_option('gtk-frontend')
  )

  if desktop_utils.found()
-    test('Validate net.zoite.Zoitechat.desktop', desktop_utils,
+    test('Validate org.zoitechat.ZoiteChat.desktop', desktop_utils,
      args: [zoitechat_desktop]
    )
  endif
@@ -98,14 +98,14 @@ if get_option('plugin')
    conf.set('LICENSE', metainfo[2])

    plugin_appdata = configure_file(
-      input: 'net.zoite.Zoitechat.Plugin.metainfo.xml.in',
-      output: 'net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name),
+      input: 'org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in',
+      output: 'org.zoitechat.ZoiteChat.Plugin.@0@.metainfo.xml'.format(name),
      configuration: conf,
      install_dir: get_option('install-plugin-metainfo') ? metainfodir : '',
    )

    if appstreamcli.found()
-      test('Validate net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name), appstreamcli,
+      test('Validate org.zoitechat.ZoiteChat.Plugin.@0@.metainfo.xml'.format(name), appstreamcli,
        args: ['validate', plugin_appdata]
    )
    endif
--- a/data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in
+++ b/data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
-  <id>net.zoite.Zoitechat.Plugin.@NAME@</id>
-  <extends>net.zoite.Zoitechat</extends>
+  <id>org.zoitechat.ZoiteChat.Plugin.@NAME@</id>
+  <extends>org.zoitechat.ZoiteChat</extends>
  <name>@NAME@ Plugin</name>
  <summary>@SUMMARY@</summary>
  <url type="homepage">https://zoitechat.org/</url>
--- a/data/misc/org.zoitechat.ZoiteChat.desktop.in.in
+++ b/data/misc/org.zoitechat.ZoiteChat.desktop.in.in
@@ -4,12 +4,12 @@ GenericName=IRC Client
 Comment=Chat with other people online
 Keywords=IM;Chat;
 Exec=@exec_command@
-Icon=net.zoite.Zoitechat
+Icon=org.zoitechat.ZoiteChat
 Terminal=false
 Type=Application
 Categories=GTK;Network;IRCClient;
 StartupNotify=true
-StartupWMClass=net.zoite.Zoitechat
+StartupWMClass=org.zoitechat.ZoiteChat
 X-GNOME-UsesNotifications=true
 MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
 Actions=SafeMode;
--- a/data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in
+++ b/data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>net.zoite.Zoitechat</id>
+  <id>org.zoitechat.ZoiteChat</id>
  <name>ZoiteChat</name>
-  <launchable type="desktop-id">net.zoite.Zoitechat.desktop</launchable>
+  <launchable type="desktop-id">org.zoitechat.ZoiteChat.desktop</launchable>

-  <developer id="net.zoite">
+  <developer id="org.zoitechat">
    <name translate="no">ZoiteChat</name>
  </developer>

@@ -26,7 +26,7 @@
    </screenshot>
  </screenshots>
  <provides>
-    <id>zoitechat.desktop</id>
+    <id>org.zoitechat.ZoiteChat.desktop</id>
  </provides>
 <releases>
 <release date="2026-05-21" version="2.18.1">
@@ -339,7 +339,7 @@
      <description>
        <p>This is largely a bug fix release though it has some large behind the scenes changes:</p>
        <ul>
-          <li>Rename data files to use *net.zoite.Zoitechat* name</li>
+          <li>Rename data files to use *org.zoitechat.ZoiteChat* name</li>
          <li>Add option (irc_reconnect_rejoin) to disable auto-rejoin on reconnect</li>
          <li>Add ability to set custom tray icon separate of app icon</li>
          <li>Fix Enchant 2.0+ support</li>
--- a/data/misc/org.zoitechat.ZoiteChat.mime.xml
+++ b/data/misc/org.zoitechat.ZoiteChat.mime.xml
--- a/flatpak/Load-plugins-from-Flatpak-extensions.patch
+++ b/flatpak/Load-plugins-from-Flatpak-extensions.patch
@@ -1,25 +1,17 @@
-From 918503d57c6740d20be68a6717158673a2a8b25f Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <tingping@tingping.se>
-Date: Sat, 17 Mar 2018 05:57:49 -0400
-Subject: [PATCH] Support loading Flatpak extensions
-
---
- src/common/plugin.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/common/plugin.c b/src/common/plugin.c
-index 3ad3c558..6addf962 100644
 --- a/src/common/plugin.c
 +++ b/src/common/plugin.c
-@@ -450,6 +450,8 @@ plugin_auto_load (session *sess)
- 	lib_dir = plugin_get_libdir ();
- 	sub_dir = g_build_filename (get_xdir (), "addons", NULL);
- 
-+	for_files ("/app/extensions/lib/zoitechat/plugins", "*.so", plugin_auto_load_cb);
+@@ -470,7 +470,14 @@
+ 	if (libdir && *libdir)
+ 		return libdir;
+ 	else
+	{
+		if (g_file_test ("/app/extensions/lib/zoitechat/plugins", G_FILE_TEST_IS_DIR))
+		{
+			return "/app/extensions/lib/zoitechat/plugins";
+		}
 +
- #ifdef WIN32
- 	/* a long list of bundled plugins that should be loaded automatically,
- 	 * user plugins should go to <config>, leave Program Files alone! */
-- 
-2.14.3
+ 		return ZOITECHATLIBDIR;
+	}
+ }
 
+ void
--- a/flatpak/net.zoite.Zoitechat.json
+++ b/flatpak/net.zoite.Zoitechat.json
@@ -1,82 +0,0 @@
-{
-  "app-id": "net.zoite.Zoitechat",
-  "branch": "master",
-  "runtime": "org.gnome.Platform",
-  "runtime-version": "49",
-  "sdk": "org.gnome.Sdk",
-  "command": "zoitechat",
-  "finish-args": [
-    "--share=ipc",
-    "--socket=wayland",
-    "--socket=fallback-x11",
-    "--share=network",
-    "--socket=pulseaudio",
-    "--filesystem=xdg-download",
-    "--filesystem=xdg-data/themes:ro",
-    "--filesystem=xdg-data/icons:ro",
-    "--filesystem=xdg-run/tray-icon:create",
-    "--env=GTK_CSD=1",
-    "--talk-name=org.freedesktop.Notifications",
-    "--talk-name=org.kde.StatusNotifierWatcher",
-    "--talk-name=com.canonical.AppMenu.Registrar",
-    "--talk-name=org.mpris.MediaPlayer2.*"
-  ],
-  "add-extensions": {
-    "net.zoite.Zoitechat.Plugin": {
-      "version": "49",
-      "directory": "extensions",
-      "add-ld-path": "lib",
-      "merge-dirs": "lib/zoitechat/plugins",
-      "subdirectories": true,
-      "no-autodownload": true,
-      "autodelete": true
-    }
-  },
-  "modules": [
-    "shared-modules/lua5.4/lua-5.4.json",
-    "shared-modules/libcanberra/libcanberra.json",
-    "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json",
-    "python3-cffi.json",
-    "perl.json",
-    {
-      "name": "lgi",
-      "buildsystem": "meson",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/pavouk/lgi/archive/c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a.tar.gz",
-          "sha256": "db67b2b7ee89fa566f783486d56be7203552a997bc55f35020b57dd2776b9943"
-        }
-      ]
-    },
-    {
-      "name": "zoitechat",
-      "buildsystem": "meson",
-      "config-opts": [
-        "-Ddbus-service-use-appid=true",
-        "-Dwith-perl=perl",
-        "-Dwith-python=python3",
-        "-Dwith-lua=lua"
-      ],
-      "build-options": {
-        "cflags": "-Wno-error=missing-include-dirs"
-      },
-      "cleanup": [
-        "/share/man"
-      ],
-      "post-install": [
-        "install -d /app/extensions"
-      ],
-      "sources": [
-        {
-          "type": "dir",
-          "path": ".."
-        },
-        {
-          "type": "patch",
-          "path": "Load-plugins-from-Flatpak-extensions.patch"
-        }
-      ]
-    }
-  ]
-}
--- a/flatpak/org.zoitechat.ZoiteChat.json
+++ b/flatpak/org.zoitechat.ZoiteChat.json
@@ -0,0 +1,127 @@
+{
+  "app-id": "org.zoitechat.ZoiteChat",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "50",
+  "sdk": "org.gnome.Sdk",
+  "command": "zoitechat",
+  "finish-args": [
+    "--share=ipc",
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--share=network",
+    "--socket=pulseaudio",
+    "--filesystem=xdg-download",
+    "--filesystem=xdg-run/tray-icon:create",
+    "--env=GTK_CSD=1",
+    "--talk-name=org.freedesktop.Notifications",
+    "--talk-name=org.kde.StatusNotifierWatcher",
+    "--talk-name=com.canonical.AppMenu.Registrar"
+  ],
+  "add-extensions": {
+    "org.zoitechat.ZoiteChat.Plugin": {
+      "version": "50",
+      "directory": "extensions",
+      "add-ld-path": "lib",
+      "merge-dirs": "lib/zoitechat/plugins",
+      "subdirectories": true,
+      "no-autodownload": true,
+      "autodelete": true
+    }
+  },
+  "modules": [
+    "shared-modules/lua5.4/lua-5.4.json",
+    "shared-modules/libcanberra/libcanberra.json",
+    "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json",
+    {
+      "name": "python3-cffi",
+      "buildsystem": "simple",
+      "build-commands": [
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cffi\" --no-build-isolation"
+      ],
+      "sources": [
+        {
+          "type": "file",
+          "url": "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz",
+          "sha256": "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"
+        },
+        {
+          "type": "file",
+          "url": "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz",
+          "sha256": "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824"
+        }
+      ]
+    },
+    {
+      "name": "perl",
+      "buildsystem": "simple",
+      "build-options": {
+        "no-debuginfo": true
+      },
+      "build-commands": [
+        "./Configure -des -Dprefix=/app -Dvendorprefix=/app -Duseshrplib -Dman1dir=none -Dman3dir=none",
+        "make -j${FLATPAK_BUILDER_N_JOBS}",
+        "make install"
+      ],
+      "cleanup": [
+        "/share/man",
+        "/lib/perl5/*/*/CORE/*.a"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://www.cpan.org/src/5.0/perl-5.42.2.tar.xz",
+          "sha256": "0a585eeb9e363c0f80482ddb3571625250c2c86aeb408853e8ea50805cfb14bb"
+        }
+      ]
+    },
+    {
+      "name": "lgi",
+      "buildsystem": "meson",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/pavouk/lgi/archive/c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a.tar.gz",
+          "sha256": "db67b2b7ee89fa566f783486d56be7203552a997bc55f35020b57dd2776b9943"
+        }
+      ]
+    },
+    {
+      "name": "zoitechat",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Ddbus-service-use-appid=true",
+        "-Dwith-perl=perl",
+        "-Dwith-python=python3",
+        "-Dwith-lua=lua"
+      ],
+      "build-options": {
+        "cflags": "-Wno-error=missing-include-dirs"
+      },
+      "cleanup": [
+        "/share/man"
+      ],
+      "post-install": [
+      "install -d /app/extensions"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/ZoiteChat/zoitechat.git",
+          "tag": "zoitechat-2.18.1",
+          "commit": "479f1649efa0e5b166a7c7c9d86214b42ec9f794"
+        },
+        {
+          "type": "file",
+          "url": "https://publicsuffix.org/list/public_suffix_list.dat",
+          "sha256": "6f7f7d9e8c68447f1c74095a12574b7fee46b0cd759c518a659aee0615d8e118",
+          "dest": "src/common",
+          "dest-filename": "public_suffix_list.dat"
+        },
+        {
+          "type": "patch",
+          "path": "Load-plugins-from-Flatpak-extensions.patch"
+        }
+      ]
+    }
+  ]
+}
--- a/flatpak/perl.json
+++ b/flatpak/perl.json
@@ -1,20 +0,0 @@
-{
-  "name": "perl",
-  "buildsystem": "simple",
-  "build-commands": [
-    "./Configure -des -Dprefix=/app -Dvendorprefix=/app -Duseshrplib -Dman1dir=none -Dman3dir=none",
-    "make -j${FLATPAK_BUILDER_N_JOBS}",
-    "make install"
-  ],
-  "cleanup": [
-    "/share/man",
-    "/lib/perl5/*/*/CORE/*.a"
-  ],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://www.cpan.org/src/5.0/perl-5.42.2.tar.xz",
-      "sha256": "0a585eeb9e363c0f80482ddb3571625250c2c86aeb408853e8ea50805cfb14bb"
-    }
-  ]
-}
--- a/flatpak/python3-cffi.json
+++ b/flatpak/python3-cffi.json
@@ -1,19 +0,0 @@
-{
-    "name": "python3-cffi",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cffi\" --no-build-isolation"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz",
-            "sha256": "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz",
-            "sha256": "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824"
-        }
-    ]
-}
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -320,7 +320,7 @@ fe_args (int argc, char *argv[])
 	GError *error = NULL;
 	GOptionContext *context;
 	char *buffer;
-	const char *desktop_id = "net.zoite.Zoitechat";
+	const char *desktop_id = "org.zoitechat.ZoiteChat";
 #ifdef WIN32
 	char *base_path = NULL;
 	char *locale_path = NULL;
--- a/src/fe-gtk/notifications/notification-freedesktop.c
+++ b/src/fe-gtk/notifications/notification-freedesktop.c
@@ -56,7 +56,7 @@ notification_backend_show (const char *title, const char *text)
    g_variant_builder_init (&params, G_VARIANT_TYPE ("(susssasa{sv}i)"));
    g_variant_builder_add (&params, "s", "zoitechat"); /* App name */
    g_variant_builder_add (&params, "u", 0); /* ID, 0 means don't replace */
-    g_variant_builder_add (&params, "s", "net.zoite.Zoitechat"); /* App icon */
+    g_variant_builder_add (&params, "s", "org.zoitechat.ZoiteChat"); /* App icon */
    g_variant_builder_add (&params, "s", title);
    g_variant_builder_add (&params, "s", text);
    g_variant_builder_add (&params, "as", NULL); /* Actions */
@@ -65,7 +65,7 @@ notification_backend_show (const char *title, const char *text)
    g_variant_builder_open (&params, G_VARIANT_TYPE ("a{sv}"));
    g_variant_builder_open (&params, G_VARIANT_TYPE ("{sv}"));
    g_variant_builder_add (&params, "s", "desktop-entry");
-    g_variant_builder_add (&params, "v", g_variant_new_string ("net.zoite.Zoitechat"));
+    g_variant_builder_add (&params, "v", g_variant_new_string ("org.zoitechat.ZoiteChat"));
    g_variant_builder_close (&params);
    g_variant_builder_close (&params);

--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -80,7 +80,7 @@ typedef GIcon *TrayIcon;
 typedef GIcon *TrayCustomIcon;
 #define tray_icon_free(i) g_object_unref(i)

-#define ICON_NORMAL_NAME "net.zoite.Zoitechat"
+#define ICON_NORMAL_NAME "org.zoitechat.ZoiteChat"
 #define ICON_MSG_NAME "mail-unread"
 #define ICON_HILIGHT_NAME "dialog-warning"
 #define ICON_FILE_NAME "folder-download"
Author	SHA1	Message	Date
deepend-tildeclub	57f8f97e59	fix syntax error	2026-05-22 01:55:53 -06:00
deepend-tildeclub	f0a0ea699d	Flatpak: missed changes to flatpak app id.	2026-05-22 01:35:49 -06:00
deepend-tildeclub	005d9c6849	Tighten Flatpak D-Bus permissions	2026-05-22 00:34:09 -06:00
deepend-tildeclub	115ac17968	Inline Flatpak deps, bump GNOME runtime to 50	2026-05-22 00:29:13 -06:00
deepend-tildeclub	d8600a2237	Prep Flatpak manifest for Flathub stable submission	2026-05-22 00:23:42 -06:00
deepend-tildeclub	6535810ca3	Rename app IDs to org.zoitechat.ZoiteChat	2026-05-22 00:08:54 -06:00