diff --git a/.gitignore b/.gitignore index 811d989..378cf96 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ packaging/deb/vietc_*/ packaging/appimage/appimagetool status vietc-xrecord +packaging/flatpak/build-dir +packaging/flatpak/vietc-repo +packaging/flatpak/VietPlus-* diff --git a/Makefile b/Makefile index bd381e6..c488cf8 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,10 @@ lint: cargo clippy -- -D warnings cd ui && cargo clippy -- -D warnings +# Flatpak build +flatpak: + cd packaging/flatpak && bash build-flatpak.sh + # Show project structure tree: @find . -type f \( -name "*.rs" -o -name "*.toml" \) | grep -v target | sort diff --git a/packaging/deb/build-deb.sh b/packaging/deb/build-deb.sh deleted file mode 100755 index 7c4e01e..0000000 --- a/packaging/deb/build-deb.sh +++ /dev/null @@ -1,181 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" -VERSION="${1:-0.1.0}" -PACKAGE="vietc_${VERSION}-1_amd64" -STAGING="$SCRIPT_DIR/$PACKAGE" - -echo "=== Building Viet+ .deb package v${VERSION} ===" - -# Build binaries (all features: x11 + wayland) -echo "[1/5] Building binaries..." -cargo build --release --features "x11,wayland" --manifest-path "$PROJECT_ROOT/Cargo.toml" -(cd "$PROJECT_ROOT/ui" && export PKG_CONFIG_PATH="/tmp/dbus-dev/extracted/usr/lib/x86_64-linux-gnu/pkgconfig:${PKG_CONFIG_PATH:-}" && export RUSTFLAGS="-L /tmp/dbus-dev/lib" && cargo build --release) || echo " Warning: UI tray not built (libdbus-1-dev may be missing)" -echo " Done." - -# Clean and create staging -echo "[2/5] Creating staging directory..." -rm -rf "$STAGING" -mkdir -p "$STAGING/DEBIAN" -mkdir -p "$STAGING/usr/bin" -mkdir -p "$STAGING/usr/lib/systemd/user" -mkdir -p "$STAGING/etc/vietc" -mkdir -p "$STAGING/usr/share/applications" -mkdir -p "$STAGING/usr/share/icons/hicolor/256x256/apps" -mkdir -p "$STAGING/usr/share/doc/vietc" -mkdir -p "$STAGING/usr/share/metainfo" - -# Copy binaries -echo "[3/5] Installing binaries..." -cp "$PROJECT_ROOT/target/release/vietc" "$STAGING/usr/bin/" -cp "$PROJECT_ROOT/target/release/vietc-cli" "$STAGING/usr/bin/" -# Privileged uinput injection daemon — required for Unicode (Vietnamese) output. -cp "$PROJECT_ROOT/target/release/vietc-uinputd" "$STAGING/usr/bin/" -[ -f "$PROJECT_ROOT/ui/target/release/vietc-tray" ] && cp "$PROJECT_ROOT/ui/target/release/vietc-tray" "$STAGING/usr/bin/" - -# Compile and bundle vietc-xrecord (C helper for X11 XRecord keyboard capture) -if command -v gcc &>/dev/null; then - gcc -O2 -o "$STAGING/usr/bin/vietc-xrecord" "$PROJECT_ROOT/packaging/appimage/vietc-xrecord.c" -lX11 -lXtst \ - && echo " vietc-xrecord compiled" \ - || echo " WARNING: vietc-xrecord compile failed (libX11/libXtst dev headers missing)" -else - echo " WARNING: no gcc, vietc-xrecord not bundled" -fi - -# Desktop file -cp "$PROJECT_ROOT/packaging/appimage/vietc.desktop" "$STAGING/usr/share/applications/" - -# Icon (SVG from AppImage build script) -cat > "$STAGING/usr/share/icons/hicolor/256x256/apps/vietc.svg" << 'SVGEOF' - - - - - - - - - - - - - - - - - - - - - - - VN - -SVGEOF - -# Documentation -cp "$PROJECT_ROOT/README.md" "$STAGING/usr/share/doc/vietc/" -cp "$PROJECT_ROOT/LICENSE" "$STAGING/usr/share/doc/vietc/" - -# Config -cp "$PROJECT_ROOT/vietc.toml" "$STAGING/etc/vietc/config.toml" - -# Systemd user service -cp "$PROJECT_ROOT/vietc.service" "$STAGING/usr/lib/systemd/user/" - -# AppStream metadata -cat > "$STAGING/usr/share/metainfo/io.github.anomalyco.vietc.appdata.xml" << 'XML' - - - io.github.anomalyco.vietc - Viet+ - Vietnamese Input Method for Linux - -

Zero-configuration Vietnamese input method engine supporting Telex and VNI input methods. Works natively on both X11 and Wayland via evdev uinput injection.

