fix bug #472578

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 219 insertions, 1 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index 4531a3e16e23..ae7ab6216afc 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/hexchat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.51 2013/05/29 13:33:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.52 2013/06/07 14:18:24 hasufell Exp $
+
+*hexchat-2.9.5-r1 (07 Jun 2013)
+
+  07 Jun 2013; Julian Ospald <hasufell@gentoo.org> +hexchat-2.9.5-r1.ebuild,
+  +files/hexchat-2.9.5-fix_leftclick_opens_menu.patch:
+  fix bug #472578
 
   29 May 2013; Julian Ospald <hasufell@gentoo.org> hexchat-2.9.4-r2.ebuild,
   hexchat-2.9.5.ebuild:
diff --git a/net-irc/hexchat/files/hexchat-2.9.5-fix_leftclick_opens_menu.patch b/net-irc/hexchat/files/hexchat-2.9.5-fix_leftclick_opens_menu.patch
new file mode 100644
index 000000000000..fa941d272ccf
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.9.5-fix_leftclick_opens_menu.patch
@@ -0,0 +1,68 @@
+From a5eb7784c654abc42bfdba0fcf21602b5842b256 Mon Sep 17 00:00:00 2001
+From: RichardHitt <rbh00@netcom.com>
+Date: Mon, 15 Apr 2013 12:05:53 -0700
+Subject: [PATCH] Fix broken logic in mg_word_clicked().  fixes #522
+
+---
+ src/fe-gtk/maingui.c | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
+index e847990..fb225f4 100644
+--- a/src/fe-gtk/maingui.c
++++ b/src/fe-gtk/maingui.c
+@@ -2263,25 +2263,28 @@
+ 	int word_type, start, end;
+ 	char *tmp;
+ 
+-	if (word == NULL)
++	if (word)
+ 	{
+-		if (even->button == 1)		/* left button */
+-			mg_focus (sess);
+-		return;
++		word_type = mg_word_check (xtext, word);
++		url_last (&start, &end);
+ 	}
+ 
+-	word_type = mg_word_check (xtext, word);
+-	url_last (&start, &end);
+-
+-	if (even->button == 1 && (even->state & 13) == prefs.hex_gui_url_mod)
++	if (even->button == 1)			/* left button */
+ 	{
+-		switch (word_type)
++		if (word == NULL)
+ 		{
+-		case WORD_URL:
+-		case WORD_HOST:
+-			word[end] = 0;
+-			word += start;
+-			fe_open_url (word);
++			mg_focus (sess);
++			return;
++		}
++
++		if ((even->state & 13) == prefs.hex_gui_url_mod)
++		{
++			switch (word_type)
++			{
++			case WORD_URL:
++			case WORD_HOST:
++				fe_open_url (word);
++			}
+ 		}
+ 		return;
+ 	}
+@@ -2294,6 +2297,8 @@
+ 			userlist_select (sess, word);
+ 		return;
+ 	}
++	if (word == NULL)
++		return;
+ 
+ 	switch (word_type)
+ 	{
+-- 
+1.8.1.6
+
diff --git a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
new file mode 100644
index 000000000000..fd86db8b5366
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.1 2013/06/07 14:18:24 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+inherit autotools eutils gnome2-utils mono multilib python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz"
+HOMEPAGE="http://www.hexchat.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="dbus fastscroll +gtk ipv6 libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
+REQUIRED_USE="plugin-checksum? ( plugins )
+	plugin-doat? ( plugins )
+	plugin-fishlim? ( plugins )
+	plugin-sysinfo? ( plugins )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	dbus? ( >=dev-libs/dbus-glib-0.98 )
+	fastscroll? ( x11-libs/libXft )
+	gtk? ( x11-libs/gtk+:2 )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	perl? ( >=dev-lang/perl-5.8.0 )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	spell? (
+		app-text/enchant
+		dev-libs/libxml2
+	)
+	ssl? ( >=dev-libs/openssl-0.9.8u )
+	theme-manager? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	theme-manager? ( dev-util/monodevelop )"
+
+DOCS=""
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.9.1-input-box.patch \
+		"${FILESDIR}"/${PN}-2.9.5-cflags.patch \
+		"${FILESDIR}"/${PN}-2.9.5-gettextize.patch \
+		"${FILESDIR}"/${PN}-2.9.5-gobject.patch \
+		"${FILESDIR}"/${PN}-2.9.5-fix_leftclick_opens_menu.patch
+
+	cp $(type -p gettextize) "${T}"/ || die
+	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
+	einfo "Running gettextize -f --no-changelog..."
+	"${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable libproxy socks) \
+		$(use_enable ipv6) \
+		$(use_enable fastscroll xft) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(usex python "--enable-python=${EPYTHON}" "--disable-python") \
+		$(use_enable perl) \
+		$(use_enable plugins plugin) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-doat doat) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		--enable-shm \
+		$(use_enable spell spell static) \
+		$(use_enable ntlm) \
+		$(use_enable libproxy)
+}
+
+src_compile() {
+	default
+	if use theme-manager ; then
+		export XDG_CACHE_HOME="${T}/.cache"
+		cd src/htm || die
+		mdtool --verbose build htm-mono.csproj || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	dodoc share/doc/{readme,hacking}.md
+	use plugin-fishlim && dodoc share/doc/fishlim.md
+	if use theme-manager ; then
+		dobin src/htm/thememan.exe
+		make_wrapper thememan "mono /usr/bin/thememan.exe"
+	fi
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+		gnome2_gconf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use !gtk ; then
+		einfo
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	else
+		gnome2_icon_cache_update
+		gnome2_gconf_install
+	fi
+
+	if use theme-manager ; then
+		einfo
+		elog "Themes are available at:"
+		elog "  http://hexchat.org/themes.html"
+	fi
+
+	ewarn
+	ewarn "If you're upgrading from hexchat <=2.9.3 remember to rename"
+	ewarn "the xchat.conf file found in ~/.config/hexchat/ to hexchat.conf"
+	ewarn
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+}