git: d58731655c8b - main - chinese/ibus-libpinyin: update to 1.15.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Tue, 18 Apr 2023 21:55:53 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d58731655c8b49bfc4e812b784114619a729e5da

commit d58731655c8b49bfc4e812b784114619a729e5da
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2023-03-12 13:26:33 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-18 21:55:29 +0000

    chinese/ibus-libpinyin: update to 1.15.2
    
    - update LICENSE
    - STROKE removed, new TABLE
    
    Changelog: https://github.com/epico/ibus-libpinyin/compare/1.11.1...libpinyin:ibus-libpinyin:1.15.2
    
    PR:             270156
    Approved by:    Henry Hu <henry.hu.sh@gmail.com> (maintainer)
---
 chinese/ibus-libpinyin/Makefile                    | 15 ++++----
 chinese/ibus-libpinyin/distinfo                    |  6 +--
 .../ibus-libpinyin/files/patch-data_Makefile.am    | 11 ------
 .../ibus-libpinyin/files/patch-data_Makefile.in    | 11 ------
 chinese/ibus-libpinyin/pkg-plist                   | 43 +++++++++++++---------
 5 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile
index 2f08da461b1a..ae1fb6d9ce8a 100644
--- a/chinese/ibus-libpinyin/Makefile
+++ b/chinese/ibus-libpinyin/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ibus-libpinyin
-PORTVERSION=	1.11.1
-PORTREVISION=	1
+DISTVERSION=	1.15.2
 CATEGORIES=	chinese
 MASTER_SITES=	SF/libpinyin/${PORTNAME}
 
@@ -8,14 +7,14 @@ MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	Intelligent Pinyin engine based on libpinyin for IBus
 WWW=		https://github.com/libpinyin/ibus-libpinyin
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libibus-1.0.so:textproc/ibus \
 		libpinyin.so:chinese/libpinyin
 
 USES=		compiler:c++11-lib gmake gnome python pkgconfig gettext
-USE_PYTHON=	py3kplist
 USE_GNOME=	glib20
 GLIB_SCHEMAS=	com.github.libpinyin.ibus-libpinyin.gschema.xml
 
@@ -25,15 +24,15 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking --disable-boost \
 				--disable-lua-extension
 
-OPTIONS_DEFINE=		ENGLISH STROKE OPENCC NLS
-OPTIONS_DEFAULT=	ENGLISH STROKE OPENCC
+OPTIONS_DEFINE=		ENGLISH TABLE OPENCC NLS
+OPTIONS_DEFAULT=	ENGLISH TABLE OPENCC
 OPTIONS_SUB=		yes
 ENGLISH_DESC=		Enable English input mode
-STROKE_DESC=		Enable stroke input mode
+TABLE_DESC=		Enable table input mode
 OPENCC_DESC=		Use opencc for simplified and traditional Chinese conversion
 
 ENGLISH_CONFIGURE_ENABLE=	english-input-mode
-STROKE_CONFIGURE_ENABLE=	stroke-input-mode
+TABLE_CONFIGURE_ENABLE=		table-input-mode
 
 OPENCC_CONFIGURE_ENABLE=	opencc
 OPENCC_LIB_DEPENDS=		libopencc.so:chinese/opencc
