From a17e1a4158b76741bd2a33a6e0e6be793878be89 Mon Sep 17 00:00:00 2001 From: SyoBoN Date: Sun, 4 Feb 2024 18:33:07 +0900 Subject: [PATCH] textproc/fcitx5: Fix building without WAYLAND --- textproc/fcitx5/Makefile | 2 ++ textproc/fcitx5/pkg-plist | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/textproc/fcitx5/Makefile b/textproc/fcitx5/Makefile index 35d783b99d1..179a2a98253 100644 --- a/textproc/fcitx5/Makefile +++ b/textproc/fcitx5/Makefile @@ -52,11 +52,13 @@ X11_LIB_DEPENDS= libxcb-ewmh.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-util.so:x11/xcb-util X11_RUN_DEPENDS= xcb-imdkit>=1.0.3:x11/xcb-imdkit +X11_CMAKE_BOOL= ENABLE_X11 WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \ wayland-scanner:graphics/wayland WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-egl.so:graphics/wayland +WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND ENCHANT_DESC= Dictionary/spellchecking framework ENCHANT_LIB_DEPENDS= libenchant-2.so:textproc/enchant2 diff --git a/textproc/fcitx5/pkg-plist b/textproc/fcitx5/pkg-plist index eaae56bfd1e..c30ded6f3e0 100644 --- a/textproc/fcitx5/pkg-plist +++ b/textproc/fcitx5/pkg-plist @@ -51,7 +51,7 @@ include/Fcitx5/Module/fcitx-module/spell/spell_public.h include/Fcitx5/Module/fcitx-module/testfrontend/testfrontend_public.h include/Fcitx5/Module/fcitx-module/testim/testim_public.h include/Fcitx5/Module/fcitx-module/unicode/unicode_public.h -include/Fcitx5/Module/fcitx-module/wayland/wayland_public.h +%%WAYLAND%%include/Fcitx5/Module/fcitx-module/wayland/wayland_public.h include/Fcitx5/Module/fcitx-module/xcb/xcb_public.h include/Fcitx5/Utils/fcitx-utils/capabilityflags.h include/Fcitx5/Utils/fcitx-utils/charutils.h @@ -127,8 +127,8 @@ lib/cmake/Fcitx5ModuleTestIM/Fcitx5ModuleTestIMConfig.cmake lib/cmake/Fcitx5ModuleTestIM/Fcitx5ModuleTestIMConfigVersion.cmake lib/cmake/Fcitx5ModuleUnicode/Fcitx5ModuleUnicodeConfig.cmake lib/cmake/Fcitx5ModuleUnicode/Fcitx5ModuleUnicodeConfigVersion.cmake -lib/cmake/Fcitx5ModuleWayland/Fcitx5ModuleWaylandConfig.cmake -lib/cmake/Fcitx5ModuleWayland/Fcitx5ModuleWaylandConfigVersion.cmake +%%WAYLAND%%lib/cmake/Fcitx5ModuleWayland/Fcitx5ModuleWaylandConfig.cmake +%%WAYLAND%%lib/cmake/Fcitx5ModuleWayland/Fcitx5ModuleWaylandConfigVersion.cmake lib/cmake/Fcitx5ModuleXCB/Fcitx5ModuleXCBConfig.cmake lib/cmake/Fcitx5ModuleXCB/Fcitx5ModuleXCBConfigVersion.cmake lib/cmake/Fcitx5Utils/Fcitx5CompilerSettings.cmake @@ -157,8 +157,8 @@ lib/fcitx5/libtestfrontend.so lib/fcitx5/libtestim.so lib/fcitx5/libtestui.so lib/fcitx5/libunicode.so -lib/fcitx5/libwayland.so -lib/fcitx5/libwaylandim.so +%%WAYLAND%%lib/fcitx5/libwayland.so +%%WAYLAND%%lib/fcitx5/libwaylandim.so lib/fcitx5/libxcb.so lib/fcitx5/libxim.so lib/libFcitx5Config.so @@ -193,8 +193,8 @@ share/dbus-1/services/org.fcitx.Fcitx5.service %%DATADIR%%/addon/quickphrase.conf %%DATADIR%%/addon/spell.conf %%DATADIR%%/addon/unicode.conf -%%DATADIR%%/addon/wayland.conf -%%DATADIR%%/addon/waylandim.conf +%%WAYLAND%%%%DATADIR%%/addon/wayland.conf +%%WAYLAND%%%%DATADIR%%/addon/waylandim.conf %%DATADIR%%/addon/xcb.conf %%DATADIR%%/addon/xim.conf %%DATADIR%%/data/quickphrase.d/emoji-eac.mb -- 2.43.0