Skip to content

Commit

Permalink
Update ibus-chewing to 1.4.0
Browse files Browse the repository at this point in the history
[Changes]
- Merge pull request #13 from hiroshiyui to Fix wrong data type conversion
- Fixed: Google Issue 1079: Use shift key to switch to English mode in ibus-chewing
	Also list as GitHub pull request #17
- Fixed: Google Issue 1089: Ibus-chewing cause window flicker when compiz enabled
- Fixed: Google Issue 1329, Github Issue 3: Merge with buganini at gmail.com
- Fixed: Google Issue 1351: ibus-chewing 1.3.10 mistakenly send uncommitted charactor.
- Fixed: Google Issue 1374: ibus-chewing: cannot save the preference with gnomeshell
- Fixed: Google Issue 1427: ibus-chewing-1.3.10 is not compatible with ibus-1.4.0 and higher
        Also list as GitHub pull request #16
- Fixed: GitHub Issue 5: Word missing when with libchewing-0.3.3 and  ibus-chewing 1.3.10
	Also list as GitHub pull request #15
- Fixed: Launchpad bug: 1014456 bus-chewing deletes characters if too many of them are entered
	Also list as GitHub pull request #19
  • Loading branch information
obache committed Aug 13, 2012
1 parent 1564557 commit 564387f
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 77 deletions.
18 changes: 5 additions & 13 deletions inputmethod/ibus-chewing/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.14 2012/06/14 07:45:12 sbd Exp $
# $NetBSD: Makefile,v 1.15 2012/08/13 11:50:45 obache Exp $
#

