rpms/gtk+extra/devel gtk+extra-2.1.2-gtk2.21.patch, NONE, 1.1 gtk+extra.spec, 1.20, 1.21

[Roy Rankin]

Author: rrankin

Update of /cvs/pkgs/rpms/gtk+extra/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24316

Modified Files:
	gtk+extra.spec 
Added Files:
	gtk+extra-2.1.2-gtk2.21.patch 
Log Message:
Patch to compile against gtk2-2.21


gtk+extra-2.1.2-gtk2.21.patch:
 gtkitementry.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gtk+extra-2.1.2-gtk2.21.patch ---
diff -c -r1.7 gtkitementry.c
*** gtkextra/gtkitementry.c	13 Mar 2010 09:45:54 -0000	1.7
--- gtkextra/gtkitementry.c	11 Jun 2010 23:33:41 -0000
***************
*** 131,137 ****
--- 131,139 ----
  static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
                                                          gboolean        include_preedit);
  static void         gtk_entry_queue_draw               (GtkEntry       *entry);
+ #if GTK_CHECK_VERSION(2,21,0) == 0
  static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
+ #endif 
  static void         gtk_entry_recompute                (GtkEntry       *entry);
  static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
  							CursorType      type,
***************
*** 1754,1759 ****
--- 1756,1762 ----
      gdk_window_invalidate_rect (entry->text_area, NULL, FALSE);
  }
  
+ #if GTK_CHECK_VERSION(2,21,0) == 0
  static void
  gtk_entry_reset_im_context (GtkEntry *entry)
  {
***************
*** 1763,1768 ****
--- 1766,1772 ----
        gtk_im_context_reset (entry->im_context);
      }
  }
+ #endif // GTK_CHECK_VERSION(2,21,0) == 0
  
  static void
  gtk_entry_get_cursor_locations (GtkEntry   *entry,



Index: gtk+extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/devel/gtk+extra.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gtk+extra.spec	23 Mar 2010 20:09:34 -0000	1.20
+++ gtk+extra.spec	12 Jun 2010 00:01:55 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		gtk+extra
 Version:	2.1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une bibliothèque de widgets gtk+
 
@@ -8,6 +8,7 @@ Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://gtkextra.sourceforge.net/
 Source:		http://downloads.sourceforge.net/gtkextra/gtk+extra-%{version}.tar.gz
+Patch:		%{name}-%{version}-gtk2.21.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
@@ -43,6 +44,8 @@ qui utilisent les widgets gtk+extra.
 %{__sed} -i 's/\r//' docs/reference/*.html
 %{__sed} -i 's/\r//' docs/tutorial/{*.html,gtksheet/*.{c,html}}
 
+%patch -p0
+
 
 %build
 %configure
@@ -80,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 12 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.2-2
+- Patch to compile with gtk2-2.21
+
 * Tue Mar 23 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.2-1
 - Upstream bugfix release 2.1.2