Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 8 insertions, 94 deletions

diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD
index c677bd4ae..1f688da6c 100644
--- a/community/ibus-chewing/PKGBUILD
+++ b/community/ibus-chewing/PKGBUILD
@@ -1,38 +1,36 @@
-# $Id: PKGBUILD 56294 2011-10-05 06:10:32Z ebelanger $
+# $Id: PKGBUILD 57032 2011-10-18 21:32:56Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars@gmail.com>
 # Contributor: Hiroshi Yui <hiroshiyui@gmail.com>
 
 pkgname=ibus-chewing
-pkgver=1.3.9.2
-pkgrel=5
+pkgver=1.3.10
+pkgrel=1
 pkgdesc='Chinese Chewing Engine for IBus Framework'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://ibus.googlecode.com'
-depends=('ibus' 'libchewing' 'libxtst' 'gconf')
+depends=('ibus' 'libchewing' 'libxtst')
 makedepends=('swig' 'cmake' 'gob2')
 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')
+        https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz)
+md5sums=('2a447828ca9290dd6bdf2336b2889bb0'
+         'eb24ff0ec5b7646dd1b077f3b379712b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
-  patch -p1 -i "${srcdir}/ibus-chewing-696864-abrt-ibus-1.4.patch"
+  tar -xzf ../cmake-fedora-modules-only-latest.tar.gz
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONF_INSTALL_DIR=/usr/share \
     -DLIBEXEC_DIR=/usr/lib/ibus \
     .
-
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
-
   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
deleted file mode 100644
index fc2be85d7..000000000
--- a/community/ibus-chewing/ibus-chewing-696864-abrt-ibus-1.4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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
-