diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2013-03-09 11:18:43 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-03-09 11:18:43 +0000 |
| commit | bfd06451ff1b17b6f651f949d3e71e2750bfbbfa (patch) | |
| tree | c101ddd56c7b4401eb77c56cdfad05596f4c80b9 /net-irc | |
| parent | old (diff) | |
| download | gentoo-2-bfd06451ff1b17b6f651f949d3e71e2750bfbbfa.tar.gz gentoo-2-bfd06451ff1b17b6f651f949d3e71e2750bfbbfa.tar.bz2 gentoo-2-bfd06451ff1b17b6f651f949d3e71e2750bfbbfa.zip | |
Fix building with USE="-gtk" when x11-libs/gtk+:2 is not installed, wrt bug #460758. Thanks to Denis M. <god AT politeia.in> for proposed fixes
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/hexchat/ChangeLog | 7 | ||||
| -rw-r--r-- | net-irc/hexchat/hexchat-2.9.3.ebuild | 7 | ||||
| -rw-r--r-- | net-irc/hexchat/hexchat-2.9.4.ebuild | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog index 19a761f82194..d5d5f5cd8d95 100644 --- a/net-irc/hexchat/ChangeLog +++ b/net-irc/hexchat/ChangeLog @@ -1,6 +1,11 @@ # 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.30 2013/03/08 12:30:10 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.31 2013/03/09 11:18:43 pinkbyte Exp $ + + 09 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> hexchat-2.9.3.ebuild, + hexchat-2.9.4.ebuild: + Fix building with USE="-gtk" when x11-libs/gtk+:2 is not installed, wrt bug + #460758. Thanks to Denis M. <god AT politeia.in> for proposed fixes 08 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> hexchat-2.9.4.ebuild: Stable on arm, wrt bug #459868 diff --git a/net-irc/hexchat/hexchat-2.9.3.ebuild b/net-irc/hexchat/hexchat-2.9.3.ebuild index d49845a8d7a7..c89e21ad7876 100644 --- a/net-irc/hexchat/hexchat-2.9.3.ebuild +++ b/net-irc/hexchat/hexchat-2.9.3.ebuild @@ -1,6 +1,6 @@ # 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.3.ebuild,v 1.10 2013/01/14 07:14:11 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.3.ebuild,v 1.11 2013/03/09 11:18:42 pinkbyte Exp $ EAPI=4 @@ -54,6 +54,11 @@ src_prepare() { # QA: remove deprecated line from desktop file sed -e '/Encoding=UTF-8/d' -i ${PN}.desktop || die 'sed failed' + # Fix to compile with USE=-gtk when there is no gtk installed + if ! use gtk ; then + sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die 'sed failed' + fi + ./autogen.sh || die } diff --git a/net-irc/hexchat/hexchat-2.9.4.ebuild b/net-irc/hexchat/hexchat-2.9.4.ebuild index a9509ce13d3b..96b0f98df175 100644 --- a/net-irc/hexchat/hexchat-2.9.4.ebuild +++ b/net-irc/hexchat/hexchat-2.9.4.ebuild @@ -1,6 +1,6 @@ # 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.4.ebuild,v 1.11 2013/03/08 12:30:10 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.12 2013/03/09 11:18:42 pinkbyte Exp $ EAPI=5 @@ -50,6 +50,11 @@ src_prepare() { -i configure.ac || die 'sed failed' fi + # Fix to compile with USE=-gtk when there is no gtk installed + if ! use gtk ; then + sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die 'sed failed' + fi + mkdir "m4" || die "mkdir failed" ./autogen.sh || die "autogen.sh failed" } |