Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packaging-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packaging-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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\")
Expand Down
8 changes: 4 additions & 4 deletions README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions nix/packages/fcitx5-lotus/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
kdePackages,
libinput,
librsvg,
libx11,
nix-update-script,
pkg-config,
python3,
Expand Down Expand Up @@ -71,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
fcitx5
kdePackages.extra-cmake-modules
libinput
libx11
pythonEnv
qt6.qtbase
qt6.qtsvg
Expand Down
1 change: 0 additions & 1 deletion packaging/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion packaging/rpm/fedora/fcitx5-lotus.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ BuildRequires: gettext-devel
BuildRequires: cmake(Fcitx5Core)
BuildRequires: libinput-devel
BuildRequires: pkgconfig(libudev)
BuildRequires: libX11-devel

BuildRequires: golang
BuildRequires: python3-devel
Expand Down
1 change: 0 additions & 1 deletion packaging/rpm/opensuse/fcitx5-lotus.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ BuildRequires: glibc-devel
BuildRequires: fcitx5-devel
BuildRequires: libinput-devel
BuildRequires: systemd-devel
BuildRequires: libX11-devel

BuildRequires: go
BuildRequires: sysuser-tools
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ target_link_libraries(lotus
Fcitx5::Module::Emoji
Bamboo::Core
Pthread::Pthread
X11::X11
)

target_include_directories(lotus PRIVATE
Expand Down
2 changes: 0 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
Expand Down
Loading