Delete .github/workflows/openbsd-build.yml

Updated the gtk-mac-bundler bundle translation roots for both gtk30 and zoitechat to ${prefix}/share/locale (from ${prefix}/locale).

.github/workflows/appimage-build.yml

@@ -29,9 +29,11 @@ jobs:
             build-essential pkg-config meson ninja-build cmake \
             gettext \
             libcanberra-dev libdbus-glib-1-dev libglib2.0-dev \
-            libgtk2.0-dev libgtk-3-dev \
+            libgtk-3-dev \
+            libwayland-client0 libwayland-cursor0 libwayland-egl1 \
+            libxkbcommon0 \
             libgtk-3-bin libglib2.0-bin shared-mime-info gsettings-desktop-schemas \
-            libluajit-5.1-dev libpci-dev libperl-dev libssl-dev \
+            libluajit-5.1-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
             python3-dev python3-cffi mono-devel desktop-file-utils \
             patchelf file curl
 
@@ -41,7 +43,10 @@ jobs:
           rm -rf build
           meson setup build \
             --prefix=/usr \
+            -Dgtk3=true \
             -Dtext-frontend=true \
+            -Dwith-perl=perl \
+            -Dwith-python=python3 \
             -Dauto_features=enabled
 
       - name: Build
@@ -72,11 +77,9 @@ jobs:
           chmod +x linuxdeploy-plugin-gtk
           export PATH="${PWD}:${PATH}"
 
-          # Bundle CA certificates into the AppDir
           install -Dm644 /etc/ssl/certs/ca-certificates.crt \
             AppDir/etc/ssl/certs/ca-certificates.crt
 
-          # Custom AppRun: preserve typical AppDir runtime paths AND force CA bundle
           cat > AppRun <<'EOF'
           #!/bin/sh
           set -eu
@@ -97,15 +100,26 @@ jobs:
             export GIO_EXTRA_MODULES="$APPDIR/usr/lib/gio/modules${GIO_EXTRA_MODULES:+:$GIO_EXTRA_MODULES}"
           fi
 
-          # OpenSSL trust store override (fixes “unable to get local issuer certificate (20)”)
+          # OpenSSL trust store override
           export SSL_CERT_FILE="${SSL_CERT_FILE:-$APPDIR/etc/ssl/certs/ca-certificates.crt}"
           export SSL_CERT_DIR="${SSL_CERT_DIR:-$APPDIR/etc/ssl/certs}"
           export CURL_CA_BUNDLE="${CURL_CA_BUNDLE:-$SSL_CERT_FILE}"
 
+          # Prefer Wayland if the session provides it, but keep X11 fallback.
+          # Don't override if the user already set GDK_BACKEND explicitly.
+          if [ -z "${GDK_BACKEND:-}" ]; then
+            if [ -n "${WAYLAND_DISPLAY:-}" ] || [ "${XDG_SESSION_TYPE:-}" = "wayland" ]; then
+              export GDK_BACKEND="wayland,x11"
+            else
+              export GDK_BACKEND="x11"
+            fi
+          fi
+
           exec "$APPDIR/usr/bin/zoitechat" "$@"
           EOF
           chmod +x AppRun
 
+
           VERSION="$(git describe --tags --always)"
 
           ./linuxdeploy-x86_64.AppImage \

.github/workflows/debian-build.yml

@@ -13,47 +13,36 @@ jobs:
       image: debian:bookworm
 
     steps:
-      - name: Install base tooling (git + deps)
+      - name: Install packaging tooling and build dependencies
         run: |
           set -eux
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
           apt-get install -y --no-install-recommends \
                 git ca-certificates \
-                build-essential pkg-config meson ninja-build cmake \
-                gettext \
-                libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev \
-                libluajit-5.1-dev libpci-dev libperl-dev libssl-dev \
-                python3-dev python3-cffi mono-devel desktop-file-utils
+                build-essential dpkg-dev debhelper fakeroot \
+                pkg-config meson ninja-build \
+                gettext iso-codes \
+                libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk-3-dev libayatana-appindicator3-dev \
+                liblua5.3-dev libpci-dev libperl-dev libssl-dev \
+                python3-dev python3-cffi desktop-file-utils
       - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: Configure
+      - name: Build Debian packages
         run: |
           set -eux
-          rm -rf build
-          meson setup build \
-            -Dtext-frontend=true \
-            -Dauto_features=enabled
-        # If configure fails, show the project's actual option names in the log.
-      - name: Show Meson options (on failure)
-        if: failure()
-        run: |
-          set -eux
-          meson configure build || true
+          dpkg-buildpackage -us -uc -b
 
-      - name: Build
+      - name: Collect Debian artifacts
         run: |
           set -eux
