- Apply a patch from upstream to remove two duplicate prototypes that

breaks the build for many GTK projects.

0001-Drop-duplicate-declarations.patch

@@ -0,0 +1,30 @@
+From 6f566057e85dc0d542f26db1d7964a774a5f88a4 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 10 Feb 2010 16:07:43 -0500
+Subject: [PATCH 01/12] Drop duplicate declarations
+
+---
+ gtk/gtkwidget.h |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
+index 757be3f..164c0e1 100644
+--- a/gtk/gtkwidget.h
++++ b/gtk/gtkwidget.h
+@@ -916,13 +916,6 @@ gboolean              gtk_widget_get_has_window         (GtkWidget    *widget);
+ 
+ gboolean              gtk_widget_is_toplevel            (GtkWidget    *widget);
+ gboolean              gtk_widget_is_drawable            (GtkWidget    *widget);
+-void                  gtk_widget_set_realized           (GtkWidget    *widget,
+-                                                         gboolean      realized);
+-gboolean              gtk_widget_get_realized           (GtkWidget    *widget);
+-void                  gtk_widget_set_mapped             (GtkWidget    *widget,
+-                                                         gboolean      mapped);
+-gboolean              gtk_widget_get_mapped             (GtkWidget    *widget);
+-
+ void                  gtk_widget_set_app_paintable      (GtkWidget    *widget,
+ 							 gboolean      app_paintable);
+ gboolean              gtk_widget_get_app_paintable      (GtkWidget    *widget);
+-- 
+1.7.0
+

gtk2.spec

@@ -19,7 +19,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.19/gtk+-%{version}.tar.bz2
@@ -42,6 +42,8 @@ Patch11: gtk2-remove-connecting-reason.patch
 #Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600992
 Patch15: filesystemref.patch
+# already upstream
+Patch16: 0001-Drop-duplicate-declarations.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -162,6 +164,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch11 -p1 -b .remove-connecting-reason
 #%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .filesystemref
+%patch16 -p1 -b .dup-prototypes
 
 %build
 
@@ -398,8 +401,11 @@ fi
 %doc tmpdocs/faq
 %doc tmpdocs/examples
 
-
 %changelog
+* Thu Feb 18 2010 Richard Hughes <rhughes@redhat.com> - 2.19.5-2
+- Apply a patch from upstream to remove two duplicate prototypes that
+  breaks the build for many GTK projects.
+
 * Thu Feb 11 2010 Matthias Clasen <mclasen@redhat.com> - 2.19.5-1
 - Update to 2.19.5