Update to libime-1.1.5

- static data/table updates, new table
- drop outdated C11 patch

From MAINTAINER Yifei Zhan

Tweak/ok op@

inputmethods/libime/Makefile

@@ -1,11 +1,10 @@
 COMMENT =	library to support generic input method implementation
 
-DISTNAME =	libime-1.0.17
-REVISION =	1
+DISTNAME =	libime-1.1.5
 
-SHARED_LIBS +=	IMECore		0.0 # 0.0
-SHARED_LIBS +=	IMEPinyin	0.0 # 0.0
-SHARED_LIBS +=	IMETable	0.0 # 0.0
+SHARED_LIBS +=	IMECore		0.1 # 0.0
+SHARED_LIBS +=	IMEPinyin	0.1 # 0.0
+SHARED_LIBS +=	IMETable	1.0 # 0.0
 
 CATEGORIES =	inputmethods
 
@@ -16,7 +15,7 @@ MAINTAINER =	Yifei Zhan <openbsd@zhan.science>
 # LGPLv2.1+
 PERMIT_PACKAGE=	Yes
 WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils boost_filesystem-mt
-WANTLIB += boost_iostreams-mt boost_regex-mt c m
+WANTLIB += boost_iostreams-mt boost_regex-mt c m zstd
 
 SITES =			https://download.fcitx-im.org/fcitx5/libime/
 
@@ -25,8 +24,9 @@ SITES.data =		https://download.fcitx-im.org/data/
 # Dictionary and Language Model
 # Keep in sync with the post-patch section + upstream list
 # https://github.com/fcitx/libime/blob/master/data/CMakeLists.txt
-DISTFILES.data +=	dict-20220810.tar.xz
-DISTFILES.data +=	lm_sc.arpa-20220810.tar.xz
+DISTFILES.data +=	dict-20230412.tar.xz
+DISTFILES.data +=	lm_sc.arpa-20230712.tar.xz
+DISTFILES.data +=	table-20240108.tar.gz
 DISTFILES.data +=	table.tar.gz
 
 EXTRACT_SUFX = 		.tar.xz
@@ -47,9 +47,11 @@ RUN_DEPENDS =		devel/desktop-file-utils \
 LIB_DEPENDS =		inputmethods/fcitx \
 			devel/boost
 post-patch:
-			@cp ${FULLDISTDIR}/dict-20220810.tar.xz \
+			@cp ${FULLDISTDIR}/dict-20230412.tar.xz \
 				${WRKSRC}/data/
-			@cp ${FULLDISTDIR}/lm_sc.arpa-20220810.tar.xz \
+			@cp ${FULLDISTDIR}/lm_sc.arpa-20230712.tar.xz \
+				${WRKSRC}/data/
+			@cp ${FULLDISTDIR}/table-20240108.tar.gz \
 				${WRKSRC}/data/
 			@cp ${FULLDISTDIR}/table.tar.gz \
 				${WRKSRC}/data/

inputmethods/libime/distinfo

@@ -1,8 +1,10 @@
-SHA256 (fcitx/dict-20220810.tar.xz) = lxdS9BMYgAfo0ZFYwRuFyVXiXXsyHsInXEs69tioXSY=
-SHA256 (fcitx/libime-1.0.17.tar.xz) = I/h7gQS5FhvcQfusRClP74JdWGJgr8aY9qhf8g6mVAc=
-SHA256 (fcitx/lm_sc.arpa-20220810.tar.xz) = oRvJfSda2vGV+brIVDaK4GzbSg/h7s9Z21rlgGFdtPo=
+SHA256 (fcitx/dict-20230412.tar.xz) = 8F/Mr/loeQCqw9mtWoGyCIi1cyAUA/vNm7x5B9npdQc=
+SHA256 (fcitx/libime-1.1.5.tar.xz) = FTYjFMwiIGPfCDQiUYpSskZv01PMjZlRloF5JpV0ZT4=
+SHA256 (fcitx/lm_sc.arpa-20230712.tar.xz) = ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI=
+SHA256 (fcitx/table-20240108.tar.gz) = cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4=
 SHA256 (fcitx/table.tar.gz) = YZYFPHJBJeOuPYvWsvkXLQyDtlsNQQ083mO3qNarh7c=
-SIZE (fcitx/dict-20220810.tar.xz) = 1160888
-SIZE (fcitx/libime-1.0.17.tar.xz) = 415804
-SIZE (fcitx/lm_sc.arpa-20220810.tar.xz) = 21436544
+SIZE (fcitx/dict-20230412.tar.xz) = 1162104
+SIZE (fcitx/libime-1.1.5.tar.xz) = 424824
+SIZE (fcitx/lm_sc.arpa-20230712.tar.xz) = 30701196
+SIZE (fcitx/table-20240108.tar.gz) = 4144659
 SIZE (fcitx/table.tar.gz) = 4144686

inputmethods/libime/patches/patch-src_libime_core_CMakeLists_txt

@@ -1,18 +0,0 @@
-Pull in upstream change to switch to C++11 to unbreak build
-
-https://github.com/fcitx/libime/commit/95c1433500b089b0c2edbdd17720f66e6eafd5e0
-
-Index: src/libime/core/CMakeLists.txt
---- src/libime/core/CMakeLists.txt.orig
-+++ src/libime/core/CMakeLists.txt
-@@ -13,7 +13,9 @@ add_library(kenlm STATIC ${KENLM_SRCS})
- target_include_directories(kenlm PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/kenlm>)
- target_compile_definitions(kenlm PUBLIC -DKENLM_MAX_ORDER=3 PRIVATE -DNDEBUG)
- target_link_libraries(kenlm PUBLIC Boost::boost)
--set_target_properties(kenlm PROPERTIES POSITION_INDEPENDENT_CODE ON)
-+set_target_properties(kenlm PROPERTIES
-+  CXX_STANDARD 11
-+  POSITION_INDEPENDENT_CODE ON)
- 
- if(UNIX)
-   check_library_exists(rt clock_gettime "clock_gettime from librt" HAVE_CLOCKGETTIME_RT)

inputmethods/libime/pkg/PLIST

@@ -33,6 +33,7 @@ include/LibIME/libime/pinyin/pinyinencoder.h
 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/