From c5b5bc3d14fb9959513fe511777779a731d7d9ce Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 20 Feb 2021 21:24:48 +0000 Subject: [PATCH] ibus-chewing: Update to 1.5.1 Changelog: PRJ_VER=1.5.1 SUMMARY=Fix the Ctrl, Numpad and selection keys handling REDHAT_BUGZILLA=1337185 [Changes] - Enhancement: - Fix: + GH issue #73: Ctrl, Alt, Ins causes the pre-edit duplicate commit + GH issue #74: Failed to clean the PreEdit when changing input focus + GH issue #79: Failed to input space when "space-as-selection" + GH issue #87 Modify dropdown menu for selecting keys + GH issue #88 Numpad should be able to select + RHBZ #1337185 - Cannot add phrases with Ctrl A.k.a GH issue #63 Thank for contribution from hiunnhue - Acknowledge: + Obata Akio contributed pull request 71, 72, 73 + hiunnhue contributed pull request 75, 76, 77, 78, 80, 81, 82, 83, 84, 86, 87, 90, 91, 92, 94 + hiunnhue fixed issue 73, 74, 79, 87, 88, 90, 91, 92, 94 --- inputmethod/ibus-chewing/Makefile | 14 ++++------ inputmethod/ibus-chewing/PLIST | 10 ++++++- inputmethod/ibus-chewing/distinfo | 14 +++++----- .../ibus-chewing/patches/patch-CMakeLists.txt | 15 ----------- .../patch-Modules_ManageTranslation.cmake | 26 ------------------- .../ibus-chewing/patches/patch-po_zh__CN.po | 6 ++--- 6 files changed, 23 insertions(+), 62 deletions(-) delete mode 100644 inputmethod/ibus-chewing/patches/patch-CMakeLists.txt delete mode 100644 inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake diff --git a/inputmethod/ibus-chewing/Makefile b/inputmethod/ibus-chewing/Makefile index 7a2c8a8e9933..da297590753f 100644 --- a/inputmethod/ibus-chewing/Makefile +++ b/inputmethod/ibus-chewing/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.68 2020/11/05 09:08:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.69 2021/02/20 21:24:48 ryoon Exp $ # -DISTNAME= ibus-chewing-1.4.12-Source +GITHUB_PROJECT= ibus-chewing +GITHUB_RELEASE= ${PKGVERSION_NOREV} +DISTNAME= ibus-chewing-1.5.1-Source PKGNAME= ${DISTNAME:S/-Source//} -PKGREVISION= 26 CATEGORIES= inputmethod chinese -MASTER_SITES= https://github.com/definite/ibus-chewing/releases/download/${PKGVERSION_NOREV}/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=definite/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/ibus/ibus/wiki @@ -22,11 +23,6 @@ TOOLS_NOOP+= msgmerge xgettext BUILD_TARGET= all translations -SUBST_CLASSES+= libexecdir -SUBST_STAGE.libexecdir= post-configure -SUBST_FILES.libexecdir= data/ibus-setup-chewing.desktop -SUBST_SED.libexecdir= -e 's,/usr/libexec/,${PREFIX}/libexec/,g' - TEST_TARGET= test .include "../../devel/glib2/schemas.mk" diff --git a/inputmethod/ibus-chewing/PLIST b/inputmethod/ibus-chewing/PLIST index 375511f9a5df..2ae3900fce85 100644 --- a/inputmethod/ibus-chewing/PLIST +++ b/inputmethod/ibus-chewing/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2014/12/13 06:33:15 obache Exp $ +@comment $NetBSD: PLIST,v 1.6 2021/02/20 21:24:48 ryoon Exp $ libexec/ibus-engine-chewing libexec/ibus-setup-chewing share/applications/ibus-setup-chewing.desktop @@ -8,10 +8,17 @@ share/doc/ibus-chewing/ChangeLog share/doc/ibus-chewing/README share/doc/ibus-chewing/USER-GUIDE share/glib-2.0/schemas/org.freedesktop.IBus.Chewing.gschema.xml +share/ibus-chewing/icons/ibus-chewing-chi-full.svg +share/ibus-chewing/icons/ibus-chewing-chi-half.svg +share/ibus-chewing/icons/ibus-chewing-eng-full.svg +share/ibus-chewing/icons/ibus-chewing-eng-half.svg share/ibus-chewing/icons/ibus-chewing-orig.png +share/ibus-chewing/icons/ibus-chewing-template.svg share/ibus-chewing/icons/ibus-chewing.png share/ibus-chewing/icons/ibus-setup-chewing.png share/ibus/component/chewing.xml +share/locale/ca/LC_MESSAGES/ibus-chewing.mo +share/locale/cs/LC_MESSAGES/ibus-chewing.mo share/locale/de/LC_MESSAGES/ibus-chewing.mo share/locale/es/LC_MESSAGES/ibus-chewing.mo share/locale/fr/LC_MESSAGES/ibus-chewing.mo @@ -19,6 +26,7 @@ share/locale/it/LC_MESSAGES/ibus-chewing.mo share/locale/ja/LC_MESSAGES/ibus-chewing.mo share/locale/ko/LC_MESSAGES/ibus-chewing.mo share/locale/pa/LC_MESSAGES/ibus-chewing.mo +share/locale/pl/LC_MESSAGES/ibus-chewing.mo share/locale/pt_BR/LC_MESSAGES/ibus-chewing.mo share/locale/uk/LC_MESSAGES/ibus-chewing.mo share/locale/zh_CN/LC_MESSAGES/ibus-chewing.mo diff --git a/inputmethod/ibus-chewing/distinfo b/inputmethod/ibus-chewing/distinfo index 31d3dee30b90..818b80334c3f 100644 --- a/inputmethod/ibus-chewing/distinfo +++ b/inputmethod/ibus-chewing/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.18 2015/11/03 22:13:34 agc Exp $ +$NetBSD: distinfo,v 1.19 2021/02/20 21:24:48 ryoon Exp $ -SHA1 (ibus-chewing-1.4.12-Source.tar.gz) = 9d626194459f0ba4d4da4d92dbc6c4d0a856daa6 -RMD160 (ibus-chewing-1.4.12-Source.tar.gz) = fff16cc108c73196870d9fbd2f6b8b366a9e3939 -SHA512 (ibus-chewing-1.4.12-Source.tar.gz) = e83a0889cc58c9b03da0f2abf4fcc1c5e92d4e7137ebd1fcaabae23f7962be80d2cda8c4a0e483ce17b25bd9c215ddcf22b725cc42da3494c3241ccc83143a36 -Size (ibus-chewing-1.4.12-Source.tar.gz) = 159593 bytes -SHA1 (patch-CMakeLists.txt) = 86c9335ba9cbc82163bc49b837a72a0bfa4a8d3c +SHA1 (ibus-chewing-1.5.1-Source.tar.gz) = 5a6f2b7aaebce330f9a390d492d5fbd1267c9c98 +RMD160 (ibus-chewing-1.5.1-Source.tar.gz) = eac9bf1b23e026359c38524ca937034629960f5b +SHA512 (ibus-chewing-1.5.1-Source.tar.gz) = 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633 +Size (ibus-chewing-1.5.1-Source.tar.gz) = 177044 bytes SHA1 (patch-Modules_ManageEnvironment.cmake) = 213274162dca9e3fb4d54d494908a309b6819e51 SHA1 (patch-Modules_ManageEnvironmentCommon.cmake) = 1d8bb1e91c448df5dc8c7e5b7aa1760bb637a9d0 -SHA1 (patch-Modules_ManageTranslation.cmake) = eb96c2c3610ff15999f504c2211bca5231e384af -SHA1 (patch-po_zh__CN.po) = 158a186e43f013fbd5c62cd70dbc9e0a79375ffc +SHA1 (patch-po_zh__CN.po) = c05a5f6024941a7900529e152f771cc440964531 SHA1 (patch-src_generate-gconf-schemas.c) = e48a546d676f65c83379ed0cd35bd3529b5db4e5 SHA1 (patch-src_generate-gsettings-schemas.c) = 451ad5e9aece6b3436f9d549e4d733e8a7a0f958 SHA1 (patch-src_ibus-setup-chewing.c) = b8526fe2ec87a54c3ed4cc5542a28c401da70d94 diff --git a/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt b/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt deleted file mode 100644 index 46685d2fe2c8..000000000000 --- a/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2014/12/13 06:33:15 obache Exp $ - -* variable name mismatch with fedora-cmake. - ---- CMakeLists.txt.orig 2014-12-11 12:13:51.000000000 +0000 -+++ CMakeLists.txt -@@ -170,7 +170,7 @@ ADD_DEFINITIONS("-DCHEWING_VERSION_MAJOR - ) - - ## In case CHEWING_DATADIR is incorrect --FOREACH(d ${CHEWING_DATADIR} /usr/share/chewing ${CHEWING_LIBDIR}/libchewing) -+FOREACH(d ${CHEWING_chewing_DATADIR} /usr/share/chewing ${CHEWING_LIBDIR}/libchewing) - IF(EXISTS "${d}/symbols.dat") - SET(CHEWING_DATADIR_REAL "${d}" CACHE STRING "CHEWING_DATADIR_REAL") - BREAK() diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake deleted file mode 100644 index 075c9c562570..000000000000 --- a/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-Modules_ManageTranslation.cmake,v 1.4 2014/12/13 06:33:15 obache Exp $ - -* PKGLOCALEDIR support -* `-printf' option of find(1) is not portable. - ---- Modules/ManageTranslation.cmake.orig 2014-10-28 05:05:31.000000000 +0000 -+++ Modules/ManageTranslation.cmake -@@ -353,7 +353,7 @@ FUNCTION(MANAGE_POT_FILE potFile) - - IF(NOT "${moDir}" STREQUAL "") - ## MO file -- SET(_moDir "${DATA_DIR}/locale/${_l}/LC_MESSAGES") -+ SET(_moDir "${LOCALE_DIR}/${_l}/LC_MESSAGES") - SET(_gmoFile "${moDir}/${_l}.gmo") - ADD_CUSTOM_COMMAND(OUTPUT ${_gmoFile} - COMMAND ${MSGFMT_EXECUTABLE} -@@ -393,8 +393,7 @@ FUNCTION(MANAGE_GETTEXT_LOCALES localeLi - ELSE() - ## LOCALES is not specified, detect now - EXECUTE_PROCESS( -- COMMAND find ${poDir} -name "*.po" -printf "%f\n" -- COMMAND sed -e "s/.po//g" -+ COMMAND find ${poDir} -name "*.po" -exec basename {} .po \; - COMMAND sort -u - COMMAND xargs - COMMAND sed -e "s/ /;/g" diff --git a/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po b/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po index 40b0f11826e9..f689bae2eb8d 100644 --- a/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po +++ b/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po @@ -1,8 +1,8 @@ -$NetBSD: patch-po_zh__CN.po,v 1.3 2014/12/13 06:33:15 obache Exp $ +$NetBSD: patch-po_zh__CN.po,v 1.4 2021/02/20 21:24:48 ryoon Exp $ * fixes initial default value ---- po/zh_CN.po.orig 2014-12-11 01:06:43.000000000 +0000 +--- po/zh_CN.po.orig 2016-06-16 03:38:50.000000000 +0000 +++ po/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" @@ -11,5 +11,5 @@ $NetBSD: patch-po_zh__CN.po,v 1.3 2014/12/13 06:33:15 obache Exp $ -"Language-Team: LANGUAGE \n" +"Language-Team: Simplfied Chinese\n" "Language: zh-CN\n" - "X-Generator: Zanata 3.5.1\n" + "X-Generator: Zanata 3.8.4\n" "Plural-Forms: nplurals=1; plural=0\n"