DISTNAME= ibus-chewing-1.3.10-Source
DISTNAME= ibus-chewing-1.4.0-Source
PKGNAME= ${DISTNAME:S/-Source//}
PKGREVISION= 4
CATEGORIES= inputmethod chinese
MASTER_SITES= http://ibus.googlecode.com/files/

Expand All @@ -14,7 +13,6 @@ LICENSE= gnu-gpl-v2

PKG_DESTDIR_SUPPORT= user-destdir

BUILD_DEPENDS+= cmake-fedora-[0-9]*:../../devel/cmake-fedora
BUILD_DEPENDS+= gob2-[0-9]*:../../devel/gob2

USE_CMAKE= yes
Expand All @@ -23,7 +21,7 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgmerge pkg-config

SUBST_CLASSES+= msgctxt
SUBST_STAGE.msgctxt= post-extract
SUBST_STAGE.msgctxt= post-patch
SUBST_FILES.msgctxt= po/*.po po/*.pot
SUBST_FILTER_CMD.msgctxt= ${STRIP_CMD.${MSGFMT_STRIP_MSGCTXT}}
STRIP_CMD.yes= ${AWK} -f ${PKGSRCDIR}/mk/tools/msgfmt-msgctxt.awk
Expand All @@ -32,15 +30,9 @@ STRIP_CMD.no= ${CAT}
GCONF_SCHEMAS= ibus-chewing.schemas
CMAKE_ARGS+= -DGCONF_SCHEMAS_INSTALLED_DIR=${GCONF_SCHEMAS_DIR}

# missing in archive
post-extract:
find ${WRKDIR} -type d -name PaxHeader | xargs rm -rf

# avoid regen files
post-patch:
touch -r ${WRKSRC}/src/IBusChewingEngine-input-events.c.orig \
${WRKSRC}/src/IBusChewingEngine-input-events.c
touch -r ${WRKSRC}/src/IBusChewingEngine.gob.orig \
${WRKSRC}/src/IBusChewingEngine.gob
${TOUCH} ${WRKSRC}/po/ibus-chewing.pot

.include "../../devel/GConf/schemas.mk"
.include "../../inputmethod/ibus/buildlink3.mk"
Expand Down
12 changes: 6 additions & 6 deletions inputmethod/ibus-chewing/distinfo
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.6 2012/04/22 14:09:10 obache Exp $
$NetBSD: distinfo,v 1.7 2012/08/13 11:50:45 obache Exp $

SHA1 (ibus-chewing-1.3.10-Source.tar.gz) = e9f92370c1ad99d5076b4e288704fadb759928be
RMD160 (ibus-chewing-1.3.10-Source.tar.gz) = 84d4167a0d2c4019f165280cabea2afeaaee4464
Size (ibus-chewing-1.3.10-Source.tar.gz) = 75365 bytes
SHA1 (patch-src_IBusChewingEngine-input-events.c) = 7ebb4869bee3068814bb3fa6c195a6f88e481ed3
SHA1 (patch-src_IBusChewingEngine.gob) = 5b92bbdb7e79252eb5b166f2d5eccc5c076e06e1
SHA1 (ibus-chewing-1.4.0-Source.tar.gz) = 18023ce3269cfde75775e3335359d0dc60118679
RMD160 (ibus-chewing-1.4.0-Source.tar.gz) = 3d94bcf3fcc34c0ae5d930151256cf10c248ed15
Size (ibus-chewing-1.4.0-Source.tar.gz) = 83426 bytes
SHA1 (patch-Modules_DateTimeFormat.cmake) = 588068914de5db765c1c5d1a623e3b73f720a64f
SHA1 (patch-Modules_ManageVersion.cmake) = baf2677c8bdb4843eca035c78012bc7a8666c3f5
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$NetBSD: patch-Modules_DateTimeFormat.cmake,v 1.1 2012/08/13 11:50:45 obache Exp $

* -u is much portable than --utc.

--- Modules/DateTimeFormat.cmake.orig 2012-07-22 19:33:19.000000000 +0000
+++ Modules/DateTimeFormat.cmake
@@ -28,7 +28,7 @@ IF(NOT DEFINED _DATE_TIME_FORMAT_CMAKE_)
IF(_locale)
SET(ENV{LC_ALL} ${_locale})
ENDIF(_locale)
- COMMAND_OUTPUT_TO_VARIABLE(${date_var} date --utc "${format}")
+ COMMAND_OUTPUT_TO_VARIABLE(${date_var} date -u "${format}")
ENDMACRO(TODAY date_var format)

TODAY(TODAY_CHANGELOG "+%a %b %d %Y" "C")
28 changes: 28 additions & 0 deletions inputmethod/ibus-chewing/patches/patch-Modules_ManageVersion.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
$NetBSD: patch-Modules_ManageVersion.cmake,v 1.1 2012/08/13 11:50:45 obache Exp $

* No need to remove CMakeCache.txt when doing update
http://git.fedorahosted.org/cgit/cmake-fedora.git/commit/Modules/ManageVersion.cmake?id=80f67e1bf0eb8e704d333a7999f7b4713e88a44c

--- Modules/ManageVersion.cmake.orig 2012-07-22 19:33:19.000000000 +0000
+++ Modules/ManageVersion.cmake
@@ -118,18 +118,14 @@ IF(NOT DEFINED _MANAGE_VERSION_CMAKE_)
SET(CMAKE_CACHE_TXT "${CMAKE_BINARY_DIR}/CMakeCache.txt")

ADD_CUSTOM_COMMAND(OUTPUT ${CHANGELOG_FILE}
- COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CACHE_TXT}
COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR}
DEPENDS ${RELEASE_NOTES_FILE} ${CHANGELOG_PREV_FILE}
- COMMENT "ChangeLog is older than ${RELEASE_NOTES_FILE}. Rebuilding"
+ COMMENT "Building ${CHANGELOG_FILE}"
VERBATIM
)

ADD_CUSTOM_TARGET(changelog ALL
- COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CACHE_TXT}
- COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR}
- DEPENDS ${RELEASE_NOTES_FILE} ${CHANGELOG_PREV_FILE}
- COMMENT "Building ChangeLog"
+ DEPENDS ${CHANGELOG_FILE}
VERBATIM
)

This file was deleted.

30 changes: 0 additions & 30 deletions inputmethod/ibus-chewing/patches/patch-src_IBusChewingEngine.gob

This file was deleted.

0 comments on commit 564387f

Please sign in to comment.