- - MIT - MIT - https://github.com/anomalyco/vietc - vietc - Utility - -XML - -# Lintian overrides -mkdir -p "$STAGING/usr/share/lintian/overrides" -cat > "$STAGING/usr/share/lintian/overrides/vietc" << 'LINTIAN' -# Binaries are intentionally placed in /usr/bin without man pages -# as Viet+ is a modern GUI application targeting Wayland/X11. -vietc: no-manual-page * -# Init script helpers are not needed; Viet+ uses systemd --user units. -vietc: no-systemd-service-file-outside-lib -# We bundle the tray alongside the daemon for convenience. -vietc: wrong-section-according-to-package-name -LINTIAN - -# Create control file -echo "[4/5] Creating control file..." -cat > "$STAGING/DEBIAN/control" << 'CONTROL' -Package: vietc -Version: VERSION_PLACEHOLDER -Section: utils -Priority: optional -Architecture: amd64 -Depends: libc6 (>= 2.31), libevdev2 (>= 1.9.0) -Recommends: libwayland-client0 (>= 1.20), libx11-6, libxtst6, xclip -Maintainer: Khoa Vo -Description: Viet+ — Vietnamese Input Method for Linux - Zero-configuration Vietnamese input method engine supporting - Telex and VNI input methods. Works natively on both X11 and - Wayland via evdev uinput injection. -CONTROL -sed -i "s/VERSION_PLACEHOLDER/$VERSION/" "$STAGING/DEBIAN/control" - -# Conffiles -echo "/etc/vietc/config.toml" > "$STAGING/DEBIAN/conffiles" - -# Maintainer scripts -cat > "$STAGING/DEBIAN/postinst" << 'POSTINST' -#!/bin/sh -set -e -case "$1" in - configure) - if command -v systemctl >/dev/null 2>&1; then - systemctl --system daemon-reload >/dev/null 2>&1 || true - fi - ;; -esac -POSTINST -chmod 755 "$STAGING/DEBIAN/postinst" - -cat > "$STAGING/DEBIAN/prerm" << 'PRERM' -#!/bin/sh -set -e -case "$1" in - remove|upgrade|deconfigure) - if command -v systemctl >/dev/null 2>&1; then - systemctl --system daemon-reload >/dev/null 2>&1 || true - fi - ;; -esac -PRERM -chmod 755 "$STAGING/DEBIAN/prerm" - -cat > "$STAGING/DEBIAN/postrm" << 'POSTRM' -#!/bin/sh -set -e -case "$1" in - purge) - rm -rf /etc/vietc 2>/dev/null || true - ;; -esac -POSTRM -chmod 755 "$STAGING/DEBIAN/postrm" - -# Build .deb -echo "[5/5] Building .deb package..." -fakeroot dpkg-deb --build "$STAGING" "$SCRIPT_DIR/vietc_${VERSION}-1_amd64.deb" -echo "" -echo "=== Package built: packaging/deb/vietc_${VERSION}-1_amd64.deb ===" diff --git a/packaging/flatpak/build-flatpak.sh b/packaging/flatpak/build-flatpak.sh new file mode 100644 index 0000000..5d80269 --- /dev/null +++ b/packaging/flatpak/build-flatpak.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" +VERSION="${1:-0.1.4}" + +echo "=== Building Viet+ Flatpak v${VERSION} ===" + +# Install flatpak-builder if missing +if ! command -v flatpak-builder &>/dev/null; then + echo "Installing flatpak-builder..." + sudo apt-get install -y flatpak flatpak-builder +fi + +# Add Flathub if missing +if ! flatpak remote-list | grep -q flathub; then + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +fi + +# Install required runtimes +echo "Installing GNOME Platform & SDK..." +flatpak install -y flathub org.gnome.Platform//47 org.gnome.Sdk//47 2>/dev/null || true +flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable//24.08 2>/dev/null || true + +# Build +echo "Building Flatpak..." +cd "$SCRIPT_DIR" +flatpak-builder --force-clean --repo=vietc-repo build-dir io.github.vietc.VietPlus.json + +# Export to local repo +flatpak build-bundle vietc-repo VietPlus-${VERSION}.flatpak io.github.vietc.VietPlus + +echo "=== Done ===" +echo "Package: $SCRIPT_DIR/VietPlus-${VERSION}.flatpak" +echo "" +echo "Install: flatpak install --user VietPlus-${VERSION}.flatpak" +echo "Or via repo: flatpak --user remote-add --no-gpg-verify vietc-local vietc-repo && flatpak run io.github.vietc.VietPlus" diff --git a/packaging/flatpak/io.github.vietc.VietPlus.json b/packaging/flatpak/io.github.vietc.VietPlus.json new file mode 100644 index 0000000..2933bb1 --- /dev/null +++ b/packaging/flatpak/io.github.vietc.VietPlus.json @@ -0,0 +1,105 @@ +{ + "app-id": "io.github.vietc.VietPlus", + "runtime": "org.gnome.Platform", + "runtime-version": "47", + "sdk": "org.gnome.Sdk", + "sdk-extensions": [ + "org.freedesktop.Sdk.Extension.rust-stable" + ], + "command": "vietc-wrapper.sh", + "rename-desktop-file": "vietc.desktop", + "rename-icon": "vietc", + "finish-args": [ + "--socket=x11", + "--socket=wayland", + "--device=input", + "--share=ipc", + "--env=XDG_CURRENT_DESKTOP=GNOME", + "--env=GTK_IM_MODULE=fcitx" + ], + "modules": [ + { + "name": "xclip", + "no-autogen": true, + "make-install-args": [ + "install" + ], + "builddir": true, + "sources": [ + { + "type": "archive", + "url": "https://github.com/astrand/xclip/archive/refs/tags/0.13.tar.gz", + "sha256": "ca5b8804e3c910a66423a882d79bf3c9450e8758faa5d2b9deba5342451b140e" + } + ], + "cleanup": [ + "/share/man" + ] + }, + { + "name": "vietc", + "buildsystem": "simple", + "build-options": { + "append-path": "/usr/lib/sdk/rust-stable/bin", + "env": { + "CARGO_HOME": "/run/build/vietc/cargo" + } + }, + "build-commands": [ + "cargo build --release -p vietc-daemon -p vietc-cli -p vietc-uinputd --manifest-path /run/build/vietc/Cargo.toml", + + "cd /run/build/vietc/ui && cargo build --release --manifest-path /run/build/vietc/ui/Cargo.toml || echo 'tray build skipped'", + + "install -Dm755 target/release/vietc /app/bin/vietc", + "install -Dm755 target/release/vietc-cli /app/bin/vietc-cli", + "install -Dm755 target/release/vietc-uinputd /app/bin/vietc-uinputd", + "[ -f ui/target/release/vietc-tray ] && install -Dm755 ui/target/release/vietc-tray /app/bin/vietc-tray || true", + + "gcc -O2 -o /app/bin/vietc-xrecord /run/build/vietc/packaging/appimage/vietc-xrecord.c -lX11 -lXtst", + + "install -Dm755 /run/build/vietc/packaging/flatpak/vietc-wrapper.sh /app/bin/vietc-wrapper.sh", + + "install -Dm644 /run/build/vietc/packaging/appimage/vietc.desktop /app/share/applications/vietc.desktop", + + "install -Dm644 /run/build/vietc/vietc.toml /app/etc/vietc/config.toml", + + "mkdir -p /app/share/icons/hicolor/256x256/apps", + "cp /run/build/vietc/packaging/appimage/AppDir/vietc.svg /app/share/icons/hicolor/256x256/apps/vietc.svg || true", + + "install -Dm644 /run/build/vietc/vietc.service /app/lib/systemd/user/vietc.service || true", + + "mkdir -p /app/share/metainfo", + "cat > /app/share/metainfo/io.github.vietc.VietPlus.metainfo.xml << 'XML'", + "", + "", + " io.github.vietc.VietPlus", + " Viet+", + " Vietnamese Input Method for Linux", + " ", + "

