diff options
author | obache <obache@pkgsrc.org> | 2013-12-28 04:59:36 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2013-12-28 04:59:36 +0000 |
commit | 29e6e2e1ecc285306f78188dfb664c653b03b1c2 (patch) | |
tree | 3ea84d5bec25a4f9484651fcfb969a6608404c08 /inputmethod | |
parent | 36e6d5083d87d0078bee24cf4d731aad74b5b0cf (diff) | |
download | pkgsrc-29e6e2e1ecc285306f78188dfb664c653b03b1c2.tar.gz |
Update ibus-chewing to 1.4.4.
PRJ_VER=1.4.4
SUMMARY=Fixed RHBZ 842856, 1027030; Added translations:fr_FR, ja_JP, ko_KR
REDHAT_BUGZILLA=842856, 1027030
[Changes]
- Resolves Bug 842856 - ibus-chewing 1.4.3-1 not built with $RPM_OPT_FLAGS
- Resolves Bug 1027030 - CVE-2013-4509 ibus-chewing: ibus: visible
password entry flaw [fedora-all]
Thanks czchen for the GitHub pull request 39.
- Added translations: fr_FR, ja_JP, ko_KR
- Adopt cmake-fedora-1.2.0
Diffstat (limited to 'inputmethod')
-rw-r--r-- | inputmethod/ibus-chewing/Makefile | 7 | ||||
-rw-r--r-- | inputmethod/ibus-chewing/PLIST | 6 | ||||
-rw-r--r-- | inputmethod/ibus-chewing/distinfo | 12 | ||||
-rw-r--r-- | inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake | 17 | ||||
-rw-r--r-- | inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake | 20 | ||||
-rw-r--r-- | inputmethod/ibus-chewing/patches/patch-po_zh__CN.po | 21 |
6 files changed, 62 insertions, 21 deletions
diff --git a/inputmethod/ibus-chewing/Makefile b/inputmethod/ibus-chewing/Makefile index ae4f6f61131..a3276c638a6 100644 --- a/inputmethod/ibus-chewing/Makefile +++ b/inputmethod/ibus-chewing/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2013/10/23 12:12:30 obache Exp $ +# $NetBSD: Makefile,v 1.33 2013/12/28 04:59:36 obache Exp $ # -DISTNAME= ibus-chewing-1.4.3-Source +DISTNAME= ibus-chewing-1.4.4-Source PKGNAME= ${DISTNAME:S/-Source//} -PKGREVISION= 7 CATEGORIES= inputmethod chinese MASTER_SITES= http://ibus.googlecode.com/files/ @@ -22,7 +21,7 @@ TOOLS_NOOP+= msgmerge xgettext GCONF_SCHEMAS= ibus-chewing.schemas CMAKE_ARGS+= -DLIBEXEC_DIR=${PREFIX}/libexec -CMAKE_ARGS+= -DGCONF_SCHEMAS_INSTALLED_DIR=${GCONF_SCHEMAS_DIR} +CMAKE_ARGS+= -DGCONF_SCHEMAS_INSTALLED_DIR:PATH=${GCONF_SCHEMAS_DIR} .include "../../devel/GConf/schemas.mk" .include "../../inputmethod/ibus/buildlink3.mk" diff --git a/inputmethod/ibus-chewing/PLIST b/inputmethod/ibus-chewing/PLIST index 5b20c7411bc..ab727fd844d 100644 --- a/inputmethod/ibus-chewing/PLIST +++ b/inputmethod/ibus-chewing/PLIST @@ -1,15 +1,17 @@ -@comment $NetBSD: PLIST,v 1.2 2010/12/03 08:56:39 obache Exp $ +@comment $NetBSD: PLIST,v 1.3 2013/12/28 04:59:36 obache Exp $ libexec/ibus-engine-chewing share/doc/${PKGNAME}/AUTHORS share/doc/${PKGNAME}/COPYING share/doc/${PKGNAME}/ChangeLog share/doc/${PKGNAME}/README -share/doc/${PKGNAME}/RELEASE-NOTES.txt share/doc/${PKGNAME}/USER-GUIDE share/gconf/schemas/ibus-chewing.schemas share/ibus-chewing/icons/ibus-chewing-orig.png share/ibus-chewing/icons/ibus-chewing.png share/ibus-chewing/icons/settings.png share/ibus/component/chewing.xml +share/locale/fr_FR/LC_MESSAGES/ibus-chewing.mo +share/locale/ja_JP/LC_MESSAGES/ibus-chewing.mo +share/locale/ko_KR/LC_MESSAGES/ibus-chewing.mo share/locale/zh_CN/LC_MESSAGES/ibus-chewing.mo share/locale/zh_TW/LC_MESSAGES/ibus-chewing.mo diff --git a/inputmethod/ibus-chewing/distinfo b/inputmethod/ibus-chewing/distinfo index 491c78e6b05..545457930ee 100644 --- a/inputmethod/ibus-chewing/distinfo +++ b/inputmethod/ibus-chewing/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.12 2013/10/08 12:06:23 obache Exp $ +$NetBSD: distinfo,v 1.13 2013/12/28 04:59:36 obache Exp $ -SHA1 (ibus-chewing-1.4.3-Source.tar.gz) = 82ec86daf2b7f3de88410ec01c9f41db0184f91e -RMD160 (ibus-chewing-1.4.3-Source.tar.gz) = b08e2f0a34c0168a3b69c6273ac614f81fdb2d0f -Size (ibus-chewing-1.4.3-Source.tar.gz) = 84023 bytes +SHA1 (ibus-chewing-1.4.4-Source.tar.gz) = a7b653737f69881b9ba33fc238ad52a5a550358b +RMD160 (ibus-chewing-1.4.4-Source.tar.gz) = 9957af85797e98dc985055ffb6003180696f0cdc +Size (ibus-chewing-1.4.4-Source.tar.gz) = 100601 bytes SHA1 (patch-Modules_DateTimeFormat.cmake) = 588068914de5db765c1c5d1a623e3b73f720a64f SHA1 (patch-Modules_ManageEnvironment.cmake) = 333c7aa542d0555c7bb9cd3913e73a205c0dea94 -SHA1 (patch-Modules_ManageTranslation.cmake) = c5d94a9a7b897aaf932922b2b06e2a7f7f4e234d +SHA1 (patch-Modules_ManageGConf.cmake) = 54e0059fbbea29add90740222d8b7dc81eb6f63f +SHA1 (patch-Modules_ManageTranslation.cmake) = 5fd818a2a089eb9885fc749a60ded8e478f6be64 +SHA1 (patch-po_zh__CN.po) = 76edc659eadd2eb175001b8d6e1635e45ab55141 SHA1 (patch-src_generate-gconf-schemas.c) = 8800a1ab67dce1848dc516e26c38cece46b9ffab SHA1 (patch-src_main.c) = cd160807386097de5bee3e24f8bbaae3c420d2d5 diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake new file mode 100644 index 00000000000..2deaa12f3ba --- /dev/null +++ b/inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake @@ -0,0 +1,17 @@ +$NetBSD: patch-Modules_ManageGConf.cmake,v 1.1 2013/12/28 04:59:36 obache Exp $ + +* Honor GCONF_SCHEMAS_INSTALLED_DIR as document + +--- Modules/ManageGConf.cmake.orig 2013-12-17 09:08:18.000000000 +0000 ++++ Modules/ManageGConf.cmake +@@ -60,8 +60,8 @@ IF(NOT DEFINED _MANAGE_GCONF_CMAKE_) + COMMENT "Installing schemas" + ) + +- MANAGE_FILE_INSTALL(SYSCONF ${GCONF_SCHEMAS_FILE} +- DEST_SUBDIR "gconf/schemas") ++ INSTALL(FILES ${GCONF_SCHEMAS_FILE} ++ DESTINATION "${GCONF_SCHEMAS_INSTALLED_DIR}") + ENDIF(NOT DEFINED _MANAGE_GCONF_CMAKE_) + + diff --git a/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake b/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake index c99439dfc97..0d5cbf5fee7 100644 --- a/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake +++ b/inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake @@ -1,15 +1,15 @@ -$NetBSD: patch-Modules_ManageTranslation.cmake,v 1.2 2013/10/08 12:06:23 obache Exp $ +$NetBSD: patch-Modules_ManageTranslation.cmake,v 1.3 2013/12/28 04:59:36 obache Exp $ * PKGLOCALEDIR support ---- Modules/ManageTranslation.cmake.orig 2012-11-26 07:37:40.000000000 +0000 +--- Modules/ManageTranslation.cmake.orig 2013-12-17 15:57:40.000000000 +0000 +++ Modules/ManageTranslation.cmake -@@ -198,7 +198,7 @@ IF(NOT DEFINED _MANAGE_TRANSLATION_CMAKE +@@ -199,7 +199,7 @@ IF(NOT DEFINED _MANAGE_TRANSLATION_CMAKE + ## No need to use MANAGE_FILE_INSTALL + ## As this will handle by rpmbuild + INSTALL(FILES ${_gmoFile} DESTINATION +- ${DATA_DIR}/locale/${_locale}/LC_MESSAGES ++ ${CMAKE_INSTALL_LOCALEDIR}/${_locale}/LC_MESSAGES + RENAME ${_opt_POTFILE_NAME}.mo ) - - #MESSAGE("_absPoFile=${_absPoFile} _absPotDir=${_absPotDir} _lang=${_lang} curr_bin=${CMAKE_CURRENT_BINARY_DIR}") -- INSTALL(FILES ${_absGmoFile} DESTINATION share/locale/${_locale}/LC_MESSAGES RENAME ${_potBasename}.mo) -+ INSTALL(FILES ${_absGmoFile} DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${_locale}/LC_MESSAGES RENAME ${_potBasename}.mo) - LIST(APPEND _absGmoFileList ${_absGmoFile}) - LIST(APPEND _absPoFileList ${_absPoFile}) - ENDFOREACH(_locale ${_localeList}) + ENDFOREACH(_locale ${_opt_LOCALES}) diff --git a/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po b/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po new file mode 100644 index 00000000000..e58fe4677a6 --- /dev/null +++ b/inputmethod/ibus-chewing/patches/patch-po_zh__CN.po @@ -0,0 +1,21 @@ +$NetBSD: patch-po_zh__CN.po,v 1.1 2013/12/28 04:59:36 obache Exp $ + +* fixes initial default value + +--- po/zh_CN.po.orig 2013-12-16 16:31:12.000000000 +0000 ++++ po/zh_CN.po +@@ -4,12 +4,12 @@ + # Peng Huang <shawn.p.huang@gmail.com>, 2008. + # leahliu <lliu@redhat.com>, 2012. #zanata + msgid "" +-msgstr "Project-Id-Version: PACKAGE VERSION\n" ++msgstr "Project-Id-Version: ibus-chewing 1.4.4\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2013-12-17 02:25+1000\n" + "PO-Revision-Date: 2012-11-28 08:19-0500\n" + "Last-Translator: leahliu <lliu@redhat.com>\n" +- "Language-Team: LANGUAGE <LL@li.org>\n" ++ "Language-Team: Simplfied Chinese\n" + "Language: zh-Hans-CN\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" |