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, 6 insertions, 40 deletions

diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 11a13d69b..c1d48b9b3 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137498 2011-09-07 18:03:42Z bisson $
+# $Id: PKGBUILD 140668 2011-10-18 00:42:56Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.8
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -17,18 +17,15 @@ optdepends=('qt: support for qt4 input method'
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
-        'qt4-lib64.patch'
-        'missing.patch')
-sha1sums=('c400924a8827723d7d69183bbafae13ae9e1949d'
-          '4307b0d7d6dc10f15909c94973c4357caf31de7e'
-          '791c190c8b0db2e70b0099d4d03a32417497d065')
+        'qt4-lib64.patch')
+sha1sums=('151d1286dc54d7f7fa230d37e89d3d0fe0845258'
+          '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../missing.patch
 	patch -p1 -i ../qt4-lib64.patch
 	sed '/include suffixes-rule/a \
 		CFLAGS+='"${CFLAGS}"' \
diff --git a/extra/gcin/missing.patch b/extra/gcin/missing.patch
deleted file mode 100644
index 3d8737392..000000000
--- a/extra/gcin/missing.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur old/gen-dist new/gen-dist
---- old/gen-dist	2011-09-07 10:51:59.214132579 -0700
-+++ new/gen-dist	2011-09-07 10:53:27.534010656 -0700
-@@ -1,5 +1,5 @@
- GCIN_VERSION="gcin-`cat VERSION.gcin`"
--sh gen-gtk3
-+#sh gen-gtk3
- sed -i '/^$/d' Changelog.html
- rm -f tags core.*
- cd ..
-diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c
---- old/gtk3-im/gtkimcontextgcin.c	2011-09-07 10:51:59.224132565 -0700
-+++ new/gtk3-im/gtkimcontextgcin.c	2011-09-07 10:53:09.984034884 -0700
-@@ -128,7 +128,7 @@
-   GdkWindow *client_window = context_xim->client_window;
-   if (!client_window)
-     return;
--  GdkScreen *screen = gdk_drawable_get_screen (client_window);
-+  GdkScreen *screen = gdk_window_get_screen (client_window);
-   if (!screen)
-     return;
- 
-@@ -137,7 +137,7 @@
-     return;
- 
-   if (!context_xim->gcin_ch) {
--    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY())))
-+    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))
-       perror("cannot open gcin_ch");
- #if 1
-     context_xim->timeout_handle = 0;