[ibus-gucharmap/f17] Update to 1.4.0-4.

[Daiki Ueno]

commit aef71ec04cc44d644ffa68b84e725f8a7b92fa9e
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Mar 15 18:05:13 2012 +0900

    Update to 1.4.0-4.

 ibus-gucharmap-workaround-abi-break.patch |   16 ++++++++++++++++
 ibus-gucharmap.spec                       |   13 ++++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/ibus-gucharmap-workaround-abi-break.patch b/ibus-gucharmap-workaround-abi-break.patch
new file mode 100644
index 0000000..3a0c68f
--- /dev/null
+++ b/ibus-gucharmap-workaround-abi-break.patch
@@ -0,0 +1,16 @@
+diff -ru ibus-gucharmap-1.4.0.orig/src/charmap-panel.vala ibus-gucharmap-1.4.0/src/charmap-panel.vala
+--- ibus-gucharmap-1.4.0.orig/src/charmap-panel.vala	2012-03-15 17:36:26.968129288 +0900
++++ ibus-gucharmap-1.4.0/src/charmap-panel.vala	2012-03-15 17:37:40.331597839 +0900
+@@ -141,8 +141,12 @@
+             scrolled_window.add (chartable);
+             paned.pack_end (scrolled_window, true, true, 0);
+ 
++            // FIXME: workaround for gucharmap 3.3.1, enable those
++            // lines once newer gucharmap is released
++#if 0
+             var uc = Gucharmap.unicode_get_locale_character ();
+             activate_character (uc);
++#endif
+ 
+             paned.show_all ();
+ 
diff --git a/ibus-gucharmap.spec b/ibus-gucharmap.spec
index 5734942..748b553 100644
--- a/ibus-gucharmap.spec
+++ b/ibus-gucharmap.spec
@@ -2,13 +2,14 @@
 
 Name:		ibus-gucharmap
 Version:	1.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Unicode input engine (using Gucharmap) for IBus platform
 
 License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://github.com/ueno/ibus-gucharmap/
 Source0:	https://github.com/downloads/ueno/ibus-gucharmap/%{name}-%{version}.tar.gz
+Patch0:		ibus-gucharmap-workaround-abi-break.patch
 
 BuildRequires:	vala
 BuildRequires:	gucharmap-devel
@@ -25,10 +26,14 @@ navigation.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .workaround-abi-break
 # NOCONFIGURE=yes ./autogen.sh
 
 
 %build
+# FIXME: workaround for gucharmap 3.3.1-1
+GUCHARMAP_CFLAGS="`pkg-config gtk+-3.0 glib-2.0 --cflags` -I%{_includedir}/gucharmap-2.90"
+export GUCHARMAP_CFLAGS
 %configure
 make %{?_smp_mflags}
 
@@ -49,6 +54,12 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %{_datadir}/ibus-gucharmap/setup/ibus-gucharmap-preferences.ui
 
 %changelog
+* Thu Mar 15 2012 Daiki Ueno <dueno at redhat.com> - 1.4.0-4
+- rebuild with new ibus
+- workaround for new gucharmap
+  https://bugzilla.gnome.org/show_bug.cgi?id=669734
+  http://git.gnome.org/browse/gucharmap/commit/?id=adb912e4
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild