CVS commit: pkgsrc/inputmethod/librime

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Feb 18 10:05:00 UTC 2025

Modified Files:
        pkgsrc/inputmethod/librime: Makefile PLIST distinfo options.mk
        pkgsrc/inputmethod/librime/patches: patch-CMakeLists.txt

Log Message:
librime: updated to 1.13.1

librime 1.13.1

Features

simplifier: cache opencc
punctuator: add option to commit digit separator

librime 1.13.0

Features

punctuator: convert digit separators

Bug Fixes

navigator: wrong spans after selection
api: export librime 0.9 API as extern C
navigator: disconnect notifier
rime_api_console: recreate session when necessary


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/inputmethod/librime/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/inputmethod/librime/PLIST \
    pkgsrc/inputmethod/librime/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/inputmethod/librime/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/librime/Makefile
diff -u pkgsrc/inputmethod/librime/Makefile:1.35 pkgsrc/inputmethod/librime/Makefile:1.36
--- pkgsrc/inputmethod/librime/Makefile:1.35    Sun Dec 29 15:09:54 2024
+++ pkgsrc/inputmethod/librime/Makefile Tue Feb 18 10:05:00 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2024/12/29 15:09:54 adam Exp $
+# $NetBSD: Makefile,v 1.36 2025/02/18 10:05:00 adam Exp $
 
-DISTNAME=      librime-1.9.0
-PKGREVISION=   2
+DISTNAME=      librime-1.13.1
 CATEGORIES=    inputmethod chinese
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rime/}
 
@@ -10,20 +9,20 @@ HOMEPAGE=    https://rime.im/
 COMMENT=       Rime input method engine
 LICENSE=       modified-bsd
 
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++
+USE_CXX_FEATURES=      c++17
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
+PKGCONFIG_OVERRIDE+=   rime.pc.in
 
 LDFLAGS+=      -lsnappy
 
-PKGCONFIG_OVERRIDE+=   rime.pc.in
-
 .include "options.mk"
 
-.include "../../devel/cmake/build.mk"
 .include "../../converters/opencc/buildlink3.mk"
 .include "../../databases/leveldb/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/capnproto/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gflags/buildlink3.mk"
 .include "../../devel/google-glog/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"

Index: pkgsrc/inputmethod/librime/PLIST
diff -u pkgsrc/inputmethod/librime/PLIST:1.3 pkgsrc/inputmethod/librime/PLIST:1.4
--- pkgsrc/inputmethod/librime/PLIST:1.3        Sat Feb 10 09:54:15 2024
+++ pkgsrc/inputmethod/librime/PLIST    Tue Feb 18 10:05:00 2025
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2024/02/10 09:54:15 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/02/18 10:05:00 adam Exp $
 bin/rime_deployer
 bin/rime_dict_manager
 bin/rime_patch
 bin/rime_table_decompiler
 include/rime_api.h
+include/rime_api_deprecated.h
+include/rime_api_stdbool.h
 include/rime_levers_api.h
 lib/librime.so
-lib/librime.so.1
 lib/librime.so.${PKGVERSION}
+lib/librime.so.1
 lib/pkgconfig/rime.pc
 share/cmake/rime/RimeConfig.cmake
Index: pkgsrc/inputmethod/librime/options.mk
diff -u pkgsrc/inputmethod/librime/options.mk:1.3 pkgsrc/inputmethod/librime/options.mk:1.4
--- pkgsrc/inputmethod/librime/options.mk:1.3   Sun Aug 25 06:18:55 2024
+++ pkgsrc/inputmethod/librime/options.mk       Tue Feb 18 10:05:00 2025
@@ -1,16 +1,17 @@
-# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:55 wiz Exp $
-#
+# $NetBSD: options.mk,v 1.4 2025/02/18 10:05:00 adam Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.librime
-PKG_SUPPORTED_OPTIONS=         tests
+PKG_OPTIONS_VAR=       PKG_OPTIONS.librime
+PKG_SUPPORTED_OPTIONS= tests
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mtests)
 .include "../../devel/googletest/buildlink3.mk"
 CMAKE_CONFIGURE_ARGS+= -DBUILD_TEST=ON
-TEST_TARGET=   test
-TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/lib
+TEST_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/lib
+# For Darwin
+TEST_ENV+=             DYLD_LIBRARY_PATH=${WRKSRC}/lib
+TEST_TARGET=           test
 .else
 CMAKE_CONFIGURE_ARGS+= -DBUILD_TEST=OFF
 .endif

Index: pkgsrc/inputmethod/librime/distinfo
diff -u pkgsrc/inputmethod/librime/distinfo:1.13 pkgsrc/inputmethod/librime/distinfo:1.14
--- pkgsrc/inputmethod/librime/distinfo:1.13    Sat Feb 10 09:54:15 2024
+++ pkgsrc/inputmethod/librime/distinfo Tue Feb 18 10:05:00 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2024/02/10 09:54:15 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2025/02/18 10:05:00 adam Exp $
 
-BLAKE2s (librime-1.9.0.tar.gz) = 2d9f63eb97dec68360aab2b1a8151d705755b2227f2b9cf2d808cb732ffae3aa
-SHA512 (librime-1.9.0.tar.gz) = 7f432bbfeedc0949391fca82ebf080d113089ec9f0ab40f4bc63cf3037052a27b4ef44e55e7fc43b1217cf6635c62be0fb7520c3cc1492ec169fe5ee864e61ea
-Size (librime-1.9.0.tar.gz) = 2628091 bytes
-SHA1 (patch-CMakeLists.txt) = 74c9b47cde6306dab9de4827422ded9e91df3b45
+BLAKE2s (librime-1.13.1.tar.gz) = 6c8ced54bccf1cc316b9c64ddb9cf5c743f65f1f4e5b9875bb17c46ec6abb203
+SHA512 (librime-1.13.1.tar.gz) = 949d7a94bb498dc1a92aaae5e3216efd25dd0b5d52aaa7f69953ccc63f1bc2590be87636bd85111d0a5222b4ef8e4e152beb45349a9f91df58de2ae631d2b040
+Size (librime-1.13.1.tar.gz) = 2639960 bytes
+SHA1 (patch-CMakeLists.txt) = dc01d9f1d34d4d1ece83da133dac8efe46089830
 SHA1 (patch-plugins_CMakeLists.txt) = ab0b528c0a9219c52d0a8ca596209799db9de14a

Index: pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt
diff -u pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.6 pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.6 Sat Feb 10 09:54:15 2024
+++ pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt     Tue Feb 18 10:05:00 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2024/02/10 09:54:15 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2025/02/18 10:05:00 adam Exp $
 
 Install pkg-config file on all platforms.
 
---- CMakeLists.txt.orig        2023-09-16 09:33:26.000000000 +0000
+--- CMakeLists.txt.orig        2025-02-16 10:41:02.000000000 +0000
 +++ CMakeLists.txt
-@@ -185,7 +185,7 @@ configure_file(
+@@ -204,7 +204,7 @@ configure_file(
  add_custom_target(remove
    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
  
--if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|DragonFly|GNU" OR MINGW)
-+if(${CMAKE_SYSTEM_NAME} MATCHES ".*" OR MINGW)
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|DragonFly|GNU|Darwin" OR MINGW)
++if(TRUE)
    set(prefix "${CMAKE_INSTALL_PREFIX}")
    set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
    set(bindir "${CMAKE_INSTALL_FULL_BINDIR}")