CVS commit: pkgsrc/inputmethod/ibus-table-chinese

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 23 13:33:44 UTC 2022

Modified Files:
        pkgsrc/inputmethod/ibus-table-chinese: Makefile PLIST distinfo
Added Files:
        pkgsrc/inputmethod/ibus-table-chinese/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/inputmethod/ibus-table-chinese/patches: patch-ac
            patch-tables_array_CMakeLists.txt

Log Message:
ibus-table-chinese: update to 1.8.12.

Fixes build.

Release 1.8.12

- Add appdata.xml files
- Convert license tags to SPDX format
- Add .svg icon files for use in appdata.xml files

Release 1.8.11

- Improve punctuation support in jyutping.txt, cantonese.txt, cantonhk.txt, cantonyale.txt
  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/7)
- Improve “improve_jyutping.py” to allow comments in the table
- Update of jyutping.txt for Unicode 15.0.0 final release

Release 1.8.10

- Improve punctuation support in cangjie5.txt, cangjie3.txt, cangjie-big.txt,
  quick5.txt, quick3.txt, quick-classic.txt
  (Resolves: https://github.com/kaio/ibus-table/issues/73)
  (Resolves: https://github.com/mike-fabian/ibus-table/issues/121)

Release 1.8.9

- Add tones to Jyutping.txt table
  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/6)
  Tonal markers according to
  https://github.com/rime/rime-cantonese/blob/main/README-en.md#tonal-markers
  were added:
  1. v: High level, e.g. siv → 詩; High level checked, e.g. sikv → 色
  2. x: Medium rising, e.g. six → 史
  3. q: Medium level, e.g. siq→ 試; Medium level checked, e.g. sekq → 錫
  4. vv: Low falling, e.g. sivv → 時
  5. xx: Low rising, e.g. sixx → 市
  6. qq: Low level, e.g. siqq→ 事; Low level checked, e.g. sikqq → 食

Release 1.8.8

- Add PINYIN_MODE = TRUE to cangjie-big.txt, quick-classic.txt, and erbi.txt
- Make “Traditional Chinese only” the default for quick5
- Improve the quick5.txt table in a similar way the cangjie5.txt
  table was recently improved
  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/4)
- Build outside of the source tree
  (Resolves: https://github.com/mike-fabian/ibus-table-chinese/issues/2)

Release 1.8.7

- Make “Traditional Chinese only” the default for cangjie5
  (Resolves https://github.com/mike-fabian/ibus-table-chinese/issues/2)

Release 1.8.6

- Increase serial number of cangjie5.txt and erbi-qs.txt

Release 1.8.5

- add table_extra tag for auxiliary code
  (Resolves: https://github.com/definite/ibus-table-chinese/pull/18)

Release 1.8.4

- Another improvement for cangjie5.txt
  (Resolves: https://github.com/mike-fabian/ibus-table/issues/87_
- Updated README
  (Includes: https://github.com/definite/ibus-table-chinese/pull/17)
- Correct a misplaced non-alphabetic symbol
  (Includes: https://github.com/definite/ibus-table-chinese/pull/16)
- Simplify CMakeLists.txt to avoid requiring cmake-fedora


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/ibus-table-chinese/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/inputmethod/ibus-table-chinese/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/inputmethod/ibus-table-chinese/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/ibus-table-chinese/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.3 -r0 pkgsrc/inputmethod/ibus-table-chinese/patches/patch-ac
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/inputmethod/ibus-table-chinese/patches/patch-tables_array_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/ibus-table-chinese/Makefile
diff -u pkgsrc/inputmethod/ibus-table-chinese/Makefile:1.16 pkgsrc/inputmethod/ibus-table-chinese/Makefile:1.17
--- pkgsrc/inputmethod/ibus-table-chinese/Makefile:1.16 Thu Sep 22 09:39:25 2022
+++ pkgsrc/inputmethod/ibus-table-chinese/Makefile      Fri Dec 23 13:33:43 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/09/22 09:39:25 adam Exp $
+# $NetBSD: Makefile,v 1.17 2022/12/23 13:33:43 wiz Exp $
 
-DISTNAME=      ibus-table-chinese-1.8.3
+DISTNAME=      ibus-table-chinese-1.8.12
 CATEGORIES=    inputmethod chinese
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=definite/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=mike-fabian/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,19 +13,7 @@ LICENSE=     gnu-gpl-v3
 USE_CMAKE=     yes
 USE_LANGUAGES= # none
 USE_TOOLS+=    pkg-config
-
-BUILD_DEPENDS+=        cmake-fedora>=2.0:../../devel/cmake-fedora
-
-# iconv: unexpected end of file; the last character is incomplete.
-MAKE_JOBS_SAFE=        no
-
-.include "../../mk/bsd.prefs.mk"
-
-# Illegal byte sequence in array30_ExtB.txt
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 050000
-BUILD_DEPENDS+=                libiconv-[0-9]*:../../converters/libiconv
-CMAKE_ARGS+=           -DICONV_CMD:PATH=${LOCALBASE}/bin/iconv
-.endif
+CMAKE_ARGS+=   -DDATA_DIR=${PREFIX}/share
 
 .include "../../inputmethod/ibus-table/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/ibus-table-chinese/PLIST
diff -u pkgsrc/inputmethod/ibus-table-chinese/PLIST:1.5 pkgsrc/inputmethod/ibus-table-chinese/PLIST:1.6
--- pkgsrc/inputmethod/ibus-table-chinese/PLIST:1.5     Thu Sep 22 09:39:25 2022
+++ pkgsrc/inputmethod/ibus-table-chinese/PLIST Fri Dec 23 13:33:43 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/09/22 09:39:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/12/23 13:33:43 wiz Exp $
 share/doc/ibus-table-chinese/AUTHORS
 share/doc/ibus-table-chinese/COPYING
 share/doc/ibus-table-chinese/ChangeLog
@@ -6,24 +6,31 @@ share/doc/ibus-table-chinese/README
 share/ibus-table/icons/array30-big.png
 share/ibus-table/icons/array30.png
 share/ibus-table/icons/cangjie-big.png
+share/ibus-table/icons/cangjie-big.svg
 share/ibus-table/icons/cangjie3.svg
 share/ibus-table/icons/cangjie5.svg
 share/ibus-table/icons/cantonese.png
+share/ibus-table/icons/cantonese.svg
 share/ibus-table/icons/cantonhk.png
 share/ibus-table/icons/cantonyale.png
+share/ibus-table/icons/cantonyale.svg
 share/ibus-table/icons/easy-big.png
 share/ibus-table/icons/erbi-qs.svg
 share/ibus-table/icons/erbi.png
 share/ibus-table/icons/jyutping.png
 share/ibus-table/icons/quick-classic.png
+share/ibus-table/icons/quick-classic.svg
 share/ibus-table/icons/quick3.png
 share/ibus-table/icons/quick5.png
 share/ibus-table/icons/scj6.svg
 share/ibus-table/icons/stroke5.png
+share/ibus-table/icons/stroke5.svg
 share/ibus-table/icons/wu.png
+share/ibus-table/icons/wu.svg
 share/ibus-table/icons/wubi-haifeng86.svg
 share/ibus-table/icons/wubi-jidian86.svg
 share/ibus-table/icons/yong.png
+share/ibus-table/icons/yong.svg
 share/ibus-table/tables/array30-big.db
 share/ibus-table/tables/array30.db
 share/ibus-table/tables/cangjie-big.db

Index: pkgsrc/inputmethod/ibus-table-chinese/distinfo
diff -u pkgsrc/inputmethod/ibus-table-chinese/distinfo:1.13 pkgsrc/inputmethod/ibus-table-chinese/distinfo:1.14
--- pkgsrc/inputmethod/ibus-table-chinese/distinfo:1.13 Thu Sep 22 09:39:25 2022
+++ pkgsrc/inputmethod/ibus-table-chinese/distinfo      Fri Dec 23 13:33:43 2022
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2022/09/22 09:39:25 adam Exp $
+$NetBSD: distinfo,v 1.14 2022/12/23 13:33:43 wiz Exp $
 
-BLAKE2s (ibus-table-chinese-1.8.3.tar.gz) = f7def64d4f38c82ed8e466ab5b07bd191e5be16bf9406d0ca1be33555e44de78
-SHA512 (ibus-table-chinese-1.8.3.tar.gz) = 610455343d9c9bf6577c7fd7aef9435c339c2f23c4d5f7ae2cbbc2366a9eb6a8a124e86621387497cc624e3276bf739b55602355ad41c4127f45f6d85cc5b4dc
-Size (ibus-table-chinese-1.8.3.tar.gz) = 10824912 bytes
+BLAKE2s (ibus-table-chinese-1.8.12.tar.gz) = e0493c9f0dd3f905e19e9440c029f14e1a4f9708e91b03b8cf61f60b9befe721
+SHA512 (ibus-table-chinese-1.8.12.tar.gz) = 418a93709e6e7cd56cb0251fedcce8c3640ccce54d822ff5051491c8b5b1ee7d547cea018019b91c1a091aa5243c347c4c9fdb66992b8dabf12ceb6719300a85
+Size (ibus-table-chinese-1.8.12.tar.gz) = 10856736 bytes
+SHA1 (patch-CMakeLists.txt) = 5b7d91a4c68c2b2f88fd85982265e942f17bab18
 SHA1 (patch-ab) = cd75ce5cbad9610607cfa5f68fec245a139f8b6b
-SHA1 (patch-ac) = 6691cde876c3cfa64c1790294a6660b18f986d03
-SHA1 (patch-tables_array_CMakeLists.txt) = d4c441e74314731305b66843cdadd16e2edd4281

Added files:

Index: pkgsrc/inputmethod/ibus-table-chinese/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/inputmethod/ibus-table-chinese/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Dec 23 13:33:44 2022
+++ pkgsrc/inputmethod/ibus-table-chinese/patches/patch-CMakeLists.txt  Fri Dec 23 13:33:43 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2022/12/23 13:33:43 wiz Exp $
+
+Allow setting installation paths from pkgsrc.
+
+--- CMakeLists.txt.orig        2022-12-13 16:36:17.000000000 +0000
++++ CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.0.0)
+ 
+ # Default CMAKE_INSTALL_PREFIX should be set before PROJECT()
+-SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install dir prefix")
+ 
+ ####################################################################
+ # Project specific information
+@@ -26,7 +25,6 @@ ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "64"
+     SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Library dir")
+ ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "64")
+ SET(LIBEXEC_DIR "${LIB_DIR}" CACHE PATH "LIBEXEC dir")
+-SET(DATA_DIR "/usr/share")
+ 
+ ####################################################################
+ # Building