From d7d94510f5121b56d9b89efec41bfdcff5947ab0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Dec 18 2007 18:21:28 +0000
Subject: drop upstreamed patch


---

diff --git a/bad-free.patch b/bad-free.patch
deleted file mode 100644
index d87c337..0000000
--- a/bad-free.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -up libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c.bad-free libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c
---- libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c.bad-free	2007-08-13 12:47:51.000000000 -0400
-+++ libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c	2007-08-13 12:49:00.000000000 -0400
-@@ -193,7 +193,7 @@ gkbd_indicator_config_init (GkbdIndicato
- 			    GConfClient * conf_client, XklEngine * engine)
- {
- 	GError *gerror = NULL;
--	gchar *sp, *datadir;
-+	gchar *sp;
- 
- 	memset (ind_config, 0, sizeof (*ind_config));
- 	ind_config->conf_client = conf_client;
-@@ -211,7 +211,6 @@ gkbd_indicator_config_init (GkbdIndicato
- 
- 	ind_config->icon_theme = gtk_icon_theme_get_default ();
- 
--	datadir = DATADIR;
- 	gtk_icon_theme_append_search_path (ind_config->icon_theme, sp =
- 					   g_build_filename (g_get_home_dir
- 							     (),
-@@ -221,18 +220,17 @@ gkbd_indicator_config_init (GkbdIndicato
- 
- 	gtk_icon_theme_append_search_path (ind_config->icon_theme,
- 					   sp =
--					   g_build_filename (datadir,
-+					   g_build_filename (DATADIR,
- 							     "pixmaps/flags",
- 							     NULL));
- 	g_free (sp);
- 
- 	gtk_icon_theme_append_search_path (ind_config->icon_theme,
- 					   sp =
--					   g_build_filename (datadir,
-+					   g_build_filename (DATADIR,
- 							     "icons/flags",
- 							     NULL));
- 	g_free (sp);
--	g_free (datadir);
- }
- 
- void
diff --git a/libgnomekbd-2.21.4-redraw.patch b/libgnomekbd-2.21.4-redraw.patch
deleted file mode 100644
index 66fa111..0000000
--- a/libgnomekbd-2.21.4-redraw.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c.redraw libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c
---- libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c.redraw	2007-12-15 20:22:24.000000000 -0500
-+++ libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c	2007-12-15 20:28:08.000000000 -0500
-@@ -1229,6 +1229,26 @@ typedef struct {
- } DrawKeyboardItemData;
- 
- static void
-+redraw_overlapping_doodads (GkbdKeyboardDrawingRenderContext * context,
-+                            GkbdKeyboardDrawing * drawing,
-+                            GkbdKeyboardDrawingKey * key)
-+{
-+  GList *list;
-+  gboolean do_draw = FALSE;
-+
-+  for (list = drawing->keyboard_items; list; list = list->next)
-+    {
-+      GkbdKeyboardDrawingItem * item = list->data;
-+
-+      if (do_draw && item->type == GKBD_KEYBOARD_DRAWING_ITEM_TYPE_DOODAD)
-+       draw_doodad (context, drawing, (GkbdKeyboardDrawingDoodad *) item);
-+
-+      if (list->data == key)
-+       do_draw = TRUE;
-+    }
-+}
-+
-+static void
- draw_keyboard_item (GkbdKeyboardDrawingItem * item,
- 		    DrawKeyboardItemData *data)
- {
-@@ -1463,6 +1483,7 @@ key_event (GtkWidget * widget,
- 
- 	create_cairo (drawing);
- 	draw_key (drawing->renderContext, drawing, key);
-+	redraw_overlapping_doodads (drawing->renderContext, drawing, key);
- 	destroy_cairo (drawing);
- 
- 	invalidate_key_region (drawing, key);
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 731e642..b429b13 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -7,8 +7,6 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
 Source0:        http://download.gnome.org/sources/libgnomekbd/2.21/libgnomekbd-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=353163
-Patch0:         libgnomekbd-2.21.4-redraw.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,7 +50,6 @@ developing applications that use libgnomekbd.
 
 %prep
 %setup -q
-%patch0 -p1 -b .redraw
 
 %build
 %configure --disable-static --enable-compile-warnings=no