diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /community/ibus-chewing | |
parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'community/ibus-chewing')
-rw-r--r-- | community/ibus-chewing/PKGBUILD | 25 | ||||
-rw-r--r-- | community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch | 84 |
2 files changed, 96 insertions, 13 deletions
diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index 00d56f991..c677bd4ae 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 56294 2011-10-05 06:10:32Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars@gmail.com> @@ -5,35 +6,33 @@ pkgname=ibus-chewing pkgver=1.3.9.2 -pkgrel=3 +pkgrel=5 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://ibus.googlecode.com' depends=('ibus' 'libchewing' 'libxtst' 'gconf') makedepends=('swig' 'cmake' 'gob2') -install="${pkgname}.install" -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") -md5sums=('8d177d67647944f5d1f9cca0654eaccb') +install=ibus-chewing.install +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz + ibus-chewing-696864-abrt-ibus-1.4.patch) +md5sums=('8d177d67647944f5d1f9cca0654eaccb' + '4bc83c143243a4fc5aa6a6e6fb0a3aa1') build() { - cd ${pkgname}-${pkgver}-Source - + cd "${srcdir}/${pkgname}-${pkgver}-Source" + patch -p1 -i "${srcdir}/ibus-chewing-696864-abrt-ibus-1.4.patch" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/usr/share \ + -DLIBEXEC_DIR=/usr/lib/ibus \ . make } package() { - cd ${pkgname}-${pkgver}-Source - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}-Source" - # check up on http://code.google.com/p/ibus/issues/detail?id=1172 to fix nonstandard path - install -d ${pkgdir}/usr/lib/ibus - mv ${pkgdir}/usr/libexec/ibus-engine-chewing ${pkgdir}/usr/lib/ibus/ibus-engine-chewing - sed -i 's#/usr/libexec/ibus-engine-chewing#/usr/lib/ibus/ibus-engine-chewing#' ${pkgdir}/usr/share/ibus/component/chewing.xml + make DESTDIR="${pkgdir}" install } diff --git a/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch b/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch new file mode 100644 index 000000000..fc2be85d7 --- /dev/null +++ b/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch @@ -0,0 +1,84 @@ +From ff138d7a18b7577e5f04f852bd3caf87cbc9e7cc Mon Sep 17 00:00:00 2001 +From: Ding-Yi Chen <dingyichen@gmail.com> +Date: Thu, 20 Jan 2011 17:03:07 +1000 +Subject: [PATCH] Addressed comments of yusake + +--- + src/IBusChewingEngine-def.c | 30 ++++++++++++++++++++++-------- + 1 files changed, 22 insertions(+), 8 deletions(-) + +diff --git a/src/IBusChewingEngine-def.c b/src/IBusChewingEngine-def.c +index 90c0384..8c90766 100644 +--- a/src/IBusChewingEngine-def.c ++++ b/src/IBusChewingEngine-def.c +@@ -391,21 +391,29 @@ this option determines how these status be synchronized. Valid values:\n\ + void g_variant_to_g_value(GVariant *gVar, GValue *gValue){ + const GVariantType *gVType=g_variant_get_type(gVar); + if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_BOOLEAN)){ ++ g_value_init(gValue, G_TYPE_BOOLEAN); + g_value_set_boolean(gValue, g_variant_get_boolean(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT16)){ ++ g_value_init(gValue, G_TYPE_UINT); + g_value_set_uint(gValue, g_variant_get_uint16(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT32)){ ++ g_value_init(gValue, G_TYPE_UINT); + g_value_set_uint(gValue, g_variant_get_uint32(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT64)){ ++ g_value_init(gValue, G_TYPE_UINT64); + g_value_set_uint64(gValue, g_variant_get_uint64(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT16)){ ++ g_value_init(gValue, G_TYPE_INT); + g_value_set_int(gValue, g_variant_get_int16(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT32)){ ++ g_value_init(gValue, G_TYPE_INT); + g_value_set_int(gValue, g_variant_get_int32(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT64)){ ++ g_value_init(gValue, G_TYPE_INT); + g_value_set_int64(gValue, g_variant_get_int64(gVar)); + }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_STRING)){ +- g_value_set_int64(gValue, g_variant_get_string(gVar, NULL)); ++ g_value_init(gValue, G_TYPE_STRING); ++ g_value_set_string(gValue, g_variant_get_string(gVar, NULL)); + } + } + +@@ -419,8 +427,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ + case G_TYPE_UINT: + gVar=g_variant_new_uint32(g_value_get_uint(gValue)); + break; ++ case G_TYPE_UINT64: ++ gVar=g_variant_new_uint64(g_value_get_uint(gValue)); ++ break; + case G_TYPE_INT: +- gVar=g_variant_new_int32(g_value_get_int(gValue)); ++ gVar=g_variant_new_int32(g_value_get_uint(gValue)); ++ break; ++ case G_TYPE_INT64: ++ gVar=g_variant_new_int64(g_value_get_uint(gValue)); + break; + case G_TYPE_STRING: + gVar=g_variant_new_string(g_value_get_string(gValue)); +@@ -435,14 +449,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){ + + static gboolean ibus_chewing_config_get_value(IBusConfig *config, const gchar *section, const gchar *key, GValue *gValue){ + #if IBUS_VERSION >= 10399 +- GVariant *gVar=g_variant_ref_sink(ibus_config_get_value(config, section, key)); +- if (gVar!=NULL){ +- g_variant_to_g_value(gVar, gValue); +- g_variant_unref(gVar); +- return TRUE; +- }else{ ++ GVariant *gVar=ibus_config_get_value(config, section, key); ++ if (gVar==NULL){ + return FALSE; + } ++ g_variant_ref_sink(gVar); ++ g_variant_to_g_value(gVar, gValue); ++ g_variant_unref(gVar); ++ return TRUE; + #else + return ibus_config_get_value(config, section, key, gValue); + #endif +-- +1.7.4.4 + |