[eekboard] Update to 0.0.7-3.

Daiki Ueno ueno at fedoraproject.org
Thu Jan 13 07:10:06 UTC 2011


commit ec3ee7351e325795b76f84fb928de39ae25fbc8b
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Jan 13 16:09:56 2011 +0900

    Update to 0.0.7-3.

 eekboard-gtk3.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 eekboard.spec       |    7 +++++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/eekboard-gtk3.patch b/eekboard-gtk3.patch
new file mode 100644
index 0000000..ec2e0ce
--- /dev/null
+++ b/eekboard-gtk3.patch
@@ -0,0 +1,53 @@
+diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c
+index 3fe3e8f..ec16e50 100644
+--- a/eek/eek-gtk-keyboard.c
++++ b/eek/eek-gtk-keyboard.c
+@@ -41,6 +41,12 @@ G_DEFINE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, EEK_TYPE_KEYBOARD);
+ #define EEK_GTK_KEYBOARD_GET_PRIVATE(obj)                                  \
+     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardPrivate))
+ 
++/* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
++   GdkWindow as the argument */
++#ifndef GDK_DRAWABLE
++#define GDK_DRAWABLE(x) (x)
++#endif
++
+ enum {
+     KEY_SURFACE_NORMAL = 0,
+     KEY_SURFACE_LARGE,
+diff --git a/src/eekboard.c b/src/eekboard.c
+index 15ce787..742dc76 100644
+--- a/src/eekboard.c
++++ b/src/eekboard.c
+@@ -288,17 +288,6 @@ on_destroy (gpointer user_data)
+     gtk_main_quit ();
+ }
+ 
+-static gboolean
+-on_quit (gpointer user_data)
+-{
+-    Eekboard *eekboard = user_data;
+-    /* release the currently hold key */
+-    if (eekboard->fakekey)
+-        fakekey_release (eekboard->fakekey);
+-    eekboard_free (eekboard);
+-    return TRUE;
+-}
+-
+ static void
+ on_quit_from_menu (GtkAction * action, GtkWidget *window)
+ {
+@@ -1792,8 +1781,12 @@ main (int argc, char *argv[])
+     if (combo)
+         gtk_combo_box_set_active (GTK_COMBO_BOX(combo), 0);
+ 
+-    gtk_quit_add (0, on_quit, eekboard);
+     gtk_main ();
+ 
++    /* release the currently held key */
++    if (eekboard->fakekey)
++        fakekey_release (eekboard->fakekey);
++    eekboard_free (eekboard);
++
+     return 0;
+ }
diff --git a/eekboard.spec b/eekboard.spec
index ccdb420..575cc03 100644
--- a/eekboard.spec
+++ b/eekboard.spec
@@ -1,6 +1,6 @@
 Name:		eekboard
 Version:	0.0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Virtual Keyboard for GNOME 
 
 Group:		Applications/System
@@ -9,6 +9,7 @@ URL:		http://ueno.github.com/eekboard/
 Source0:	http://github.com/downloads/ueno/eekboard/eekboard-%{version}.tar.gz
 Source1:	%{name}.desktop
 Source2:	eekboard.sh
+Patch0:		eekboard-gtk3.patch
 BuildRequires:	libfakekey-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	clutter-gtk-devel
@@ -52,6 +53,7 @@ This package contains the development tools for eekboard.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gtk3
 
 
 %build
@@ -99,6 +101,9 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
 
 
 %changelog
+* Thu Jan 13 2011 Daiki Ueno <dueno at redhat.com> - 0.0.7-3
+- add eekboard-gtk3.patch
+
 * Sun Jan  9 2011 Matthias Clasen <mclasen at redhat.com> - 0.0.7-2
 - Rebuild against newer gtk3
 


More information about the scm-commits mailing list