rpms/eekboard/devel disable-clutter.patch, NONE, 1.1 eekboard.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Daiki Ueno]

Author: ueno

Update of /cvs/pkgs/rpms/eekboard/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13387/devel

Modified Files:
	eekboard.spec import.log 
Added Files:
	disable-clutter.patch 
Log Message:
apply a patch to disable Clutter by default (#611888)


disable-clutter.patch:
 eekboard.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE disable-clutter.patch ---
diff -ru eekboard-0.0.4.orig/src/eekboard.c eekboard-0.0.4/src/eekboard.c
--- eekboard-0.0.4.orig/src/eekboard.c	2010-07-01 11:08:49.000000000 +0900
+++ eekboard-0.0.4/src/eekboard.c	2010-07-14 15:00:18.660369558 +0900
@@ -1133,7 +1133,7 @@
 main (int argc, char *argv[])
 {
     const gchar *env;
-    gboolean use_clutter = USE_CLUTTER;
+    gboolean use_clutter = FALSE;
     gboolean need_swap_event_workaround = FALSE;
     Eekboard *eekboard;
     GtkWidget *widget, *vbox, *menubar, *window;
@@ -1154,11 +1154,11 @@
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif
 
-    env = g_getenv ("EEKBOARD_DISABLE_CLUTTER");
+#if HAVE_CLUTTER_GTK
+    env = g_getenv ("EEKBOARD_ENABLE_CLUTTER");
     if (env && g_strcmp0 (env, "1") == 0)
-        use_clutter = FALSE;
+        use_clutter = TRUE;
 
-#if HAVE_CLUTTER_GTK
     if (use_clutter &&
         gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) {
         g_warning ("Can't init Clutter-Gtk...fallback to GTK");


Index: eekboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eekboard/devel/eekboard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eekboard.spec	2 Jul 2010 05:43:06 -0000	1.1
+++ eekboard.spec	14 Jul 2010 06:07:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		eekboard
 Version:	0.0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Virtual Keyboard for GNOME 
 
 Group:		Applications/System
@@ -8,6 +8,7 @@ License:	GPLv3+
 URL:		http://ueno.github.com/eekboard/
 Source0:	http://github.com/downloads/ueno/eekboard/eekboard-%{version}.tar.gz
 Source1:	%{name}.desktop
+Patch0:		disable-clutter.patch
 BuildRequires:	libfakekey-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	clutter-gtk-devel
@@ -46,6 +47,7 @@ This package contains the development to
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -90,6 +92,9 @@ desktop-file-install --dir=${RPM_BUILD_R
 
 
 %changelog
+* Wed Jul 14 2010 Daiki Ueno <dueno at redhat.com> - 0.0.4-2
+- apply a patch to disable Clutter by default (#611888)
+
 * Thu Jul  1 2010 Daiki Ueno <dueno at redhat.com> - 0.0.4-1
 - new upstream release
 - merge -devel-docs to -devel


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/eekboard/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Jul 2010 05:43:06 -0000	1.1
+++ import.log	14 Jul 2010 06:07:20 -0000	1.2
@@ -1 +1,2 @@
 eekboard-0_0_4-1_fc13:HEAD:eekboard-0.0.4-1.fc13.src.rpm:1278049074
+eekboard-0_0_4-2_fc13:HEAD:eekboard-0.0.4-2.fc13.src.rpm:1279087604