Update ibus-table-chinese to 1.3.0.20101201.
* Fri Dec 03 2010 Ding-Yi Chen <dchen@redhat.com> - 1.3.0.20101201 - Support out-of-source build - Remove ibus-table-chinese-all * Sat Nov 27 2010 Ding-Yi Chen <dchen@redhat.com> - 1.3.0.20101126 - Split into subpackage - Use cmake instead of autotool
This commit is contained in:
parent
29be8dab33
commit
1230795305
6 changed files with 105 additions and 50 deletions
|
@ -1,7 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.1.1.1 2010/08/07 02:18:29 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2010/12/03 12:14:29 obache Exp $
|
||||
#
|
||||
|
||||
DISTNAME= ibus-table-chinese-1.3.0.20100527
|
||||
DISTNAME= ibus-table-chinese-1.3.0.20101201-Source
|
||||
PKGNAME= ${DISTNAME:S/-Source//}
|
||||
CATEGORIES= inputmethod chinese
|
||||
MASTER_SITES= http://ibus.googlecode.com/files/
|
||||
|
||||
|
@ -12,12 +13,22 @@ LICENSE= gnu-gpl-v3
|
|||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LANGUAGES= # none
|
||||
USE_CMAKE= yes
|
||||
USE_LANGUAGES= c c++
|
||||
USE_TOOLS+= pkg-config
|
||||
|
||||
CONFIGURE_ARGS+= --enable-extra-phrases
|
||||
CHECK_BUILTIN.iconv:= yes
|
||||
.include "../../converters/libiconv/builtin.mk"
|
||||
CHECK_BUILTIN.iconv:= no
|
||||
.if ${ICONV_TYPE} != "gnu" || !exists(/usr/bin/iconv)
|
||||
BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
|
||||
FIND_PREFIX:= ICONV_PREFIX=libiconv
|
||||
.include "../../mk/find-prefix.mk"
|
||||
.else
|
||||
ICONV_PREFIX=/usr
|
||||
.endif
|
||||
|
||||
CMAKE_ARGS+= -DICONV_CMD:PATH=${ICONV_PREFIX}/bin/iconv
|
||||
|
||||
.include "../../inputmethod/ibus-table-extraphrase/buildlink3.mk"
|
||||
.include "../../inputmethod/ibus-table/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,11 @@
|
|||
@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/07 02:18:29 obache Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2010/12/03 12:14:29 obache Exp $
|
||||
share/doc/${PKGNAME}/AUTHORS
|
||||
share/doc/${PKGNAME}/COPYING
|
||||
share/doc/${PKGNAME}/ChangeLog
|
||||
share/doc/${PKGNAME}/README
|
||||
share/doc/${PKGNAME}/RELEASE-NOTES.txt
|
||||
share/ibus-table/icons/array30-big.png
|
||||
share/ibus-table/icons/array30.png
|
||||
share/ibus-table/icons/cangjie-big.png
|
||||
share/ibus-table/icons/cangjie3.svg
|
||||
share/ibus-table/icons/cangjie5.svg
|
||||
|
@ -14,21 +21,19 @@ share/ibus-table/icons/quick5.png
|
|||
share/ibus-table/icons/scj6.svg
|
||||
share/ibus-table/icons/stroke5.png
|
||||
share/ibus-table/icons/wu.png
|
||||
share/ibus-table/icons/wubi86.svg
|
||||
share/ibus-table/icons/xinhua.png
|
||||
share/ibus-table/icons/wubi-haifeng86.svg
|
||||
share/ibus-table/icons/wubi-jidian86.svg
|
||||
share/ibus-table/icons/yong.png
|
||||
share/ibus-table/icons/zhengma.svg
|
||||
share/ibus-table/icons/zhuyin-big.png
|
||||
share/ibus-table/icons/zhuyin.png
|
||||
share/ibus-table/icons/ziranma.png
|
||||
share/ibus-table/tables/array30-big.db
|
||||
share/ibus-table/tables/array30.db
|
||||
share/ibus-table/tables/cangjie-big.db
|
||||
share/ibus-table/tables/cangjie3.db
|
||||
share/ibus-table/tables/cangjie5.db
|
||||
share/ibus-table/tables/cantonese.db
|
||||
share/ibus-table/tables/cantonhk.db
|
||||
share/ibus-table/tables/easy-big.db
|
||||
share/ibus-table/tables/erbi-qs.db
|
||||
share/ibus-table/tables/erbi.db
|
||||
share/ibus-table/tables/erbi_qs.db
|
||||
share/ibus-table/tables/jyutping.db
|
||||
share/ibus-table/tables/quick-classic.db
|
||||
share/ibus-table/tables/quick3.db
|
||||
|
@ -36,10 +41,6 @@ share/ibus-table/tables/quick5.db
|
|||
share/ibus-table/tables/scj6.db
|
||||
share/ibus-table/tables/stroke5.db
|
||||
share/ibus-table/tables/wu.db
|
||||
share/ibus-table/tables/wubi86.db
|
||||
share/ibus-table/tables/xinhua-ibus.db
|
||||
share/ibus-table/tables/yong-ibus.db
|
||||
share/ibus-table/tables/zhengma.db
|
||||
share/ibus-table/tables/zhuyin-big.db
|
||||
share/ibus-table/tables/zhuyin.db
|
||||
share/ibus-table/tables/ziranma.db
|
||||
share/ibus-table/tables/wubi-haifeng86.db
|
||||
share/ibus-table/tables/wubi-jidian86.db
|
||||
share/ibus-table/tables/yong.db
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.1.1.1 2010/08/07 02:18:29 obache Exp $
|
||||
$NetBSD: distinfo,v 1.2 2010/12/03 12:14:29 obache Exp $
|
||||
|
||||
SHA1 (ibus-table-chinese-1.3.0.20100527.tar.gz) = ade7c69d6f134abab1f3773c969498944c12e453
|
||||
RMD160 (ibus-table-chinese-1.3.0.20100527.tar.gz) = b66ba84b76e40281b3855845fd89425b33e0a20e
|
||||
Size (ibus-table-chinese-1.3.0.20100527.tar.gz) = 7579715 bytes
|
||||
SHA1 (patch-aa) = fa88bd55629f70cd9fb4d5f598a346a43219cad8
|
||||
SHA1 (ibus-table-chinese-1.3.0.20101201-Source.tar.gz) = ebc3505a28f12c9a84c3ef36c4aaab750965592c
|
||||
RMD160 (ibus-table-chinese-1.3.0.20101201-Source.tar.gz) = 88bcd8c4efaee4847fa5faa0294baa03bf915559
|
||||
Size (ibus-table-chinese-1.3.0.20101201-Source.tar.gz) = 10520832 bytes
|
||||
SHA1 (patch-ab) = 17180e36a68b4c54ec2388adfb43f781762dec04
|
||||
SHA1 (patch-ac) = 565bbc4a117e753571c66404949b4ec54559594a
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2010/08/07 02:18:29 obache Exp $
|
||||
|
||||
portability fix
|
||||
|
||||
--- configure.orig 2010-05-27 08:17:37.000000000 +0000
|
||||
+++ configure
|
||||
@@ -2959,7 +2959,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
- if test x"$enable_extra_phrases" == x"yes"; then
|
||||
+ if test x"$enable_extra_phrases" = x"yes"; then
|
||||
IBUS_TABLE_EXTRA_PHRASES_TRUE=
|
||||
IBUS_TABLE_EXTRA_PHRASES_FALSE='#'
|
||||
else
|
||||
@@ -2969,7 +2969,7 @@ fi
|
||||
|
||||
|
||||
# check for ibus-table-extraphrase, if we need it.
|
||||
-if test x"$enable_extra_phrases" == x"yes"; then
|
||||
+if test x"$enable_extra_phrases" = x"yes"; then
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXTRA_PHRASE" >&5
|
35
inputmethod/ibus-table-chinese/patches/patch-ab
Normal file
35
inputmethod/ibus-table-chinese/patches/patch-ab
Normal file
|
@ -0,0 +1,35 @@
|
|||
$NetBSD: patch-ab,v 1.1 2010/12/03 12:14:29 obache Exp $
|
||||
|
||||
--- tables/wubi-haifeng/convertTable.sh.orig 2010-12-02 23:22:54.000000000 +0000
|
||||
+++ tables/wubi-haifeng/convertTable.sh
|
||||
@@ -18,10 +18,10 @@ function append_freq(){
|
||||
ch=`echo $data | $AWK '{print $3}'`
|
||||
freqOrig=`echo $data | $AWK '{print $1}'`
|
||||
# echo "lastSeq=$lastSeq seq=$seq ch=$ch freqOrig=$freqOrig"
|
||||
- if [ "$freqOrig" == "" ];then
|
||||
+ if [ "$freqOrig" = "" ];then
|
||||
freqOrig=0
|
||||
fi
|
||||
- if [ "$seq" == "$lastSeq" ];then
|
||||
+ if [ "$seq" = "$lastSeq" ];then
|
||||
if [ $lastFreq -le $freqOrig ];then
|
||||
freq=$((lastFreq-1))
|
||||
else
|
||||
@@ -39,7 +39,7 @@ function append_freq(){
|
||||
fi
|
||||
count=$((count+1))
|
||||
countMod=$((count % 1000))
|
||||
- if [ "$countMod" == "0" ];then
|
||||
+ if [ "$countMod" = "0" ];then
|
||||
echo -e "$count\telements processed" > /dev/stderr
|
||||
fi
|
||||
done
|
||||
@@ -48,7 +48,7 @@ function append_freq(){
|
||||
|
||||
function parse(){
|
||||
baseFreq=100;
|
||||
- if [ "$1" == "-b" ];then
|
||||
+ if [ "$1" = "-b" ];then
|
||||
baseFreq=$2
|
||||
shift 2
|
||||
fi
|
31
inputmethod/ibus-table-chinese/patches/patch-ac
Normal file
31
inputmethod/ibus-table-chinese/patches/patch-ac
Normal file
|
@ -0,0 +1,31 @@
|
|||
$NetBSD: patch-ac,v 1.1 2010/12/03 12:14:29 obache Exp $
|
||||
|
||||
--- tables/CMakeLists.txt.orig 2010-12-02 23:22:54.000000000 +0000
|
||||
+++ tables/CMakeLists.txt
|
||||
@@ -66,7 +66,7 @@ MACRO(CONVERT_ENCODING workDir outputFil
|
||||
ENDIF(_arg STREQUAL "GENERATE_FREQ")
|
||||
ENDFOREACH(_arg ${ARGN})
|
||||
|
||||
- EXECUTE_PROCESS(COMMAND ${ICONV_CMD} -f ${fromEncoding} -t UTF8 "${outputFile}.tmp"
|
||||
+ EXECUTE_PROCESS(COMMAND ${ICONV_CMD} -f ${fromEncoding} -t UTF-8 "${outputFile}.tmp"
|
||||
COMMAND sed -e "s/\r//"
|
||||
COMMAND ${AWK_CMD} "{print tolower($0)}"
|
||||
COMMAND sort
|
||||
@@ -91,7 +91,7 @@ ENDMACRO(CONVERT_ENCODING CONVERT_ENCODI
|
||||
#
|
||||
|
||||
# Array
|
||||
-CONVERT_ENCODING(array array30_27489.utf8 UTF16 array30_27489.txt GENERATE_FREQ)
|
||||
+CONVERT_ENCODING(array array30_27489.utf8 UTF-16 array30_27489.txt GENERATE_FREQ)
|
||||
ADD_CUSTOM_COMMAND(OUTPUT array/array30.txt
|
||||
COMMAND cat array30.head.common array30.head array30_27489.utf8 array30.tail > array30.txt
|
||||
DEPENDS array/array30.head.common
|
||||
@@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(OUTPUT array/array30.
|
||||
VERBATIM
|
||||
)
|
||||
|
||||
-CONVERT_ENCODING(array array30-big.utf8 UTF16 array30_27489.txt array30_ExtB.txt GENERATE_FREQ)
|
||||
+CONVERT_ENCODING(array array30-big.utf8 UTF-16 array30_27489.txt array30_ExtB.txt GENERATE_FREQ)
|
||||
ADD_CUSTOM_COMMAND(OUTPUT array/array30-big.txt
|
||||
COMMAND cat array30.head.common array30-big.head array30-big.utf8 array30.tail > array30-big.txt
|
||||
DEPENDS array/array30.head.common
|
Loading…
Reference in a new issue