Fixed compilation with >=dev-libs/glib-2.31 (bug #411195)

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 73 insertions, 120 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 8ea0292688cc..b04d8f9e6d42 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.311 2011/10/27 06:42:00 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.312 2012/04/12 21:00:43 polynomial-c Exp $
+
+  12 Apr 2012; Lars Wendler <polynomial-c@gentoo.org> -xchat-2.8.8-r1.ebuild,
+  xchat-2.8.8-r2.ebuild, +files/xchat-2.8.8-glib-2.31.patch:
+  Fixed compilation with >=dev-libs/glib-2.31. Thanks to Alexandre Rostovtsev
+  (tetromino) for filing bug #411195 and providing a working patch.
 
   27 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   xchat-2.8.6-r2.ebuild, xchat-2.8.8-r1.ebuild, xchat-2.8.8-r2.ebuild:
diff --git a/net-irc/xchat/files/xchat-2.8.8-glib-2.31.patch b/net-irc/xchat/files/xchat-2.8.8-glib-2.31.patch
new file mode 100644
index 000000000000..63f562ff830f
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.8.8-glib-2.31.patch
@@ -0,0 +1,62 @@
+Author: Dominique Leuenberger <dimstar@opensuse.org>
+
+http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239
+
+glib got stricter in checking includes. Only glib.h (and a few exceptions)
+are to be included directly.
+
+Index: xchat-2.8.8/src/common/servlist.c
+===================================================================
+--- xchat-2.8.8.orig/src/common/servlist.c
++++ xchat-2.8.8/src/common/servlist.c
+@@ -24,7 +24,7 @@
+ #include <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "cfgfiles.h"
+ #include "fe.h"
+Index: xchat-2.8.8/src/common/text.c
+===================================================================
+--- xchat-2.8.8.orig/src/common/text.c
++++ xchat-2.8.8/src/common/text.c
+@@ -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"
+Index: xchat-2.8.8/src/common/util.c
+===================================================================
+--- xchat-2.8.8.orig/src/common/util.c
++++ xchat-2.8.8/src/common/util.c
+@@ -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"
+Index: xchat-2.8.8/src/common/xchat.h
+===================================================================
+--- xchat-2.8.8.orig/src/common/xchat.h
++++ xchat-2.8.8/src/common/xchat.h
+@@ -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 --git a/net-irc/xchat/xchat-2.8.8-r1.ebuild b/net-irc/xchat/xchat-2.8.8-r1.ebuild
deleted file mode 100644
index 80f3d9913401..000000000000
--- a/net-irc/xchat/xchat-2.8.8-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.10 2011/10/27 06:42:00 tetromino Exp $
-
-EAPI=2
-
-inherit eutils versionator gnome2 autotools
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="dbus fastscroll +gtk ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0:2
-	gtk? ( >=x11-libs/gtk+-2.10.0:2 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.8.0 )
-	python? ( =dev-lang/python-2* )
-	tcl? ( dev-lang/tcl )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	spell? ( app-text/gtkspell:2 )
-	libnotify? ( x11-libs/libnotify )
-	ntlm? ( net-libs/libntlm )
-	x11-libs/pango
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [[ ${ARCH} = sparc ]] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-input-box4.patch \
-		"${FILESDIR}"/${P}-dbus.patch
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure.in || die
-	fi
-
-	# xchat sourcecode ships with po/Makefile.in.in from gettext-0.17
-	# which fails with >=gettext-0.18
-	cp /usr/share/gettext/po/Makefile.in.in "${S}"/po/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		--enable-shm \
-		$(use_enable dbus) \
-		$(use_enable ipv6) \
-		$(use_enable mmx) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable spell spell gtkspell) \
-		$(use_enable ssl openssl) \
-		$(use_enable tcl) \
-		$(use_enable gtk gtkfe) \
-		$(use_enable !gtk textfe) \
-		$(use_enable fastscroll xft)
-}
-
-src_install() {
-	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-
-	# remove useless desktop entry when gtk USE flag is unset
-	if ! use gtk ; then
-		rm "${D}"/usr/share/applications -rf
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		elog
-		elog "XChat binary has been renamed from xchat-2 to xchat."
-		elog
-
-		if has_version net-irc/xchat-systray
-		then
-			elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
-			elog
-		fi
-	else
-		elog "You have disabled the gtk USE flag. This means you don't have"
-		elog "the GTK-GUI for xchat but only a text interface called \"xchat-text\"."
-	fi
-}
diff --git a/net-irc/xchat/xchat-2.8.8-r2.ebuild b/net-irc/xchat/xchat-2.8.8-r2.ebuild
index cee9cef9f294..2198fe0a5129 100644
--- a/net-irc/xchat/xchat-2.8.8-r2.ebuild
+++ b/net-irc/xchat/xchat-2.8.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.16 2011/10/27 06:42:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.17 2012/04/12 21:00:43 polynomial-c Exp $
 
 EAPI=3
 
@@ -48,7 +48,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-2.8.4-interix.patch \
 		"${FILESDIR}"/${P}-libnotify07.patch \
 		"${FILESDIR}"/${P}-dbus.patch \
-		"${FILESDIR}"/${PN}-2.8.8-cflags.patch
+		"${FILESDIR}"/${PN}-2.8.8-cflags.patch \
+		"${FILESDIR}"/${P}-glib-2.31.patch
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2