rpms/GtkAda/devel GtkAda-2.14.0-GTK+-2.21.patch, NONE, 1.1 GtkAda.spec, 1.35, 1.36

[Björn Persson]

Author: rombobeorn

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

Modified Files:
	GtkAda.spec 
Added Files:
	GtkAda-2.14.0-GTK+-2.21.patch 
Log Message:
Patched to build against GTK+ 2.21 (#599780).


GtkAda-2.14.0-GTK+-2.21.patch:
 gtkitementry.c |   11 -----------
 1 file changed, 11 deletions(-)

--- NEW FILE GtkAda-2.14.0-GTK+-2.21.patch ---
--- src/gtkextra/gtkitementry.c	2007-06-23 04:17:47.000000000 +0200
+++ src/gtkextra/gtkitementry.c.new	2010-06-20 00:02:54.000000000 +0200
@@ -131,7 +131,6 @@
 static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
                                                         gboolean        include_preedit);
 static void         gtk_entry_queue_draw               (GtkEntry       *entry);
-static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
 static void         gtk_entry_recompute                (GtkEntry       *entry);
 static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
 							CursorType      type,
@@ -1695,16 +1694,6 @@
 }
 
 static void
-gtk_entry_reset_im_context (GtkEntry *entry)
-{
-  if (entry->need_im_reset)
-    {
-      entry->need_im_reset = 0;
-      gtk_im_context_reset (entry->im_context);
-    }
-}
-
-static void
 gtk_entry_get_cursor_locations (GtkEntry   *entry,
 				CursorType  type,
 				gint       *strong_x,


Index: GtkAda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- GtkAda.spec	16 Feb 2010 23:27:44 -0000	1.35
+++ GtkAda.spec	27 Jun 2010 00:55:58 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           GtkAda
 Version:        2.14.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Ada graphical toolkit based on Gtk+
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -12,13 +12,17 @@ Patch0:         GtkAda-gtk217.patch
 Patch1:         GtkAda-2.14.0-multilib_gpr.patch
 # Patch to make gtkada-config use uname:
 Patch2:         GtkAda-2.14.0-multilib_gtkada-config.patch
-# Patch to fix implicit DSO linking (sent upstream by email 2010-02-16):
+# Patch to fix implicit DSO linking, proposed upstream 2010-02-16:
+# http://lists.adacore.com/pipermail/gtkada/2010-February/003871.html
 Patch3:         GtkAda-2.14.0-lm.patch
+# Adaptation to an addition in GTK+ 2.21, proposed upstream 2010-06-21:
+# http://lists.adacore.com/pipermail/gtkada/2010-June/003888.html
+Patch4:         GtkAda-2.14.0-GTK+-2.21.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat
 BuildRequires:  perl
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk2-devel >= 2.21
 BuildRequires:  libgnome-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libgnomecanvas-devel
@@ -95,6 +99,7 @@ Documentation for GtkAda.
 %patch1
 %patch2
 %patch3
+%patch4
 # Replace "/usr/lib" with the appropriate architecture-specific directory, but
 # make an exception for "/usr/lib/gnat". Keep "$(prefix)" so that makeinstall
 # can insert the buildroot.
@@ -200,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 27 2010 Björn Persson <bjorn at rombobjörn.se> - 2.14.0-5
+- Patched to build against GTK+ 2.21 (#599780).
+
 * Sun Feb 14 2010 Björn Persson <bjorn at rombobjörn.se> - 2.14.0-4
 - Link testgtk to libm explicitly (#564610).