[oe-commits] Klaus 'mrmoku' Kurzmann : resend xchat

git version control git at git.openembedded.org
Wed Jun 3 20:30:19 UTC 2009 

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 1e8f1942518231714bac2a51c29865a6c5d19a10
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1e8f1942518231714bac2a51c29865a6c5d19a10

Author: Klaus 'mrmoku' Kurzmann <mok at mnet-online.de>
Date:   Tue May 26 16:10:27 2009 +0200

resend xchat

as Ainulindale did not yet apply it... resending it inline which is much nicer :)

Klaus 'mrmoku' Kurzmann

--
>From 38eb2e60a4088d3409b4762a86d1d1fad5effc90 Mon Sep 17 00:00:00 2001
From: Klaus Kurzmann <mok at fluxnetz.de>
Date: Tue, 26 May 2009 15:36:24 +0200
Subject: [PATCH] add a patch for xchat-2.8.4 to make it build with newer versions of gtk

This patch removes the defines of GTK_DISABLE_DEPRECATED, which is
causing xchat to not build with newer gtk. It removes all of them
to be protected against deprecation of more gtk functions in the
future.

A discussion of this topic and why having GTK_DISABLE_DEPRECATED in
release tarballs can be found here:
http://bugs.gentoo.org/show_bug.cgi?id=234458

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../remove-define-gtk-disable-deprecated.patch     |  165 ++++++++++++++++++++
 recipes/xchat/xchat_2.8.4.bb                       |    6 +-
 2 files changed, 169 insertions(+), 2 deletions(-)

