head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.62
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.60
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.58
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.56
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.54
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.52
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.50
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.48
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.46
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.44
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.42
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.40
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.38
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.36
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.34
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.32
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.30
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.28
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.26
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.24
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.22
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.20
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.18
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.16
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.12
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.14
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.10
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.8
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.6
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.4
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.2
	pkgsrc-2018Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2018.08.18.01.11.16;	author ryoon;	state Exp;
branches;
next	;
commitid	OSPJKgRIm8AwuxOA;


desc
@@


1.1
log
@Update to 4.2.9.6

Changelog:
Bug fixes and improvements
@
text
@$NetBSD$

--- cmake/FcitxMacro.cmake.orig	2017-12-22 18:02:24.000000000 +0000
+++ cmake/FcitxMacro.cmake
@@@@ -199,6 +199,7 @@@@ function(__fcitx_cmake_init)
   set(__FCITX_CMAKE_HELPER_EXPORT
     "_FCITX_MACRO_CMAKE_DIR=${FCITX_MACRO_CMAKE_DIR}"
     "_FCITX_PO_PARSER_EXECUTABLE=${FCITX_PO_PARSER_EXECUTABLE}"
+    "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils"
     "FCITX_HELPER_CMAKE_CMD=${CMAKE_COMMAND}"
     "FCITX_CMAKE_CACHE_BASE=${fcitx_cmake_cache_base}"
     CACHE INTERNAL "fcitx cmake helper export" FORCE)
@@@@ -444,7 +445,7 @@@@ function(__fcitx_scan_addon name in_file
   get_filename_component(dir "${out_file}" PATH)
   add_custom_command(
     COMMAND "${CMAKE_COMMAND}" -E make_directory "${dir}"
-    COMMAND "${FCITX_SCANNER_EXECUTABLE}" --api "${in_file}" "${out_file}"
+    COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" "${FCITX_SCANNER_EXECUTABLE}" --api "${in_file}" "${out_file}"
     OUTPUT "${out_file}" DEPENDS "${in_file}" "${FCITX_SCANNER_EXECUTABLE}"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
   __fcitx_addon_get_unique_name("${name}--scan" target_name)
@@@@ -459,7 +460,7 @@@@ function(__fcitx_scan_addon_priv name in
   get_filename_component(dir "${out_file}" PATH)
   add_custom_command(
     COMMAND "${CMAKE_COMMAND}" -E make_directory "${dir}"
-    COMMAND "${FCITX_SCANNER_EXECUTABLE}" --private "${in_file}" "${out_file}"
+    COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" "${FCITX_SCANNER_EXECUTABLE}" --private "${in_file}" "${out_file}"
     OUTPUT "${out_file}" DEPENDS "${in_file}" "${FCITX_SCANNER_EXECUTABLE}"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
   __fcitx_addon_get_unique_name("${name}--scan-priv" target_name)
@