pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/inputmethod/libime
Module Name: pkgsrc
Committed By: ryoon
Date: Sat Feb 10 09:30:44 UTC 2024
Modified Files:
pkgsrc/inputmethod/libime: Makefile PLIST distinfo
pkgsrc/inputmethod/libime/patches: patch-data_CMakeLists.txt
Removed Files:
pkgsrc/inputmethod/libime/patches: patch-test_testhistorybigram.cpp
Log Message:
inputmethod/libime: Update to 1.1.5
Changelog:
Not available.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/libime/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/libime/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/libime/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/inputmethod/libime/patches/patch-data_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
pkgsrc/inputmethod/libime/patches/patch-test_testhistorybigram.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/inputmethod/libime/Makefile
diff -u pkgsrc/inputmethod/libime/Makefile:1.16 pkgsrc/inputmethod/libime/Makefile:1.17
--- pkgsrc/inputmethod/libime/Makefile:1.16 Fri Dec 29 18:24:51 2023
+++ pkgsrc/inputmethod/libime/Makefile Sat Feb 10 09:30:43 2024
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2023/12/29 18:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.17 2024/02/10 09:30:43 ryoon Exp $
-DISTNAME= libime-1.0.4
-PKGREVISION= 9
+DISTNAME= libime-1.1.5
CATEGORIES= inputmethod
MASTER_SITES= https://download.fcitx-im.org/fcitx5/libime/
EXTRACT_SUFX= .tar.xz
-DIST_SUBDIR= ${PKGNAME_NOREV}
MAINTAINER= ryoon%NetBSD.org@localhost
HOMEPAGE= https://github.com/fcitx/libime
@@ -14,10 +12,9 @@ LICENSE= gnu-lgpl-v2.1
TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-DICTDISTFILES+= lm_sc.3gm.arpa-20140820.tar.bz2
-#ICTDISTFILES+= dict.utf8-20200715.tar.xz
-DICTDISTFILES+= dict.utf8-20210203.tar.xz
-DICTDISTFILES+= table.tar.gz
+DICTDISTFILES+= lm_sc.arpa-20230712.tar.xz
+DICTDISTFILES+= dict-20230412.tar.xz
+DICTDISTFILES+= table-20240108.tar.gz
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DEFAULT_DISTFILES}
@@ -26,19 +23,19 @@ DISTFILES+= ${f}
SITES.${f}= https://download.fcitx-im.org/data/
.endfor
-USE_CMAKE= yes
USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-# possibly fixed in 1.0.17?
-PYTHON_VERSIONS_INCOMPATIBLE+= 311 312
post-extract:
.for f in ${DICTDISTFILES}
cd ${WRKSRC}/data && \
- ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${f} ${f}
+ ${LN} -sf ${DISTDIR}/${f} ${f}
.endfor
+.include "../../devel/cmake/build.mk"
+.include "../../archivers/zstd/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../lang/python/application.mk"
Index: pkgsrc/inputmethod/libime/PLIST
diff -u pkgsrc/inputmethod/libime/PLIST:1.1 pkgsrc/inputmethod/libime/PLIST:1.2
--- pkgsrc/inputmethod/libime/PLIST:1.1 Sat Feb 20 21:27:37 2021
+++ pkgsrc/inputmethod/libime/PLIST Sat Feb 10 09:30:43 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/02/20 21:27:37 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/02/10 09:30:43 ryoon Exp $
bin/libime_history
bin/libime_migrate_fcitx4_pinyin
bin/libime_migrate_fcitx4_table
@@ -29,6 +29,7 @@ include/LibIME/libime/pinyin/pinyinencod
include/LibIME/libime/pinyin/pinyinime.h
include/LibIME/libime/pinyin/pinyinmatchstate.h
include/LibIME/libime/pinyin/pinyinmatchstate_p.h
+include/LibIME/libime/pinyin/pinyinprediction.h
include/LibIME/libime/pinyin/shuangpindata.h
include/LibIME/libime/pinyin/shuangpinprofile.h
include/LibIME/libime/table/autophrasedict.h
@@ -64,6 +65,7 @@ lib/libime/zh_CN.lm.predict
share/libime/cj.main.dict
share/libime/db.main.dict
share/libime/erbi.main.dict
+share/libime/extb.dict
share/libime/qxm.main.dict
share/libime/sc.dict
share/libime/wanfeng.main.dict
Index: pkgsrc/inputmethod/libime/distinfo
diff -u pkgsrc/inputmethod/libime/distinfo:1.6 pkgsrc/inputmethod/libime/distinfo:1.7
--- pkgsrc/inputmethod/libime/distinfo:1.6 Tue Nov 9 10:15:35 2021
+++ pkgsrc/inputmethod/libime/distinfo Sat Feb 10 09:30:43 2024
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.6 2021/11/09 10:15:35 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/02/10 09:30:43 ryoon Exp $
-BLAKE2s (libime-1.0.4/dict.utf8-20210203.tar.xz) = 2287e6830f07221b37f15a59ad5fbcf789fd22f9d7f3122493d0d05e3bd61389
-SHA512 (libime-1.0.4/dict.utf8-20210203.tar.xz) = b0ed22a7898cd7ddb6f4a9f3bed32b270ea3d1080bc060f420cc5e4599892b0afca80364779741bfc19b6466d3d0ded89d8b3465c64c50a8892129971045d7ab
-Size (libime-1.0.4/dict.utf8-20210203.tar.xz) = 471532 bytes
-BLAKE2s (libime-1.0.4/libime-1.0.4.tar.xz) = 3e7b1e4a4b3f6551d7bd63c1420c2ab94c30611f12cc83030a6c6bea435b0601
-SHA512 (libime-1.0.4/libime-1.0.4.tar.xz) = ef45e50b8b4073209e6adb580d998e8e67f176d1e560c641a2fc3da1bfff97062b3250e446225b406054bac49bda909acec7d46c41bb79652e67950cd07da991
-Size (libime-1.0.4/libime-1.0.4.tar.xz) = 409428 bytes
-BLAKE2s (libime-1.0.4/lm_sc.3gm.arpa-20140820.tar.bz2) = 0c2e824e273012b7dc40603eecc499a247bba60d252da2dc3c7f8ec84acf4863
-SHA512 (libime-1.0.4/lm_sc.3gm.arpa-20140820.tar.bz2) = ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
-Size (libime-1.0.4/lm_sc.3gm.arpa-20140820.tar.bz2) = 36623028 bytes
-BLAKE2s (libime-1.0.4/table.tar.gz) = c4f966243472256e078db4e3e82adf89abad963ad779f242d2d320a19f43a2d6
-SHA512 (libime-1.0.4/table.tar.gz) = 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
-Size (libime-1.0.4/table.tar.gz) = 4144686 bytes
-SHA1 (patch-data_CMakeLists.txt) = 54007355fa7e0adb145e97dd94225dd5a224a668
-SHA1 (patch-test_testhistorybigram.cpp) = 8126138a1ecd4ff74f4ba79d4c517f5a43d985ae
+BLAKE2s (dict-20230412.tar.xz) = a5124236d02df7708eb769c5356354d91d6d37a559e6543080d93b9bece42b9c
+SHA512 (dict-20230412.tar.xz) = 93d7fcdecac2dac0b4c257b71c20edd4c3c938f4a25e5220b3582bcd305deb6a4b9b27668958dded1a6a072df25e5cb30d85f31fd9fa3a9e37fa7ba27cb3ae81
+Size (dict-20230412.tar.xz) = 1162104 bytes
+BLAKE2s (libime-1.1.5.tar.xz) = 1da7091568e52f0ba40c6be2d5992d49c391d3883a50c8b78033161c8cec19ac
+SHA512 (libime-1.1.5.tar.xz) = 4860f81b3f4032607324d782ef780de65c909286305d8aac9d11bec8cc0b285203569a26599590a987aaa651082a5aac4b692e11408e49dafe8562a4ce31d885
+Size (libime-1.1.5.tar.xz) = 424824 bytes
+BLAKE2s (lm_sc.arpa-20230712.tar.xz) = fcf4f876d23bc31cf6f922f17ce3e0bbcb2b4eaf9a8c2430641cd2431d33a982
+SHA512 (lm_sc.arpa-20230712.tar.xz) = 94c21052bbc2d8db2875a9daaa8b9b03326ec35082b829ec1891ac8f90032ecbe0740f902e624589a0539d8e59846c7f7779330403f2057e1997da49b83afcf6
+Size (lm_sc.arpa-20230712.tar.xz) = 30701196 bytes
+BLAKE2s (table-20240108.tar.gz) = 7a2125b22e2b0a23f69b92cf38bb77bf8d5b91fb2e7cca49ced5082c32aa00bd
+SHA512 (table-20240108.tar.gz) = 0268a4aaf7279e03938ec8165a57d92d7ef9f6cfd30be332eaa4286c5162754946d326444643c1a556ed615cc82c8851bb9a4d996ce432833c50ca23d2d6416a
+Size (table-20240108.tar.gz) = 4144659 bytes
+SHA1 (patch-data_CMakeLists.txt) = b389b03ca9995b351d5f4464bc96f3188fa5a74c
Index: pkgsrc/inputmethod/libime/patches/patch-data_CMakeLists.txt
diff -u pkgsrc/inputmethod/libime/patches/patch-data_CMakeLists.txt:1.1 pkgsrc/inputmethod/libime/patches/patch-data_CMakeLists.txt:1.2
--- pkgsrc/inputmethod/libime/patches/patch-data_CMakeLists.txt:1.1 Sat Feb 20 21:27:37 2021
+++ pkgsrc/inputmethod/libime/patches/patch-data_CMakeLists.txt Sat Feb 10 09:30:43 2024
@@ -1,29 +1,37 @@
-$NetBSD: patch-data_CMakeLists.txt,v 1.1 2021/02/20 21:27:37 ryoon Exp $
+$NetBSD: patch-data_CMakeLists.txt,v 1.2 2024/02/10 09:30:43 ryoon Exp $
* Fix runtime errors during build for pkgsrc.
pkgsrc removes $ORIGIN from RPATH.
---- data/CMakeLists.txt.orig 2020-08-29 01:46:26.014709200 +0000
+--- data/CMakeLists.txt.orig 2023-07-13 07:06:39.663232800 +0000
+++ data/CMakeLists.txt
-@@ -24,7 +24,7 @@ add_custom_target(opengram-lm ALL DEPEND
+@@ -19,7 +19,7 @@ add_custom_target(lm ALL DEPENDS "${LM_O
add_custom_command(
- OUTPUT "${OPENGRAM_LM_PREDICT_OUTPUT}"
- DEPENDS "${OPENGRAM_LM_SRC}" opengram-lm LibIME::prediction
-- COMMAND LibIME::prediction "${OPENGRAM_LM_OUTPUT}" "${OPENGRAM_LM_SRC}" "${OPENGRAM_LM_PREDICT_OUTPUT}")
-+ COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/libime/core" ${PROJECT_BINARY_DIR}/tools/libime_prediction "${OPENGRAM_LM_OUTPUT}" "${OPENGRAM_LM_SRC}"
"${OPENGRAM_LM_PREDICT_OUTPUT}")
- add_custom_target(opengram-lm-predict ALL DEPENDS "${OPENGRAM_LM_PREDICT_OUTPUT}")
+ OUTPUT "${LM_PREDICT_OUTPUT}"
+ DEPENDS "${LM_SRC}" lm LibIME::prediction
+- COMMAND LibIME::prediction "${LM_OUTPUT}" "${LM_SRC}" "${LM_PREDICT_OUTPUT}")
++ COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/libime/core" ${PROJECT_BINARY_DIR}/tools/libime_prediction "${LM_OUTPUT}" "${LM_SRC}" "${LM_PREDICT_OUTPUT}")
+ add_custom_target(lm-predict ALL DEPENDS "${LM_PREDICT_OUTPUT}")
- install(FILES "${OPENGRAM_LM_OUTPUT}" RENAME zh_CN.lm DESTINATION "${LIBIME_INSTALL_LIBDATADIR}")
-@@ -46,7 +46,7 @@ add_custom_command(
+ install(FILES "${LM_OUTPUT}" RENAME zh_CN.lm DESTINATION "${LIBIME_INSTALL_LIBDATADIR}")
+@@ -38,14 +38,14 @@ set(DICT_OUTPUT "${CMAKE_CURRENT_BINARY_
add_custom_command(
- OUTPUT "${OPENGRAM_DICT_OUTPUT}"
- DEPENDS "${OPENGRAM_DICT_SRC}" LibIME::pinyindict
-- COMMAND LibIME::pinyindict "${OPENGRAM_DICT_SRC}" "${OPENGRAM_DICT_OUTPUT}")
-+ COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/libime/pinyin:${PROJECT_BINARY_DIR}/src/libime/core" ${PROJECT_BINARY_DIR}/tools/libime_pinyindict
"${OPENGRAM_DICT_SRC}" "${OPENGRAM_DICT_OUTPUT}")
- add_custom_target(opengram-dict ALL DEPENDS "${OPENGRAM_DICT_OUTPUT}")
- install(FILES "${OPENGRAM_DICT_OUTPUT}" DESTINATION "${LIBIME_INSTALL_PKGDATADIR}")
+ OUTPUT "${DICT_OUTPUT}"
+ DEPENDS "${DICT_SRC}" LibIME::pinyindict
+- COMMAND LibIME::pinyindict "${DICT_SRC}" "${DICT_OUTPUT}")
++ COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/libime/pinyin:${PROJECT_BINARY_DIR}/src/libime/core" ${PROJECT_BINARY_DIR}/tools/libime_pinyindict "${DICT_SRC}"
"${DICT_OUTPUT}")
-@@ -64,7 +64,7 @@ foreach(TABLE_TXT_FILE ${TABLE_TXT_FILES
+ set(DICT_EXTB_SRC "${CMAKE_CURRENT_BINARY_DIR}/dict_extb.txt")
+ set(DICT_EXTB_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/extb.dict")
+ add_custom_command(
+ OUTPUT "${DICT_EXTB_OUTPUT}"
+ DEPENDS "${DICT_EXTB_SRC}" LibIME::pinyindict
+- COMMAND LibIME::pinyindict "${DICT_EXTB_SRC}" "${DICT_EXTB_OUTPUT}")
++ COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/libime/pinyin:${PROJECT_BINARY_DIR}/src/libime/core" ${PROJECT_BINARY_DIR}/tools/libime_pinyindict "${DICT_EXTB_SRC}"
"${DICT_EXTB_OUTPUT}")
+ add_custom_target(dict ALL DEPENDS "${DICT_OUTPUT}" "${DICT_EXTB_OUTPUT}")
+ install(FILES "${DICT_OUTPUT}" "${DICT_EXTB_OUTPUT}" DESTINATION "${LIBIME_INSTALL_PKGDATADIR}")
+
+@@ -63,7 +63,7 @@ foreach(TABLE_TXT_FILE ${TABLE_TXT_FILES
string(REPLACE .txt .main.dict TABLE_DICT_FILE ${TABLE_TXT_FILE})
add_custom_command(OUTPUT ${TABLE_DICT_FILE}
DEPENDS ${TABLE_TXT_FILE} LibIME::tabledict
Home |
Main Index |
Thread Index |
Old Index