From 48c709925674171e552a6e5d9afbad8ac4a8575a Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Sat, 4 Oct 2008 09:56:55 +0200
Subject: [PATCH] sylpheed: fix build with gtk 2.14

---
 sylpheed/.md5sum                       |  1 +
 sylpheed/Pkgfile                       |  8 +++-
 sylpheed/sylpheed-2.5.0-gtk-2.14.patch | 57 ++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 sylpheed/sylpheed-2.5.0-gtk-2.14.patch

diff --git a/sylpheed/.md5sum b/sylpheed/.md5sum
index 0bea3bdca..42750d348 100644
--- a/sylpheed/.md5sum
+++ b/sylpheed/.md5sum
@@ -1 +1,2 @@
+7401cc207fb5a7de3f23e40437fc7f91  sylpheed-2.5.0-gtk-2.14.patch
 a6fc9e9c2a33876fddb33f25f40b820f  sylpheed-2.5.0.tar.bz2
diff --git a/sylpheed/Pkgfile b/sylpheed/Pkgfile
index ec811432e..bb2b1fd42 100644
--- a/sylpheed/Pkgfile
+++ b/sylpheed/Pkgfile
@@ -5,11 +5,15 @@
 
 name=sylpheed
 version=2.5.0
-release=1
-source=(http://sylpheed.sraoss.jp/sylpheed/v2.5/$name-$version.tar.bz2)
+release=2
+source=(http://sylpheed.sraoss.jp/sylpheed/v2.5/$name-$version.tar.bz2
+        $name-$version-gtk-2.14.patch)
 
 build () {
     cd $name-$version
+
+    patch -p1 -i $SRC/$name-$version-gtk-2.14.patch
+    
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install
diff --git a/sylpheed/sylpheed-2.5.0-gtk-2.14.patch b/sylpheed/sylpheed-2.5.0-gtk-2.14.patch
new file mode 100644
index 000000000..071664166
--- /dev/null
+++ b/sylpheed/sylpheed-2.5.0-gtk-2.14.patch
@@ -0,0 +1,57 @@
+# http://cvs.fedoraproject.org/viewvc/rpms/sylpheed/devel/sylpheed-2.5.0rc2-gtk-2.13.1.patch?revision=1.3
+
+diff -Nur sylpheed-2.5.0rc2-orig/src/addr_compl.c sylpheed-2.5.0rc2/src/addr_compl.c
+--- sylpheed-2.5.0rc2-orig/src/addr_compl.c	2008-03-13 08:15:07.000000000 +0100
++++ sylpheed-2.5.0rc2/src/addr_compl.c	2008-06-10 14:54:24.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkentry.h>
+ #include <gtk/gtkeditable.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkscrolledwindow.h>
+ 
+diff -Nur sylpheed-2.5.0rc2-orig/src/editgroup.c sylpheed-2.5.0rc2/src/editgroup.c
+--- sylpheed-2.5.0rc2-orig/src/editgroup.c	2007-03-28 03:30:15.000000000 +0200
++++ sylpheed-2.5.0rc2/src/editgroup.c	2008-06-10 14:57:20.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <glib/gi18n.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkstatusbar.h>
+diff -Nur sylpheed-2.5.0rc2-orig/src/prefs_display_items.c sylpheed-2.5.0rc2/src/prefs_display_items.c
+--- sylpheed-2.5.0rc2-orig/src/prefs_display_items.c	2007-09-20 04:17:58.000000000 +0200
++++ sylpheed-2.5.0rc2/src/prefs_display_items.c	2008-06-10 14:37:44.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtkstock.h>
+diff -Nur sylpheed-2.5.0rc2-orig/src/prefs_summary_column.c sylpheed-2.5.0rc2/src/prefs_summary_column.c
+--- sylpheed-2.5.0rc2-orig/src/prefs_summary_column.c	2007-09-12 08:56:55.000000000 +0200
++++ sylpheed-2.5.0rc2/src/prefs_summary_column.c	2008-06-10 14:36:12.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtkstock.h>
+diff -Nur sylpheed-2.5.0rc2-orig/src/select-keys.c sylpheed-2.5.0rc2/src/select-keys.c
+--- sylpheed-2.5.0rc2-orig/src/select-keys.c	2008-05-16 11:19:55.000000000 +0200
++++ sylpheed-2.5.0rc2/src/select-keys.c	2008-06-10 14:58:13.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <gtk/gtkscrolledwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkentry.h>