diff --git a/chinese/ibus-libpinyin/distinfo b/chinese/ibus-libpinyin/distinfo
index 2fba6c6d46eb..656818622096 100644
--- a/chinese/ibus-libpinyin/distinfo
+++ b/chinese/ibus-libpinyin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565071977
-SHA256 (ibus-libpinyin-1.11.1.tar.gz) = 80f530ccb88d44c51cfbb20d1191d50b0d4240c2a087de4e3aae89c6e26381ae
-SIZE (ibus-libpinyin-1.11.1.tar.gz) = 1177679
+TIMESTAMP = 1678495363
+SHA256 (ibus-libpinyin-1.15.2.tar.gz) = d7478d5a8745d2c2f3edb15d4053e4c515293195f7e959c1a992c7c4d5e8fa07
+SIZE (ibus-libpinyin-1.15.2.tar.gz) = 1292391
diff --git a/chinese/ibus-libpinyin/files/patch-data_Makefile.am b/chinese/ibus-libpinyin/files/patch-data_Makefile.am
deleted file mode 100644
index f67763c2a0cc..000000000000
--- a/chinese/ibus-libpinyin/files/patch-data_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.am.orig	2019-05-09 06:57:21 UTC
-+++ data/Makefile.am
-@@ -67,7 +67,7 @@ desktop_files = $(desktop_in_files:.desktop.in=.deskto
- 
- $(desktop_files): $(desktop_in_files) Makefile
- 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
--	sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \
-+	sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \
- 	-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@
- 
- desktopdir=$(datadir)/applications
diff --git a/chinese/ibus-libpinyin/files/patch-data_Makefile.in b/chinese/ibus-libpinyin/files/patch-data_Makefile.in
deleted file mode 100644
index 8fd45e396c14..000000000000
--- a/chinese/ibus-libpinyin/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig	2019-05-09 06:57:27 UTC
-+++ data/Makefile.in
-@@ -863,7 +863,7 @@ $(STROKES_DB): $(STROKES) $(STROKES_AWK)
- 
- $(desktop_files): $(desktop_in_files) Makefile
- 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
--	sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \
-+	sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \
- 	-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/chinese/ibus-libpinyin/pkg-plist b/chinese/ibus-libpinyin/pkg-plist
index 5359465b77f3..f76330ac8076 100644
--- a/chinese/ibus-libpinyin/pkg-plist
+++ b/chinese/ibus-libpinyin/pkg-plist
@@ -1,16 +1,9 @@
-%%NLS%%share/locale/ca/LC_MESSAGES/ibus-libpinyin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ibus-libpinyin.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ibus-libpinyin.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-libpinyin.mo
-%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus-libpinyin.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus-libpinyin.mo
 libexec/ibus-engine-libpinyin
 libexec/ibus-setup-libpinyin
-share/appdata/libpinyin.appdata.xml
 share/applications/ibus-setup-libbopomofo.desktop
 share/applications/ibus-setup-libpinyin.desktop
 %%ENGLISH%%%%DATADIR%%/db/english.db
-%%STROKE%%%%DATADIR%%/db/strokes.db
+%%TABLE%%%%DATADIR%%/db/table.db
 %%DATADIR%%/icons/chinese.svg
 %%DATADIR%%/icons/english.svg
 %%DATADIR%%/icons/full-punct.svg
@@ -21,20 +14,34 @@ share/applications/ibus-setup-libpinyin.desktop
 %%DATADIR%%/icons/ibus-pinyin.svg
 %%DATADIR%%/icons/simp-chinese.svg
 %%DATADIR%%/icons/trad-chinese.svg
+%%DATADIR%%/network.txt
+%%DATADIR%%/setup/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/setup/__pycache__/dicttreeview%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/dicttreeview%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/setup/__pycache__/keyboardshortcut%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/keyboardshortcut%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/setup/__pycache__/main2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/main2%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/setup/__pycache__/shortcuteditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/shortcuteditor%%PYTHON_EXT_SUFFIX%%.pyc
 %%DATADIR%%/setup/config.py
-%%DATADIR%%/setup/config.pyc
-%%DATADIR%%/setup/config.pyo
 %%DATADIR%%/setup/dicttreeview.py
-%%DATADIR%%/setup/dicttreeview.pyc
-%%DATADIR%%/setup/dicttreeview.pyo
 %%DATADIR%%/setup/ibus-libpinyin-preferences.ui
 %%DATADIR%%/setup/keyboardshortcut.py
-%%DATADIR%%/setup/keyboardshortcut.pyc
-%%DATADIR%%/setup/keyboardshortcut.pyo
 %%DATADIR%%/setup/main2.py
-%%DATADIR%%/setup/main2.pyc
-%%DATADIR%%/setup/main2.pyo
 %%DATADIR%%/setup/shortcuteditor.py
-%%DATADIR%%/setup/shortcuteditor.pyc
-%%DATADIR%%/setup/shortcuteditor.pyo
 share/ibus/component/libpinyin.xml
+%%NLS%%share/locale/ca/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/si/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus-libpinyin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus-libpinyin.mo
+share/metainfo/libpinyin.appdata.xml