diff --git a/recipes/xchat/xchat-2.8.4/remove-define-gtk-disable-deprecated.patch b/recipes/xchat/xchat-2.8.4/remove-define-gtk-disable-deprecated.patch
new file mode 100644
index 0000000..c26a2ba
--- /dev/null
+++ b/recipes/xchat/xchat-2.8.4/remove-define-gtk-disable-deprecated.patch
@@ -0,0 +1,165 @@
+diff -uri xchat-2.8.4/src/fe-gtk/about.c xchat-2.8.4-fixed/src/fe-gtk/about.c
+--- xchat-2.8.4/src/fe-gtk/about.c 2007-06-30 17:25:20.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/about.c   2009-05-26 15:06:53.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uri xchat-2.8.4/src/fe-gtk/ascii.c xchat-2.8.4-fixed/src/fe-gtk/ascii.c
+--- xchat-2.8.4/src/fe-gtk/ascii.c 2006-04-06 07:10:51.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/ascii.c   2009-05-26 15:06:59.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uri xchat-2.8.4/src/fe-gtk/banlist.c xchat-2.8.4-fixed/src/fe-gtk/banlist.c
+--- xchat-2.8.4/src/fe-gtk/banlist.c   2007-07-01 06:13:20.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/banlist.c 2009-05-26 15:07:04.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uri xchat-2.8.4/src/fe-gtk/fe-gtk.c xchat-2.8.4-fixed/src/fe-gtk/fe-gtk.c
+--- xchat-2.8.4/src/fe-gtk/fe-gtk.c    2007-06-22 03:37:15.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/fe-gtk.c  2009-05-26 15:07:10.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff -uri xchat-2.8.4/src/fe-gtk/ignoregui.c xchat-2.8.4-fixed/src/fe-gtk/ignoregui.c
+--- xchat-2.8.4/src/fe-gtk/ignoregui.c 2006-05-01 10:42:24.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/ignoregui.c   2009-05-26 15:07:16.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uri xchat-2.8.4/src/fe-gtk/maingui.c xchat-2.8.4-fixed/src/fe-gtk/maingui.c
+--- xchat-2.8.4/src/fe-gtk/maingui.c   2007-06-23 17:54:15.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/maingui.c 2009-05-26 15:07:30.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdlib.h>
+ #include <string.h>
+diff -uri xchat-2.8.4/src/fe-gtk/menu.c xchat-2.8.4-fixed/src/fe-gtk/menu.c
+--- xchat-2.8.4/src/fe-gtk/menu.c  2007-06-30 10:07:14.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/menu.c    2009-05-26 15:07:35.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uri xchat-2.8.4/src/fe-gtk/notifygui.c xchat-2.8.4-fixed/src/fe-gtk/notifygui.c
+--- xchat-2.8.4/src/fe-gtk/notifygui.c 2007-06-20 10:45:52.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/notifygui.c   2009-05-26 15:07:44.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uri xchat-2.8.4/src/fe-gtk/palette.c xchat-2.8.4-fixed/src/fe-gtk/palette.c
+--- xchat-2.8.4/src/fe-gtk/palette.c   2006-03-12 11:03:12.000000000 +0100
++++ xchat-2.8.4-fixed/src/fe-gtk/palette.c 2009-05-26 15:07:51.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uri xchat-2.8.4/src/fe-gtk/pixmaps.c xchat-2.8.4-fixed/src/fe-gtk/pixmaps.c
+--- xchat-2.8.4/src/fe-gtk/pixmaps.c   2007-04-07 03:58:26.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/pixmaps.c 2009-05-26 15:07:57.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff -uri xchat-2.8.4/src/fe-gtk/plugingui.c xchat-2.8.4-fixed/src/fe-gtk/plugingui.c
+--- xchat-2.8.4/src/fe-gtk/plugingui.c 2005-10-20 05:37:04.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/plugingui.c   2009-05-26 15:08:04.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <string.h>
+ #include <stdio.h>
+diff -uri xchat-2.8.4/src/fe-gtk/rawlog.c xchat-2.8.4-fixed/src/fe-gtk/rawlog.c
+--- xchat-2.8.4/src/fe-gtk/rawlog.c    2006-09-06 09:24:06.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/rawlog.c  2009-05-26 15:08:11.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff -uri xchat-2.8.4/src/fe-gtk/search.c xchat-2.8.4-fixed/src/fe-gtk/search.c
+--- xchat-2.8.4/src/fe-gtk/search.c    2005-11-22 08:08:09.000000000 +0100
++++ xchat-2.8.4-fixed/src/fe-gtk/search.c  2009-05-26 15:08:20.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff -uri xchat-2.8.4/src/fe-gtk/urlgrab.c xchat-2.8.4-fixed/src/fe-gtk/urlgrab.c
+--- xchat-2.8.4/src/fe-gtk/urlgrab.c   2007-01-12 03:26:02.000000000 +0100
++++ xchat-2.8.4-fixed/src/fe-gtk/urlgrab.c 2009-05-26 15:08:35.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff -uri xchat-2.8.4/src/fe-gtk/userlistgui.c xchat-2.8.4-fixed/src/fe-gtk/userlistgui.c
+--- xchat-2.8.4/src/fe-gtk/userlistgui.c   2007-06-15 05:45:48.000000000 +0200
++++ xchat-2.8.4-fixed/src/fe-gtk/userlistgui.c 2009-05-26 15:08:39.000000000 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+  */
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <stdio.h>
+ #include <string.h>
diff --git a/recipes/xchat/xchat_2.8.4.bb b/recipes/xchat/xchat_2.8.4.bb
index 6626f67..80f1b3e 100644
--- a/recipes/xchat/xchat_2.8.4.bb
+++ b/recipes/xchat/xchat_2.8.4.bb
@@ -4,9 +4,11 @@ HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
 DEPENDS = "libgcrypt zlib gtk+"
 DEPENDS += "gdk-pixbuf-csource-native"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.xchat.org/files/source/2.8/xchat-${PV}.tar.bz2"
+SRC_URI = "http://www.xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
+file://remove-define-gtk-disable-deprecated.patch;patch=1 \
+"
 
 inherit autotools

More information about the Openembedded-commits mailing list