[arch-commits] Commit in gcin/trunk (PKGBUILD gtk3-crash.patch)

[Gaetan Bisson]

    Date: Monday, September 5, 2011 @ 16:37:00
  Author: bisson
Revision: 137063

upstream update, removed obsolete patch, force build flags

Modified:
  gcin/trunk/PKGBUILD
Deleted:
  gcin/trunk/gtk3-crash.patch

------------------+
 PKGBUILD         |   18 +++++++++++-------
 gtk3-crash.patch |   12 ------------
 2 files changed, 11 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-05 19:40:28 UTC (rev 137062)
+++ PKGBUILD	2011-09-05 20:37:00 UTC (rev 137063)
@@ -4,8 +4,8 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.5
-pkgrel=2
+pkgver=1.6.6
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -16,19 +16,23 @@
             'gtk3: support for gtk3 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.bz2"
-        'gtk3-crash.patch'
+source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405'
-          '5529884d655cf9c95e7bf5ddced3ffed140bbc20'
+sha1sums=('d230f8cd0bd1d16321a49e51e42869fd18c3f399'
           '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	patch -p1 -i ../qt4-lib64.patch
-	patch -p1 -i ../gtk3-crash.patch
+	sed '/include suffixes-rule/a \
+		CFLAGS+='"${CFLAGS}"' \
+		LDFLAGS+='"${LDFLAGS}"' \
+		OPTFLAGS=' \
+		-i Makefile
+
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }

Deleted: gtk3-crash.patch
===================================================================
--- gtk3-crash.patch	2011-09-05 19:40:28 UTC (rev 137062)
+++ gtk3-crash.patch	2011-09-05 20:37:00 UTC (rev 137063)
@@ -1,12 +0,0 @@
-diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c
---- old/gtk3-im/gtkimcontextgcin.c	2011-08-31 09:14:58.000000000 -0700
-+++ new/gtk3-im/gtkimcontextgcin.c	2011-09-04 13:29:58.838065420 -0700
-@@ -127,6 +127,8 @@
- {
-   GdkWindow *client_window = context_xim->client_window;
-   GdkScreen *screen = gdk_window_get_screen (client_window);
-+  if (screen == NULL)
-+	  return;
-   GdkDisplay *display = gdk_screen_get_display (screen);
-   if (!context_xim->gcin_ch) {
-     if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))