-          ninja -C build
+          mkdir -p artifacts
+          cp -v ../*.deb ../*.changes ../*.buildinfo artifacts/
 
-      - name: Test
-        run: |
-          set -eux
-          ninja -C build test
-
-      - name: Install
-        run: |
-          set -eux
-          ninja -C build install
+      - name: Upload Debian artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: zoitechat-debian-packages
+          path: artifacts/*

.github/workflows/macos-build.yml

@@ -0,0 +1,359 @@
+name: macOS Build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  macos_build_arm64:
+    runs-on: macos-15-arm64
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install build dependencies
+        run: |
+          set -eux
+          brew update
+          brew install \
+            meson ninja pkg-config gettext perl \
+            gtk+3 gdk-pixbuf pango adwaita-icon-theme \
+            hicolor-icon-theme glib dbus \
+            enchant gtk-mac-integration
+
+          if ! command -v gtk-mac-bundler >/dev/null 2>&1 && ! python3 -c 'import gtk_mac_bundler' >/dev/null 2>&1; then
+            curl -fsSL https://codeload.github.com/jralls/gtk-mac-bundler/tar.gz/refs/heads/master -o /tmp/gtk-mac-bundler.tar.gz
+            rm -rf /tmp/gtk-mac-bundler
+            mkdir -p /tmp/gtk-mac-bundler
+            tar -xzf /tmp/gtk-mac-bundler.tar.gz -C /tmp/gtk-mac-bundler --strip-components=1
+            (cd /tmp/gtk-mac-bundler && make install)
+          fi
+
+      - name: Configure and build (arm64)
+        run: |
+          set -eux
+          rm -rf build-macos-arm64 stage/arm64
+
+          CFLAGS="-arch arm64" LDFLAGS="-arch arm64" meson setup build-macos-arm64 \
+            --prefix="$PWD/stage/arm64" \
+            -Dgtk3=true \
+            -Dtext-frontend=true \
+            -Dlibcanberra=disabled \
+            -Dwith-perl=perl \
+            -Dwith-python=python3 \
+            -Dauto_features=enabled
+
+          CFLAGS="-arch arm64" LDFLAGS="-arch arm64" meson compile -C build-macos-arm64
+          meson install -C build-macos-arm64
+
+      - name: Stage runtime dependencies for bundling (arm64)
+        run: |
+          set -eux
+          STAGE_PREFIX="$PWD/stage/arm64"
+          BREW_PREFIX="$(brew --prefix)"
+          ENCHANT_PREFIX="$(brew --prefix enchant)"
+
+          mkdir -p "$STAGE_PREFIX/lib" "$STAGE_PREFIX/share"
+          rsync -a "$BREW_PREFIX/lib/gtk-3.0" "$STAGE_PREFIX/lib/"
+          rsync -a "$BREW_PREFIX/lib/gdk-pixbuf-2.0" "$STAGE_PREFIX/lib/"
+          rsync -a "$BREW_PREFIX/share/locale/" "$STAGE_PREFIX/share/locale/"
+
+          mkdir -p "$STAGE_PREFIX/opt"
+          rm -rf "$STAGE_PREFIX/opt/enchant"
+          rsync -aL "$ENCHANT_PREFIX/" "$STAGE_PREFIX/opt/enchant/"
+
+      - name: Package unsigned .app (arm64)
+        run: |
+          set -eux
+          VERSION="$(git describe --tags --always)"
+          export VERSION
+
+          (
+            cd osx
+            BUNDLE_PREFIX="$PWD/../stage/arm64/" \
+            ENCHANT_PREFIX="$PWD/../stage/arm64/opt/enchant" \
+            TARGET_ARCHES="arm64" \
+            ./makebundle.sh
+          )
+
+          mv osx/ZoiteChat-*.app.zip ./ZoiteChat-arm64.app.zip
+
+      - name: Upload arm64 macOS app artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: zoitechat-macos-arm64
+          path: ZoiteChat-arm64.app.zip
+          if-no-files-found: error
+          retention-days: 14
+
+  macos_build_x86_64:
+    runs-on: macos-15-intel
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install build dependencies
+        run: |
+          set -eux
+          brew update
+          brew install \
+            meson ninja pkg-config gettext perl \
+            gtk+3 gdk-pixbuf pango adwaita-icon-theme \
+            hicolor-icon-theme glib dbus \
+            enchant gtk-mac-integration
+
+          if ! command -v gtk-mac-bundler >/dev/null 2>&1 && ! python3 -c 'import gtk_mac_bundler' >/dev/null 2>&1; then
+            curl -fsSL https://codeload.github.com/jralls/gtk-mac-bundler/tar.gz/refs/heads/master -o /tmp/gtk-mac-bundler.tar.gz
+            rm -rf /tmp/gtk-mac-bundler
+            mkdir -p /tmp/gtk-mac-bundler
+            tar -xzf /tmp/gtk-mac-bundler.tar.gz -C /tmp/gtk-mac-bundler --strip-components=1
+            (cd /tmp/gtk-mac-bundler && make install)
+          fi
+
+      - name: Configure and build (x86_64)
+        run: |
+          set -eux
+          rm -rf build-macos-x86_64 stage/x86_64
+
+          CFLAGS="-arch x86_64" LDFLAGS="-arch x86_64" meson setup build-macos-x86_64 \
+            --prefix="$PWD/stage/x86_64" \
+            -Dgtk3=true \
+            -Dtext-frontend=true \
+            -Dlibcanberra=disabled \
+            -Ddarwin-arch-sanity-check=true \
+            -Dwith-perl=perl \
+            -Dwith-python=python3 \
+            -Dauto_features=enabled
+
+          CFLAGS="-arch x86_64" LDFLAGS="-arch x86_64" meson compile -C build-macos-x86_64
+          meson install -C build-macos-x86_64
+
+
+      - name: Stage runtime dependencies for bundling (x86_64)
+        run: |
+          set -eux
+          STAGE_PREFIX="$PWD/stage/x86_64"
+          BREW_PREFIX="$(brew --prefix)"
+          ENCHANT_PREFIX="$(brew --prefix enchant)"
+
+          mkdir -p "$STAGE_PREFIX/lib" "$STAGE_PREFIX/share"
+          rsync -a "$BREW_PREFIX/lib/gtk-3.0" "$STAGE_PREFIX/lib/"
+          rsync -a "$BREW_PREFIX/lib/gdk-pixbuf-2.0" "$STAGE_PREFIX/lib/"
+          rsync -a "$BREW_PREFIX/share/locale/" "$STAGE_PREFIX/share/locale/"
+
+          mkdir -p "$STAGE_PREFIX/opt"
+          rm -rf "$STAGE_PREFIX/opt/enchant"
+          rsync -aL "$ENCHANT_PREFIX/" "$STAGE_PREFIX/opt/enchant/"
+
+      - name: Package unsigned .app (x86_64)
+        run: |
+          set -eux
+          VERSION="$(git describe --tags --always)"
+          export VERSION
+
+          (
+            cd osx
+            BUNDLE_PREFIX="$PWD/../stage/x86_64/" \
+            ENCHANT_PREFIX="$PWD/../stage/x86_64/opt/enchant" \
+            TARGET_ARCHES="x86_64" \
+            ./makebundle.sh
+          )
+
+          mv osx/ZoiteChat-*.app.zip ./ZoiteChat-x86_64.app.zip
+
+      - name: Upload x86_64 macOS app artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: zoitechat-macos-x86_64
+          path: ZoiteChat-x86_64.app.zip
+          if-no-files-found: error
+          retention-days: 14
+
+  macos_assemble_universal_unsigned:
+    needs:
+      - macos_build_arm64
+      - macos_build_x86_64
+    runs-on: macos-latest
+
+    steps:
+      - name: Download arm64 app artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: zoitechat-macos-arm64
+          path: dist/arm64
+
+      - name: Download x86_64 app artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: zoitechat-macos-x86_64
+          path: dist/x86_64
+
+      - name: Merge app bundles into universal
+        run: |
+          set -eux
+          unzip -q dist/arm64/ZoiteChat-arm64.app.zip -d dist/arm64
+          unzip -q dist/x86_64/ZoiteChat-x86_64.app.zip -d dist/x86_64
+
+          ARM_APP="$(find dist/arm64 -maxdepth 2 -name 'ZoiteChat.app' -type d | head -n 1)"
+          X86_APP="$(find dist/x86_64 -maxdepth 2 -name 'ZoiteChat.app' -type d | head -n 1)"
+          UNIVERSAL_APP="dist/universal/ZoiteChat.app"
+
+          rm -rf "$UNIVERSAL_APP"
+          mkdir -p dist/universal
+          cp -a "$ARM_APP" "$UNIVERSAL_APP"
+
+          while IFS= read -r relpath; do
+            arm_file="$ARM_APP/$relpath"
+            x86_file="$X86_APP/$relpath"
+            out_file="$UNIVERSAL_APP/$relpath"
+
+            if [ -f "$x86_file" ] && file -b "$arm_file" | grep -q 'Mach-O'; then
+              mkdir -p "$(dirname "$out_file")"
+              lipo -create "$arm_file" "$x86_file" -output "$out_file"
+            fi
+          done < <(cd "$ARM_APP" && find . -type f | sed 's|^./||')
+
+          while IFS= read -r macho_path; do
+            archs="$(lipo -archs "$macho_path")"
+            echo "$macho_path -> $archs"
+            echo " $archs " | grep -q ' arm64 '
+            echo " $archs " | grep -q ' x86_64 '
+          done < <(find "$UNIVERSAL_APP" -type f -exec sh -c 'file -b "$1" | grep -q "Mach-O" && printf "%s\n" "$1"' _ {} \;)
+
+          VERSION="$(git -C "$GITHUB_WORKSPACE" describe --tags --always)"
+          ditto -c -k --sequesterRsrc --keepParent "$UNIVERSAL_APP" "dist/ZoiteChat-$VERSION.app.zip"
+      - name: Upload unsigned macOS app artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: zoitechat-macos-unsigned
+          
+          path: dist/ZoiteChat-*.app.zip
+          if-no-files-found: error
+          retention-days: 14
+
+  macos_release_signed:
+    needs: macos_assemble_universal_unsigned
+    runs-on: macos-latest
+    if: >-
+      github.event_name == 'push' &&
+      github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Check signing secrets availability
+        id: signing_secrets
+        env:
+          APPLE_DEVELOPER_ID_APPLICATION: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION }}
+          APPLE_DEVELOPER_ID_CERT_P12: ${{ secrets.APPLE_DEVELOPER_ID_CERT_P12 }}
+          APPLE_DEVELOPER_ID_CERT_P12_PASSWORD: ${{ secrets.APPLE_DEVELOPER_ID_CERT_P12_PASSWORD }}
+          APPLE_NOTARY_API_KEY: ${{ secrets.APPLE_NOTARY_API_KEY }}
+          APPLE_NOTARY_API_KEY_ID: ${{ secrets.APPLE_NOTARY_API_KEY_ID }}
+          APPLE_NOTARY_ISSUER_ID: ${{ secrets.APPLE_NOTARY_ISSUER_ID }}
+        run: |
+          set -eu
+          required_secrets=(
+            APPLE_DEVELOPER_ID_APPLICATION
+            APPLE_DEVELOPER_ID_CERT_P12
+            APPLE_DEVELOPER_ID_CERT_P12_PASSWORD
+            APPLE_NOTARY_API_KEY
+            APPLE_NOTARY_API_KEY_ID
+            APPLE_NOTARY_ISSUER_ID
+          )
+
+          missing=0
+          for key in "${required_secrets[@]}"; do
+            if [ -z "${!key:-}" ]; then
+              echo "Missing secret: $key"
+              missing=1
+            fi
+          done
+
+          if [ "$missing" -eq 1 ]; then
+            echo "ready=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "ready=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Skip signing because required secrets are missing
+        if: steps.signing_secrets.outputs.ready != 'true'
+        run: echo "Signing and notarization skipped due to missing required secrets."
+
+      - name: Download unsigned app artifact
+        if: steps.signing_secrets.outputs.ready == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: zoitechat-macos-unsigned
+          path: dist
+
+      - name: Import Developer ID certificate
+        if: steps.signing_secrets.outputs.ready == 'true'
+        env:
+          CERT_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_ID_CERT_P12 }}
+          CERT_PASSWORD: ${{ secrets.APPLE_DEVELOPER_ID_CERT_P12_PASSWORD }}
+        run: |
+          set -eux
+          echo "$CERT_P12_BASE64" | base64 --decode > certificate.p12
+
+          security create-keychain -p "" build.keychain
+          security set-keychain-settings -lut 21600 build.keychain
+          security unlock-keychain -p "" build.keychain
+          security import certificate.p12 -k build.keychain -P "$CERT_PASSWORD" -A -T /usr/bin/codesign
+          security list-keychains -d user -s build.keychain $(security list-keychains -d user | tr -d '"')
+          security set-key-partition-list -S apple-tool:,apple: -s -k "" build.keychain
+
+      - name: Codesign app bundle
+        if: steps.signing_secrets.outputs.ready == 'true'
+        env:
+          CODESIGN_IDENTITY: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION }}
+        run: |
+          set -eux
+          unzip -q dist/ZoiteChat-*.app.zip -d dist
+          APP_PATH="$(find dist -maxdepth 1 -name 'ZoiteChat.app' -type d | head -n 1)"
+
+          codesign --force --deep --options runtime --timestamp \
+            --sign "$CODESIGN_IDENTITY" "$APP_PATH"
+
+          codesign --verify --deep --strict --verbose=2 "$APP_PATH"
+          spctl --assess --type execute --verbose "$APP_PATH"
+
+      - name: Notarize and staple
+        if: steps.signing_secrets.outputs.ready == 'true'
+        env:
+          NOTARY_API_KEY_BASE64: ${{ secrets.APPLE_NOTARY_API_KEY }}
+          NOTARY_KEY_ID: ${{ secrets.APPLE_NOTARY_API_KEY_ID }}
+          NOTARY_ISSUER_ID: ${{ secrets.APPLE_NOTARY_ISSUER_ID }}
+        run: |
+          set -eux
+          APP_PATH="$(find dist -maxdepth 1 -name 'ZoiteChat.app' -type d | head -n 1)"
+          NOTARY_ZIP="dist/ZoiteChat-notarize.zip"
+          SIGNED_ZIP="dist/ZoiteChat-signed.app.zip"
+
+          echo "$NOTARY_API_KEY_BASE64" | base64 --decode > AuthKey_${NOTARY_KEY_ID}.p8
+          ditto -c -k --keepParent "$APP_PATH" "$NOTARY_ZIP"
+
+          xcrun notarytool submit "$NOTARY_ZIP" \
+            --key "AuthKey_${NOTARY_KEY_ID}.p8" \
+            --key-id "$NOTARY_KEY_ID" \
+            --issuer "$NOTARY_ISSUER_ID" \
+            --wait
+
+          xcrun stapler staple "$APP_PATH"
+          xcrun stapler validate "$APP_PATH"
+
+          ditto -c -k --sequesterRsrc --keepParent "$APP_PATH" "$SIGNED_ZIP"
+
+      - name: Upload signed macOS app artifact
+        if: steps.signing_secrets.outputs.ready == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: zoitechat-macos-signed
+          path: dist/ZoiteChat-signed.app.zip
+          if-no-files-found: error
+          retention-days: 30

.github/workflows/msys-build.yml

@@ -1,56 +0,0 @@
-name: MSYS2 Build
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  msys2_build:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: >-
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-pkg-config
-            mingw-w64-x86_64-python-cffi
-            mingw-w64-x86_64-meson
-            mingw-w64-x86_64-ninja
-            mingw-w64-x86_64-gtk2
-            mingw-w64-x86_64-gtk-update-icon-cache
-            mingw-w64-x86_64-luajit
-            mingw-w64-x86_64-desktop-file-utils
-            mingw-w64-x86_64-gettext-tools
-
-      - name: Sanity check gettext ITS rules
-        run: |
-          set -eux
-          which msgfmt || true
-          msgfmt --version
-          ls -la /mingw64/share/gettext-*/its || true
-
-      - name: Configure
-        run: |
-          set -eux
-          rm -rf build
-          meson setup build \
-            -Dtext-frontend=true \
-            -Ddbus=disabled \
-            -Dwith-upd=false \
-            -Dwith-perl=false
-
-      - name: Build
-        run: ninja -C build
-
-      - name: Test
-        run: ninja -C build test

