Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1707558855215280"
MIME-Version: 1.0
Date: Sat, 10 Feb 2024 09:54:15 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/inputmethod/librime
To: pkgsrc-changes@NetBSD.org
Reply-To: ryoon@netbsd.org
Message-Id: <20240210095415.AEDF8FA42@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1707558855215280
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="UTF-8"

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Sat Feb 10 09:54:15 UTC 2024

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

Log Message:
inputmethod/librime: Update to 1.9.0

* Convert to new cmake mechanism.

Changelog:
1.9.0:
Features

    switches: abbreviate state labels #615 (居戎氏)
    dict: shorten the data struct used by Vocabulary #661 (WhiredPlanck)
    add append_comment option to reverse_lookup_filter (#699) #699 (ksqsf)

Bug Fixes

    avoid invalid page_size (#679) #679 (Qijia Liu)

Code Refactoring

    vocabulary.h: align the size of DictEntry struct #661 (WhiredPlanck)
    dict_compiler.cc: correct the usage of auto in loop #661 (WhiredPlanck)

Performance Improvements

    dict: improve dict complile performance (#663) #663 (WhiredPlanck)
    replace rbtree with vector of pair (#684) #684 (Qijia Liu)
    release memory of temporary fields (#690) #690 (Qijia Liu)

1.8.5:
Bug Fixes

    selector: do not match fallback modifier (居戎氏)

1.8.4:
Chores

    skip super key combos; amend merge result (居戎氏)


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/inputmethod/librime/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/librime/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/inputmethod/librime/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    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.


--_----------=_1707558855215280
Content-Disposition: inline
Content-Length: 3779
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/inputmethod/librime/Makefile
diff -u pkgsrc/inputmethod/librime/Makefile:1.32 pkgsrc/inputmethod/librime/Makefile:1.33
--- pkgsrc/inputmethod/librime/Makefile:1.32	Fri Dec 29 18:24:51 2023
+++ pkgsrc/inputmethod/librime/Makefile	Sat Feb 10 09:54:15 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2023/12/29 18:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.33 2024/02/10 09:54:15 ryoon Exp $
 
-DISTNAME=	librime-1.8.3
-PKGREVISION=	2
+DISTNAME=	librime-1.9.0
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rime/}
 
@@ -10,7 +9,6 @@ HOMEPAGE=	https://rime.im/
 COMMENT=	Rime input method engine
 LICENSE=	modified-bsd
 
-USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
@@ -20,6 +18,7 @@ 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"

Index: pkgsrc/inputmethod/librime/PLIST
diff -u pkgsrc/inputmethod/librime/PLIST:1.2 pkgsrc/inputmethod/librime/PLIST:1.3
--- pkgsrc/inputmethod/librime/PLIST:1.2	Sat Feb 20 20:53:01 2021
+++ pkgsrc/inputmethod/librime/PLIST	Sat Feb 10 09:54:15 2024
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2021/02/20 20:53:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/02/10 09:54:15 ryoon Exp $
 bin/rime_deployer
 bin/rime_dict_manager
 bin/rime_patch
+bin/rime_table_decompiler
 include/rime_api.h
 include/rime_levers_api.h
 lib/librime.so

Index: pkgsrc/inputmethod/librime/distinfo
diff -u pkgsrc/inputmethod/librime/distinfo:1.12 pkgsrc/inputmethod/librime/distinfo:1.13
--- pkgsrc/inputmethod/librime/distinfo:1.12	Mon Jan 30 10:35:19 2023
+++ pkgsrc/inputmethod/librime/distinfo	Sat Feb 10 09:54:15 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2023/01/30 10:35:19 wiz Exp $
+$NetBSD: distinfo,v 1.13 2024/02/10 09:54:15 ryoon Exp $
 
-BLAKE2s (librime-1.8.3.tar.gz) = 3d5cd233a758a01a0798836f0bb41811c710b6e52e93f4d44ea46b9c30abdd3e
-SHA512 (librime-1.8.3.tar.gz) = 0c8a9a50a36c195173a6759257f0d985de94f532265f9d8eba4e6675307bce64ae5a2ca8facdd3da1be72bc0814524e4f1203d8cdc569678ec6a8444231e19ab
-Size (librime-1.8.3.tar.gz) = 2623439 bytes
-SHA1 (patch-CMakeLists.txt) = ba75c194bb245e73c45df7cdde2e17bb74e29eda
+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
 SHA1 (patch-plugins_CMakeLists.txt) = ab0b528c0a9219c52d0a8ca596209799db9de14a

Index: pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt
diff -u pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.5 pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.5	Mon Jan 30 10:35:19 2023
+++ pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt	Sat Feb 10 09:54:15 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2023/01/30 10:35:19 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2024/02/10 09:54:15 ryoon Exp $
 
 Install pkg-config file on all platforms.
 
---- CMakeLists.txt.orig	2023-01-30 10:30:54.591650411 +0000
+--- CMakeLists.txt.orig	2023-09-16 09:33:26.000000000 +0000
 +++ CMakeLists.txt
-@@ -187,7 +187,7 @@ configure_file(
- add_custom_target(uninstall
+@@ -185,7 +185,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)


--_----------=_1707558855215280--