[91758] trunk/dports/irc/xchat2

[jeremyhu at macports.org]

Revision: 91758
          https://trac.macports.org/changeset/91758
Author:   jeremyhu at macports.org
Date:     2012-04-09 14:13:09 -0700 (Mon, 09 Apr 2012)
Log Message:
-----------
xchat2: Build fix for glib-2.32 (#33959).

Modified Paths:
--------------
    trunk/dports/irc/xchat2/Portfile

Added Paths:
-----------
    trunk/dports/irc/xchat2/files/patch-glib-2.32.diff

Modified: trunk/dports/irc/xchat2/Portfile
===================================================================
--- trunk/dports/irc/xchat2/Portfile	2012-04-09 20:53:38 UTC (rev 91757)
+++ trunk/dports/irc/xchat2/Portfile	2012-04-09 21:13:09 UTC (rev 91758)
@@ -30,7 +30,7 @@
 depends_build       port:pkgconfig
 depends_lib         port:gtk2 port:libsexy path:bin/perl:perl5
 
-patchfiles          patch-gtk2.19.7.diff
+patchfiles          patch-gtk2.19.7.diff patch-glib-2.32.diff
 patch.pre_args      -p1
 
 configure.args      --disable-python --disable-mmx --enable-ipv6 \

Added: trunk/dports/irc/xchat2/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/irc/xchat2/files/patch-glib-2.32.diff	                        (rev 0)
+++ trunk/dports/irc/xchat2/files/patch-glib-2.32.diff	2012-04-09 21:13:09 UTC (rev 91758)
@@ -0,0 +1,87 @@
+diff -Naurp ./src/common/dbus/dbus-plugin.c ./src/common/dbus/dbus-plugin.c
+--- ./src/common/dbus/dbus-plugin.c	2009-08-16 02:40:15.000000000 -0700
++++ ./src/common/dbus/dbus-plugin.c	2012-04-09 14:02:12.000000000 -0700
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ #include "../xchat-plugin.h"
+ 
+ #define PNAME _("remote access")
+diff -Naurp ./src/common/modes.c ./src/common/modes.c
+--- ./src/common/modes.c	2010-05-29 18:52:18.000000000 -0700
++++ ./src/common/modes.c	2012-04-09 14:02:12.000000000 -0700
+@@ -20,7 +20,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ 
+ #include "xchat.h"
+ #include "xchatc.h"
+diff -Naurp ./src/common/servlist.c ./src/common/servlist.c
+--- ./src/common/servlist.c	2010-05-16 00:24:26.000000000 -0700
++++ ./src/common/servlist.c	2012-04-09 14:02:12.000000000 -0700
+@@ -24,7 +24,7 @@
+ #include <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "cfgfiles.h"
+ #include "fe.h"
+diff -Naurp ./src/common/text.c ./src/common/text.c
+--- ./src/common/text.c	2010-05-29 19:14:41.000000000 -0700
++++ ./src/common/text.c	2012-04-09 14:02:12.000000000 -0700
+@@ -28,7 +28,7 @@
+ #include <sys/mman.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "plugin.h"
+diff -Naurp ./src/common/util.c ./src/common/util.c
+--- ./src/common/util.c	2009-08-16 02:40:16.000000000 -0700
++++ ./src/common/util.c	2012-04-09 14:02:12.000000000 -0700
+@@ -39,7 +39,7 @@
+ #include <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ #include <ctype.h>
+ #include "util.h"
+ #include "../../config.h"
+diff -Naurp ./src/common/xchat.h ./src/common/xchat.h
+--- ./src/common/xchat.h	2009-08-16 02:40:16.000000000 -0700
++++ ./src/common/xchat.h	2012-04-09 14:01:05.000000000 -0700
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+ 
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>			/* need time_t */
+ 
+ #ifndef XCHAT_H
+diff -Naurp ./src/fe-gtk/sexy-spell-entry.c ./src/fe-gtk/sexy-spell-entry.c
+--- ./src/fe-gtk/sexy-spell-entry.c	2009-08-16 02:40:18.000000000 -0700
++++ ./src/fe-gtk/sexy-spell-entry.c	2012-04-09 14:02:12.000000000 -0700
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ #include "sexy-spell-entry.h"
+ #include <string.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ #include <sys/types.h>
+ /*#include "gtkspell-iso-codes.h"
+ #include "sexy-marshal.h"*/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120409/bed67bc0/attachment.html>