diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c04641f..c42e241e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Install dependencies run: | - pacman -Syu --noconfirm base-devel clang cmake ninja extra-cmake-modules fmt libuv boost git go libinput systemd-libs extra-cmake-modules libx11 python librsvg + pacman -Syu --noconfirm base-devel clang cmake ninja extra-cmake-modules fmt libuv boost git go libinput systemd-libs extra-cmake-modules python librsvg git config --global --add safe.directory "$GITHUB_WORKSPACE" git config --global --add safe.directory "$GITHUB_WORKSPACE/fcitx5-lotus" git config --global --add safe.directory "$GITHUB_WORKSPACE/fcitx5" diff --git a/.github/workflows/packaging-dev.yml b/.github/workflows/packaging-dev.yml index 4333bf1f..9be21868 100644 --- a/.github/workflows/packaging-dev.yml +++ b/.github/workflows/packaging-dev.yml @@ -173,7 +173,7 @@ jobs: set -euo pipefail pacman -Syu --noconfirm \ cmake extra-cmake-modules gcc go \ - fcitx5 libinput libx11 systemd python \ + fcitx5 libinput systemd python \ make pkgconf zstd librsvg cd /work diff --git a/.github/workflows/packaging-release.yml b/.github/workflows/packaging-release.yml index 812670c5..a561c687 100644 --- a/.github/workflows/packaging-release.yml +++ b/.github/workflows/packaging-release.yml @@ -361,7 +361,7 @@ jobs: set -euo pipefail pacman -Syu --noconfirm \ cmake extra-cmake-modules gcc go \ - fcitx5 libinput libx11 systemd python \ + fcitx5 libinput systemd python \ make pkgconf zstd librsvg cd /work diff --git a/CMakeLists.txt b/CMakeLists.txt index b1036edb..92916579 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED) find_package(Fcitx5ModuleEmoji REQUIRED) find_package(Pthread REQUIRED) find_package(Gettext REQUIRED) -find_package(X11 REQUIRED) include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake") add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-lotus\") diff --git a/README.en.md b/README.en.md index 4d732725..54f3f5ad 100644 --- a/README.en.md +++ b/README.en.md @@ -67,10 +67,10 @@ If you want to compile the input method from source to contribute or customize: ### Dependencies -- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config libx11-dev fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin` -- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools` -- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert` -- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git libx11 python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg` +- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin` +- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools` +- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert` +- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg` ### Install diff --git a/README.md b/README.md index 7df9569c..10ee6d0f 100644 --- a/README.md +++ b/README.md @@ -67,10 +67,10 @@ Nếu bạn muốn tự biên dịch bộ gõ từ mã nguồn để đóng góp ### Yêu cầu hệ thống -- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config libx11-dev fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin` -- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools` -- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel libX11-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert` -- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git libx11 python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg` +- **Debian/Ubuntu:** `sudo apt-get install cmake extra-cmake-modules libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev libinput-dev libudev-dev g++ golang hicolor-icon-theme pkg-config fcitx5-modules-dev python3-qtpy python3-dbus acl librsvg2-bin` +- **Fedora/RHEL:** `sudo dnf install cmake extra-cmake-modules fcitx5-devel libinput-devel libudev-devel gcc-c++ golang hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus acl librsvg2-tools` +- **openSUSE:** `sudo zypper install cmake kf6-extra-cmake-modules fcitx5-devel libinput-devel systemd-devel gcc-c++ go hicolor-icon-theme systemd-devel python3-pyside6 python3-QtPy python3-dbus-python acl rsvg-convert` +- **Arch:** `sudo pacman -S --needed cmake extra-cmake-modules gcc go git python make pkgconf acl fcitx5 libinput hicolor-icon-theme python-qtpy python-dbus librsvg` ### Cài đặt diff --git a/nix/packages/fcitx5-lotus/default.nix b/nix/packages/fcitx5-lotus/default.nix index 6251bcd3..64411356 100644 --- a/nix/packages/fcitx5-lotus/default.nix +++ b/nix/packages/fcitx5-lotus/default.nix @@ -12,7 +12,6 @@ kdePackages, libinput, librsvg, - libx11, nix-update-script, pkg-config, python3, @@ -71,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { fcitx5 kdePackages.extra-cmake-modules libinput - libx11 pythonEnv qt6.qtbase qt6.qtsvg diff --git a/packaging/debian/control b/packaging/debian/control index e8e20870..ada844b7 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -16,7 +16,6 @@ Build-Depends: debhelper-compat (= 13), libinput-dev, libudev-dev, pkg-config, - libx11-dev, python3, librsvg2-bin Standards-Version: 4.6.0 diff --git a/packaging/rpm/fedora/fcitx5-lotus.spec b/packaging/rpm/fedora/fcitx5-lotus.spec index 2b705c1f..8c94215f 100644 --- a/packaging/rpm/fedora/fcitx5-lotus.spec +++ b/packaging/rpm/fedora/fcitx5-lotus.spec @@ -13,7 +13,6 @@ BuildRequires: gettext-devel BuildRequires: cmake(Fcitx5Core) BuildRequires: libinput-devel BuildRequires: pkgconfig(libudev) -BuildRequires: libX11-devel BuildRequires: golang BuildRequires: python3-devel diff --git a/packaging/rpm/opensuse/fcitx5-lotus.spec b/packaging/rpm/opensuse/fcitx5-lotus.spec index b0de74fc..38cd5e09 100644 --- a/packaging/rpm/opensuse/fcitx5-lotus.spec +++ b/packaging/rpm/opensuse/fcitx5-lotus.spec @@ -13,7 +13,6 @@ BuildRequires: glibc-devel BuildRequires: fcitx5-devel BuildRequires: libinput-devel BuildRequires: systemd-devel -BuildRequires: libX11-devel BuildRequires: go BuildRequires: sysuser-tools diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 31eae16e..2c0c6fef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,6 @@ target_link_libraries(lotus Fcitx5::Module::Emoji Bamboo::Core Pthread::Pthread - X11::X11 ) target_include_directories(lotus PRIVATE diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fbb2340c..e53f030f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -16,7 +16,6 @@ target_link_libraries(lotus_test_core PRIVATE Fcitx5::Module::Emoji Bamboo::Core Pthread::Pthread - X11::X11 ) # Helper macro to compile standalone headless integration test linked with Lotus engine. @@ -41,7 +40,6 @@ function(add_lotus_headless_test target source labels) Fcitx5::Module::Emoji Bamboo::Core Pthread::Pthread - X11::X11 ) add_test(NAME ${target} COMMAND ${target}) set_tests_properties(${target} PROPERTIES LABELS "${labels}" TIMEOUT 20)