.github/workflows/openbsd-build.yml

@@ -1,117 +0,0 @@
-name: OpenBSD Build
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  openbsd_package:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Build OpenBSD package
-        uses: vmactions/openbsd-vm@v1
-        with:
-          release: '7.5'
-          usesh: true
-          sync: rsync
-          run: |
-            set -eux
-
-            rdate -n pool.ntp.org
-            export PKG_PATH="https://ftp.openbsd.org/pub/OpenBSD/7.5/packages/$(uname -m)/"
-
-            pkg_add -U \
-              git \
-              meson ninja pkgconf gmake \
-              gettext-tools \
-              glib2 gtk+2 dbus-glib libcanberra \
-              luajit mono libgdiplus openssl
-
-            work="$(mktemp -d /tmp/zoitechat.XXXXXX)"
-            trap 'rm -rf "$work"' EXIT
-
-            rsync -a --delete "$GITHUB_WORKSPACE"/ "$work/src/"
-            cd "$work/src"
-
-            rm -rf build
-            meson setup build \
-              --prefix=/usr/local \
-              -Dtext-frontend=true \
-              -Dplugin=false \
-              -Dauto_features=enabled
-
-            ninja -C build
-
-            staging="$work/staging"
-            rm -rf "$staging"
-            mkdir -p "$staging"
-
-            # Staged install
-            DESTDIR="$staging" meson install -C build --no-rebuild
-
-            # If these exist, something ignored DESTDIR (install scripts are leaking)
-            ls -l /usr/local/bin/zoitechat /usr/local/bin/thememan 2>/dev/null || true
-
-            sync
-            sleep 1
-            sync
-
-            # Freeze staged tree so pkg_create doesn't see moving targets
-            snap="$work/staging-snap"
-            rm -rf "$snap"
-            mkdir -p "$snap"
-            (cd "$staging" && pax -rw -pe . "$snap")
-
-            version="$(meson introspect --projectinfo build | sed -n 's/.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p')"
-            pkg_name="zoitechat-${version}"
-            pkg_file="${pkg_name}.tgz"
-            plist="$work/openbsd-plist"
-            desc="$work/DESCR"
-
-            cat >"$desc" <<'EOF'
-            ZoiteChat is an IRC client (HexChat-derived) with a GTK UI and optional tools.
-            EOF
-
-            {
-              echo "@cwd /usr/local"
-
-              # Files + symlinks
-              find "$snap/usr/local" \( -type f -o -type l \) -print \
-                | LC_ALL=C sort \
-                | sed "s#^$snap/usr/local/##"
-
-              # Directories (reverse so children removed first)
-              find "$snap/usr/local" -mindepth 1 -type d -print \
-                | LC_ALL=C sort -r \
-                | sed "s#^$snap/usr/local/##" \
-                | sed 's#^#@dir #'
-            } > "$plist"
-
-            # OpenBSD pkg_create: COMMENT is set via -D COMMENT=... (mandatory), no -c flag exists.
-            # Create the .tgz in $work so we can copy it back out.
-            cd "$work"
-            pkg_create \
-              -B "$snap" \
-              -p /usr/local \
-              -f "$plist" \
-              -d "$desc" \
-              -D "COMMENT=ZoiteChat IRC client" \
-              -D "FULLPKGPATH=net/zoitechat" \
-              "$pkg_file"
-
-            mkdir -p "$GITHUB_WORKSPACE/artifacts"
-            cp "$work/$pkg_file" "$GITHUB_WORKSPACE/artifacts/"
-
-      - name: Upload OpenBSD package
-        uses: actions/upload-artifact@v4
-        with:
-          name: openbsd-package
-          path: artifacts/*.tgz

.github/workflows/solus-eopkg-build.yml

@@ -0,0 +1,72 @@
+name: Solus eopkg build
+
+on:
+  workflow_dispatch:
+    inputs:
+      package_yml:
+        description: "Path to Solus package.yml for ypkg build"
+        required: false
+        default: "packaging/solus/package.yml"
+      solus_image:
+        description: "Solus container image"
+        required: false
+        default: "ghcr.io/getsolus/solus:latest"
+  push:
+    branches:
+      - main
+      - master
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  build-eopkg:
+    runs-on: ubuntu-latest
+    env:
+      SOLUS_IMAGE: ${{ inputs.solus_image || 'ghcr.io/getsolus/solus:latest' }}
+      PACKAGE_YML: ${{ inputs.package_yml || 'packaging/solus/package.yml' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Log in to GHCR (for ghcr.io images)
+        if: startsWith(env.SOLUS_IMAGE, 'ghcr.io/')
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      - name: Build eopkg package in Solus container
+        run: |
+          if [ ! -f "$PACKAGE_YML" ]; then
+            echo "Expected Solus packaging file at $PACKAGE_YML" >&2
+            echo "Available package.yml files:" >&2
+            find . -name "package.yml" -print >&2 || true
+            echo "Add a package.yml (ypkg) file or update the workflow input PACKAGE_YML." >&2
+            exit 1
+          fi
+
+          docker pull "$SOLUS_IMAGE"
+
+          docker run --rm \
+            -v "$PWD":/workspace \
+            -w /workspace \
+            -e PACKAGE_YML="$PACKAGE_YML" \
+            "$SOLUS_IMAGE" \
+            sh -lc '
+              set -euo pipefail
+              eopkg update-repo -y
+              eopkg install -y ypkg git
+              ypkg build "$PACKAGE_YML"
+              mkdir -p /workspace/artifacts
+              find . -maxdepth 3 -name "*.eopkg" -type f -exec cp -v {} /workspace/artifacts/ \;
+            '
+
+      - name: Upload eopkg artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: solus-eopkg
+          path: artifacts/*.eopkg
+          if-no-files-found: error

.github/workflows/windows-build.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   windows_build:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     permissions:
       contents: read
@@ -20,13 +20,8 @@ jobs:
 
     strategy:
       matrix:
-        platform: [x64, win32]
-        arch: [x64, x86]
-        exclude:
-          - platform: x64
-            arch: x86
-          - platform: win32
-            arch: x64
+        platform: [x64]
+        arch: [x64]
       fail-fast: false
 
     steps:
@@ -39,16 +34,16 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          New-Item -Name "deps" -ItemType "Directory"
+          New-Item -Name "deps" -ItemType "Directory" -Force | Out-Null
 
-          Invoke-WebRequest http://files.jrsoftware.org/is/5/innosetup-5.5.9-unicode.exe -OutFile deps\innosetup-unicode.exe
+          Invoke-WebRequest https://files.jrsoftware.org/is/6/innosetup-6.7.0.exe -OutFile deps\innosetup-unicode.exe
           & deps\innosetup-unicode.exe /VERYSILENT | Out-Null
 
           Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/idpsetup-1.5.1.exe -OutFile deps\idpsetup.exe
           & deps\idpsetup.exe /VERYSILENT
 
-          Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/gtk-${{ matrix.platform }}-2018-08-29-openssl1.1.7z -OutFile deps\gtk-${{ matrix.arch }}.7z
-          & 7z.exe x deps\gtk-${{ matrix.arch }}.7z -oC:\gtk-build\gtk
+          Invoke-WebRequest https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.18.0-pre1/GTK3_Gvsbuild_zoitechat-2.18.0-pre1_${{ matrix.platform }}.7z -OutFile deps\gtk-${{ matrix.arch }}.7z
+          & 7z.exe x deps\gtk-${{ matrix.arch }}.7z -oC:\gtk-build\gtk\x64\release
 
           Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/gendef-20111031.7z -OutFile deps\gendef.7z
           & 7z.exe x deps\gendef.7z -oC:\gtk-build
@@ -76,7 +71,7 @@ jobs:
 
       - name: Build
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
 
           set "PYTHON_DIR=C:\gtk-build\python-3.14.2\${{ matrix.platform }}"
           if not exist "%PYTHON_DIR%\libs\python314.lib" (
@@ -93,7 +88,7 @@ jobs:
 
       - name: Preparing Artifacts
         run: |
-          move ..\zoitechat-build\${{ matrix.platform }}\ZoiteChat*.exe .\
+          move ..\zoitechat-build\${{ matrix.platform }}\ZoiteChat-*.exe .\
           move ..\zoitechat-build .\
         shell: cmd
 
@@ -102,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Installer ${{ matrix.arch }}
-          path: ZoiteChat*.exe
+          path: ZoiteChat-*.exe
 
       - name: Attest Installer (Artifact Attestation)
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}

.mailmap

@@ -1,5 +1,5 @@
 Berke Viktor <github.bviktor@outlook.com> <berkeviktor@aol.com>
-Berke Viktor <github.bviktor@outlook.com> <bviktor@zoitechat.org>
+Berke Viktor <github.bviktor@outlook.com> <bviktor@hexchat.org>
 Berke Viktor <github.bviktor@outlook.com> <bviktor@outlook.com>
 Berke Viktor <github.bviktor@outlook.com> berkeviktor@aol.com
 Patrick Griffis <tingping@tingping.se> TingPing <tingping@fedoraproject.org>

Makefile

@@ -0,0 +1,45 @@
+PREFIX ?= /usr/local
+BUILD_DIR ?= build
+MESON ?= meson
+NINJA ?= ninja
+C_STD ?= c17
+MESON_SETUP_ARGS ?=
+MESON_SETUP_ARGS += -Dc_std=$(C_STD)
+MESON_COMPILE_ARGS ?=
+MESON_INSTALL_ARGS ?=
+
+CONFIG_STAMP := $(BUILD_DIR)/build.ninja
+
+.PHONY: all configure build reconfigure install uninstall clean distclean
+
+all: build
+
+# Only run initial meson setup if we don't have a configured build dir yet.
+$(CONFIG_STAMP):
+	@mkdir -p $(BUILD_DIR)
+	@env NINJA=$(NINJA) $(MESON) setup $(BUILD_DIR) --prefix=$(PREFIX) $(MESON_SETUP_ARGS)
+
+configure: $(CONFIG_STAMP)
+
+build: configure
+	@env NINJA=$(NINJA) $(MESON) compile -C $(BUILD_DIR) $(MESON_COMPILE_ARGS)
+
+reconfigure:
+	@mkdir -p $(BUILD_DIR)
+	@env NINJA=$(NINJA) $(MESON) setup --reconfigure $(BUILD_DIR) --prefix=$(PREFIX) $(MESON_SETUP_ARGS)
+
+install: build
+	@env NINJA=$(NINJA) $(MESON) install -C $(BUILD_DIR) $(MESON_INSTALL_ARGS)
+
+uninstall: configure
+	@$(NINJA) -C $(BUILD_DIR) uninstall
+
+clean:
+	@if [ -f "$(CONFIG_STAMP)" ]; then \
+		env NINJA=$(NINJA) $(MESON) compile -C $(BUILD_DIR) --clean; \
+	else \
+		echo "Nothing to clean (no $(CONFIG_STAMP))."; \
+	fi
+
+distclean:
+	rm -rf $(BUILD_DIR)

data/icons/menu/dark/about.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 7v4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="4.8" r=".9" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/add.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="4.8" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M8 5.8v4.4M5.8 8h4.4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/chanlist.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/clear.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3.2 5.2h9.6" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5.2v7.3c0 .6.4 1 1 1h4c.6 0 1-.4 1-1V5.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M6.5 3.5h3" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6.8 7v4M9.2 7v4" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/close.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="2.5" width="11" height="11" rx="1.6" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M5.2 5.2l5.6 5.6M10.8 5.2 5.2 10.8" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/connect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="8" r="1.1" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/copy.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M6 4.5h6.5v8H6z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M3.5 2.5H10v1.8" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/><path d="M3.5 2.5v8.8H5.3" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/delete.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M5.2 5.3h5.6v7.2H5.2z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M4 5.3h8" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/><path d="M6.3 3.7h3.4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/><path d="M7.1 6.6v4.6M8.9 6.6v4.6" stroke="#e5e7eb" stroke-width="1.1" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/detach.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2" y="4" width="8" height="8" rx="1.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 8h5M10.5 5.5 13 8l-2.5 2.5" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/disconnect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5l6 6" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/emoji.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="8" cy="8" r="5.6" fill="rgb(255,199,64)" stroke="rgb(240,240,240)" stroke-width="1"/><circle cx="6" cy="7" r="0.8" fill="rgb(240,240,240)"/><circle cx="10" cy="7" r="0.8" fill="rgb(240,240,240)"/><path d="M5.5 9.4c.6 1 1.4 1.6 2.5 1.6s1.9-.6 2.5-1.6" fill="none" stroke="rgb(240,240,240)" stroke-width="1" stroke-linecap="round"/></svg>

data/icons/menu/dark/find.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="7" cy="7" r="3.5" fill="none" stroke="#e5e7eb" stroke-width="1.4"/>
+<path d="M9.8 9.8 13 13" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M7 5.4v3.2M5.4 7h3.2" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/help.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M6.4 6.2a1.8 1.8 0 1 1 2.8 1.5c-.7.5-1.2.9-1.2 1.8" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="11.8" r=".8" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/join.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l3 3-3 3" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="10" y="3" width="3.5" height="10" rx="1" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+</svg>

data/icons/menu/dark/load-plugin.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l2.8 3L6 11" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="9" y="4" width="4.5" height="8" rx="1" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M11.25 6v1.8" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/network-list.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/new.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h6l4 4V13.5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M9 2.5v4h4" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 8v4M6 10h4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/next.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M5.5 3.5 10.5 8l-5 4.5" fill="none" stroke="#e5e7eb" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/preferences.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="2.1" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 2.8v1.4M8 11.8v1.4M13.2 8h-1.4M4.2 8H2.8M11.7 4.3l-1 1M5.3 10.7l-1 1M11.7 11.7l-1-1M5.3 5.3l-1-1" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/previous.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M10.5 3.5 5.5 8l5 4.5" fill="none" stroke="#e5e7eb" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/quit.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M8 2.5v5" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M5 4.3a5 5 0 1 0 6 0" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/refresh.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M12.8 7.4A4.8 4.8 0 1 0 8 12.8" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round"/><path d="M13 3.5v3.7H9.3" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/remove.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="4.8" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M5.8 8h4.4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/save-as.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h8l2 2v9a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<rect x="5" y="3.5" width="4.5" height="2.5" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+<rect x="5" y="9" width="3.4" height="3" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+<path d="M9.8 8.9v3.6M8.1 10.7l1.7-1.8 1.8 1.8" fill="none" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/save.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h8l2 2v9a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<rect x="5" y="3.5" width="4.5" height="2.5" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+<rect x="5" y="9" width="6" height="3" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+</svg>

data/icons/menu/dark/search.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="7" cy="7" r="3.5" fill="none" stroke="#e5e7eb" stroke-width="1.4"/>
+<path d="M9.8 9.8 13 13" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/spell-check.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M4 4.2h4M6 4.2v7.4M3.2 7.2h5.6" fill="none" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/><path d="m8.9 9.3 1.5 1.5 2.8-3" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/update.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><g fill="none" stroke="rgb(240,240,240)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M13 5.8A5.5 5.5 0 1 0 5 13"/><path d="M13 2.2v3h-3"/><path d="M3 10.2A5.5 5.5 0 1 0 11 3"/><path d="M3 13.8v-3h3"/></g></svg>

data/icons/menu/light/about.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M8 7v4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="4.8" r=".9" fill="#1f2937"/>
+</svg>

data/icons/menu/light/add.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="4.8" fill="none" stroke="#1f2937" stroke-width="1.3"/><path d="M8 5.8v4.4M5.8 8h4.4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/chanlist.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#1f2937"/>
+</svg>

data/icons/menu/light/clear.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3.2 5.2h9.6" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5.2v7.3c0 .6.4 1 1 1h4c.6 0 1-.4 1-1V5.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M6.5 3.5h3" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6.8 7v4M9.2 7v4" stroke="#1f2937" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/close.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="2.5" width="11" height="11" rx="1.6" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M5.2 5.2l5.6 5.6M10.8 5.2 5.2 10.8" stroke="#1f2937" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/connect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="8" r="1.1" fill="#1f2937"/>
+</svg>

data/icons/menu/light/copy.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M6 4.5h6.5v8H6z" fill="none" stroke="#1f2937" stroke-width="1.3"/><path d="M3.5 2.5H10v1.8" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/><path d="M3.5 2.5v8.8H5.3" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/delete.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M5.2 5.3h5.6v7.2H5.2z" fill="none" stroke="#1f2937" stroke-width="1.3"/><path d="M4 5.3h8" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/><path d="M6.3 3.7h3.4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/><path d="M7.1 6.6v4.6M8.9 6.6v4.6" stroke="#1f2937" stroke-width="1.1" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/detach.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2" y="4" width="8" height="8" rx="1.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M8 8h5M10.5 5.5 13 8l-2.5 2.5" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/light/disconnect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5l6 6" stroke="#1f2937" stroke-width="1.4" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/emoji.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="8" cy="8" r="5.6" fill="rgb(255,211,67)" stroke="rgb(56,56,56)" stroke-width="1"/><circle cx="6" cy="7" r="0.8" fill="rgb(56,56,56)"/><circle cx="10" cy="7" r="0.8" fill="rgb(56,56,56)"/><path d="M5.5 9.4c.6 1 1.4 1.6 2.5 1.6s1.9-.6 2.5-1.6" fill="none" stroke="rgb(56,56,56)" stroke-width="1" stroke-linecap="round"/></svg>

data/icons/menu/light/find.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="7" cy="7" r="3.5" fill="none" stroke="#1f2937" stroke-width="1.4"/>
+<path d="M9.8 9.8 13 13" stroke="#1f2937" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M7 5.4v3.2M5.4 7h3.2" stroke="#1f2937" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/help.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M6.4 6.2a1.8 1.8 0 1 1 2.8 1.5c-.7.5-1.2.9-1.2 1.8" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="11.8" r=".8" fill="#1f2937"/>
+</svg>

data/icons/menu/light/join.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l3 3-3 3" fill="none" stroke="#1f2937" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="10" y="3" width="3.5" height="10" rx="1" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+</svg>

data/icons/menu/light/load-plugin.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l2.8 3L6 11" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="9" y="4" width="4.5" height="8" rx="1" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M11.25 6v1.8" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/network-list.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#1f2937"/>
+</svg>

data/icons/menu/light/new.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h6l4 4V13.5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M9 2.5v4h4" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M8 8v4M6 10h4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>