From 6c76384efda8ee73cd87e2d4c3613371aacf6c73 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Wed, 26 Oct 2022 18:46:02 +0000 Subject: [PATCH] Use ${LOCALBASE} instead /usr/local Diff from SASANO Takayoshi, thanks --- inputmethods/fcitx-kkc/Makefile | 3 +++ inputmethods/fcitx-kkc/patches/patch-CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inputmethods/fcitx-kkc/Makefile b/inputmethods/fcitx-kkc/Makefile index e6aadc72b5d..04e44c7b16f 100644 --- a/inputmethods/fcitx-kkc/Makefile +++ b/inputmethods/fcitx-kkc/Makefile @@ -36,6 +36,9 @@ LIB_DEPENDS = inputmethods/fcitx \ inputmethods/fcitx-qt \ inputmethods/libkkc +pre-configure: + ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt + # ninja: error: unknown target 'test' NO_TEST = Yes diff --git a/inputmethods/fcitx-kkc/patches/patch-CMakeLists.txt b/inputmethods/fcitx-kkc/patches/patch-CMakeLists.txt index ffdc2631f63..6718afeabd7 100644 --- a/inputmethods/fcitx-kkc/patches/patch-CMakeLists.txt +++ b/inputmethods/fcitx-kkc/patches/patch-CMakeLists.txt @@ -1,11 +1,11 @@ --- CMakeLists.txt.orig Thu Mar 10 03:25:57 2022 -+++ CMakeLists.txt Sat Oct 22 21:30:34 2022 ++++ CMakeLists.txt Sun Oct 23 17:31:01 2022 @@ -25,7 +25,7 @@ endif () if (NOT SKK_DEFAULT_PATH) - set(SKK_DEFAULT_PATH "/usr/share/skk/") -+ set(SKK_DEFAULT_PATH "/usr/local/share/skk/") ++ set(SKK_DEFAULT_PATH "${LOCALBASE}/share/skk/") endif () include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")