[kazehakase] - Patch to compile with GTK >= 2.21.6

[Mamoru Tasaka]

commit 8fd3f9a76e569fcea9ab3608f217a49596b836aa
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Thu Sep 9 01:15:26 2010 +0900

    - Patch to compile with GTK >= 2.21.6

 kazehakase-rev3873-gtk222.patch |  107 +++++++++++++++++++++++++++++++++++++++
 kazehakase.spec                 |   18 ++----
 2 files changed, 113 insertions(+), 12 deletions(-)
---
diff --git a/kazehakase-rev3873-gtk222.patch b/kazehakase-rev3873-gtk222.patch
new file mode 100644
index 0000000..9f0ea4d
--- /dev/null
+++ b/kazehakase-rev3873-gtk222.patch
@@ -0,0 +1,107 @@
+--- kazehakase-0.5.8-svn3873_trunk/src/kz-notebook.c.gtk222	2009-10-16 23:53:10.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/src/kz-notebook.c	2010-09-08 23:44:28.000000000 +0900
+@@ -82,7 +82,11 @@
+ 			      guint 	   page_num,
+ 			      gpointer     data);
+ static void     switch_page  (GtkNotebook     *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++                              gpointer page,
++#else
+ 			      GtkNotebookPage *page,
++#endif
+ 			      guint 	   page_num);
+ 
+ static void	cb_page_reordered (GtkNotebook *notebook,
+@@ -322,7 +326,13 @@
+ }
+ 
+ static void
+-switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num)
++switch_page (GtkNotebook *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++        gpointer page,
++#else
++        GtkNotebookPage *page,
++#endif
++        guint page_num)
+ {
+ 	KzTabLabel *tab;
+ 	gchar *title;
+--- kazehakase-0.5.8-svn3873_trunk/src/kz-window.c.gtk222	2010-05-04 00:38:44.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/src/kz-window.c	2010-09-08 23:40:40.000000000 +0900
+@@ -213,11 +213,19 @@
+ 					       guint            page_num,
+ 					       KzWindow        *kz);
+ static void     cb_notebook_switch_page       (GtkNotebook     *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++                                               gpointer page,
++#else
+ 					       GtkNotebookPage *page,
++#endif
+ 					       guint            page_num,
+ 					       KzWindow        *kz);
+ static void     cb_notebook_switch_page_after (GtkNotebook     *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++                                               gpointer page,
++#else
+ 					       GtkNotebookPage *page,
++#endif
+ 					       guint            page_num,
+ 					       KzWindow        *kz);
+ static void     cb_gesture_stack_motion       (KzGesture       *gesture,
+@@ -1912,7 +1920,12 @@
+ }
+ 
+ static void
+-cb_notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page,
++cb_notebook_switch_page (GtkNotebook *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++                         gpointer page,
++#else
++                         GtkNotebookPage *page,
++#endif
+ 			 guint page_num, KzWindow *kz)
+ {
+ 	KzWeb *kzweb = KZ_WINDOW_NTH_WEB(kz, page_num);
+@@ -1971,7 +1984,12 @@
+ }
+ 
+ static void
+-cb_notebook_switch_page_after (GtkNotebook *notebook, GtkNotebookPage *page,
++cb_notebook_switch_page_after (GtkNotebook *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++                               gpointer page,
++#else
++                               GtkNotebookPage *page,
++#endif
+ 			       guint page_num, KzWindow *kz)
+ {
+ 	kz_feed_info_change_state(KZ_FEED_INFO(kz->feed_info));
+--- kazehakase-0.5.8-svn3873_trunk/src/sidebar/kz-tabtree.c.gtk222	2009-10-16 23:53:09.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/src/sidebar/kz-tabtree.c	2010-09-08 23:36:25.000000000 +0900
+@@ -85,7 +85,11 @@
+ 
+ /* signal handlers for Notebook on KzWindow */
+ static void     cb_switch_page    (GtkNotebook     *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++                                   gpointer page,
++#else
+ 				   GtkNotebookPage *page,
++#endif
+ 				   guint            page_num,
+ 				   KzTabTree       *tabtree);
+ 
+@@ -696,7 +700,12 @@
+ 
+ 
+ static void
+-cb_switch_page (GtkNotebook *notebook, GtkNotebookPage *page,
++cb_switch_page (GtkNotebook *notebook,
++#if GTK_CHECK_VERSION(2, 21, 6)
++                gpointer page,
++#else
++                GtkNotebookPage *page,
++#endif
+ 		guint page_num, KzTabTree *tabtree)
+ {
+ 	KzWeb *web;
diff --git a/kazehakase.spec b/kazehakase.spec
index 7bd1c9a..fe2a51b 100644
--- a/kazehakase.spec
+++ b/kazehakase.spec
@@ -41,7 +41,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define		fedorarel	8
+%define		fedorarel	9
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -65,14 +65,9 @@ Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
-#Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
-%if 0%{?fedora} <= 11
-Patch15:	kazehakase-0.5.7-gtk0218.patch
-%endif
 Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
-#Patch18:	kazehakase-rev3870-xul192-workaround.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch19:	kazehakase-rev3873-gtk222.patch
 
 BuildRequires:	dbus-devel
 BuildRequires:	expat-devel
@@ -197,13 +192,9 @@ This package uses WebKit for HTML rendering engine.
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
 
-#%%patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
-%if 0%{?fedora} <= 11
-# Reverse!!
-%patch15 -p0 -b .gtk -R
-%endif
 %patch17 -p0 -b .libegg_mak
+%patch19 -p1 -b .gtk
 #%%patch18 -p0 -b .xul192
 
 %if %{support_anthy}
@@ -357,6 +348,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Thu Sep  9 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-9.svn3873_trunk
+- Patch to compile with GTK >= 2.21.6
+
 * Sat Jul  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-8.svn3873_trunk
 - Rebuild against new webkitgtk