540b6b7acc
update version 4.2.8 OBS-URL: https://build.opensuse.org/request/show/181661 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=70
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
Index: fcitx-4.2.8/cmake/FcitxMacro.cmake
|
|
===================================================================
|
|
--- fcitx-4.2.8.orig/cmake/FcitxMacro.cmake
|
|
+++ fcitx-4.2.8/cmake/FcitxMacro.cmake
|
|
@@ -184,10 +184,10 @@ function(__fcitx_cmake_init)
|
|
CACHE INTERNAL "include dir" FORCE)
|
|
else()
|
|
set(FCITX_SCANNER_EXECUTABLE
|
|
- "${FCITX_MACRO_CMAKE_DIR}/fcitx-scanner"
|
|
+ "${FCITX4_ADDON_INSTALL_DIR}/libexec/fcitx-scanner"
|
|
CACHE INTERNAL "fcitx-scanner" FORCE)
|
|
set(FCITX_PO_PARSER_EXECUTABLE
|
|
- "${FCITX_MACRO_CMAKE_DIR}/fcitx-po-parser"
|
|
+ "${FCITX4_ADDON_INSTALL_DIR}/libexec/fcitx-po-parser"
|
|
CACHE INTERNAL "fcitx-po-parser" FORCE)
|
|
execute_process(COMMAND env ${FCITX_PO_PARSER_EXECUTABLE}
|
|
--gettext-support RESULT_VARIABLE result)
|
|
Index: fcitx-4.2.8/src/module/spell/dict/CMakeLists.txt
|
|
===================================================================
|
|
--- fcitx-4.2.8.orig/src/module/spell/dict/CMakeLists.txt
|
|
+++ fcitx-4.2.8/src/module/spell/dict/CMakeLists.txt
|
|
@@ -5,7 +5,7 @@ set(DICT_COMP_SRC
|
|
add_executable(comp-spell-dict ${DICT_COMP_SRC})
|
|
target_link_libraries(comp-spell-dict fcitx-utils)
|
|
install(TARGETS comp-spell-dict
|
|
- DESTINATION "${prefix}/share/cmake/fcitx/")
|
|
+ DESTINATION "${addondir}/libexec")
|
|
|
|
set(SPELL_EN_DICT_VER 20121020)
|
|
set(SPELL_EN_DICT "${CMAKE_CURRENT_BINARY_DIR}/en_dict.fscd")
|
|
@@ -27,4 +27,4 @@ add_custom_command(
|
|
COMMAND "${COMP_SPELL_DICT}" --comp-dict
|
|
"${SPELL_EN_DICT_SRC}" "${SPELL_EN_DICT}")
|
|
add_custom_target(spell_en_dict ALL DEPENDS "${SPELL_EN_DICT}")
|
|
-install(FILES "${SPELL_EN_DICT}" DESTINATION "${pkgdatadir}/spell")
|
|
\ No newline at end of file
|
|
+install(FILES "${SPELL_EN_DICT}" DESTINATION "${pkgdatadir}/spell")
|
|
Index: fcitx-4.2.8/tools/dev/CMakeLists.txt
|
|
===================================================================
|
|
--- fcitx-4.2.8.orig/tools/dev/CMakeLists.txt
|
|
+++ fcitx-4.2.8/tools/dev/CMakeLists.txt
|
|
@@ -20,4 +20,4 @@ if(NOT _FCITX_DISABLE_GETTEXT)
|
|
endif()
|
|
|
|
install(TARGETS fcitx-scanner fcitx-po-parser
|
|
- DESTINATION "${prefix}/share/cmake/fcitx/")
|
|
+ DESTINATION "${addondir}/libexec")
|