Zero-configuration Vietnamese input method engine supporting Telex and VNI input methods.

", + " ", + " MIT", + " MIT", + " https://github.com/vndangkhoa/vietc", + " vietc", + " Utility", + "", + "XML", + + "mkdir -p /app/share/doc/vietc", + "cp /run/build/vietc/README.md /app/share/doc/vietc/ || true", + "cp /run/build/vietc/LICENSE /app/share/doc/vietc/ || true" + ], + "sources": [ + { + "type": "dir", + "path": "../.." + } + ], + "cleanup": [ + "/app/share/doc", + "/app/share/icons" + ] + } + ] +} diff --git a/packaging/flatpak/vietc-wrapper.sh b/packaging/flatpak/vietc-wrapper.sh new file mode 100644 index 0000000..3ceba3e --- /dev/null +++ b/packaging/flatpak/vietc-wrapper.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# Viet+ Flatpak entry point +# Starts the daemon and optionally the system tray interface + +HERE="$(dirname "$(readlink -f "${0}")")" +export PATH="$HERE:$PATH" + +CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/vietc" +mkdir -p "$CONFIG_DIR" "$HOME/.vietc" + +# Kill old processes +pkill -x vietc 2>/dev/null || true +pkill -x vietc-xrecord 2>/dev/null || true + +# Start daemon in background +"$HERE/vietc" > "$CONFIG_DIR/vietc-daemon.log" 2>&1 & +DAEMON_PID=$! + +cleanup() { + if [ -n "$DAEMON_PID" ]; then + kill "$DAEMON_PID" 2>/dev/null + wait "$DAEMON_PID" 2>/dev/null + fi +} +trap cleanup EXIT INT TERM + +# Start tray if available +if [ -f "$HERE/vietc-tray" ]; then + "$HERE/vietc-tray" "$@" + exit $? +fi + +# No tray: show notification if available +if command -v notify-send >/dev/null 2>&1; then + notify-send "Viet+" "Input method running in background" -t 3000 +fi + +echo "[vietc] Running (PID=$DAEMON_PID). Ctrl+C to stop." +wait $DAEMON_PID