summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-10-26 18:34:04 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-10-26 18:34:04 +0000
commite105f7b9fbcc320f0339fa0b6adb85d9eb4840ff (patch)
tree680b70afc9c1243239726ef611196b76f6e84eef
parent[profiles] Drop app-arch/cpio from system set - fixes bug 382633. (diff)
downloadgentoo-2-e105f7b9fbcc320f0339fa0b6adb85d9eb4840ff.tar.gz
gentoo-2-e105f7b9fbcc320f0339fa0b6adb85d9eb4840ff.tar.bz2
gentoo-2-e105f7b9fbcc320f0339fa0b6adb85d9eb4840ff.zip
Apply nx-3.5.0-libpng15.patch also to 3.4.0 wrt http://forums.gentoo.org/viewtopic-t-899336.html
(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
-rw-r--r--net-misc/nx/ChangeLog6
-rw-r--r--net-misc/nx/nx-3.4.0-r3.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 8db3fe925d57..8e7f7aae21fd 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/nx
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.62 2011/10/08 16:16:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.63 2011/10/26 18:34:04 ssuominen Exp $
+
+ 26 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> nx-3.4.0-r3.ebuild:
+ Apply nx-3.5.0-libpng15.patch also to 3.4.0 wrt
+ http://forums.gentoo.org/viewtopic-t-899336.html
08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> nx-3.5.0-r1.ebuild:
x86 stable wrt bug #385197
diff --git a/net-misc/nx/nx-3.4.0-r3.ebuild b/net-misc/nx/nx-3.4.0-r3.ebuild
index c3415a3fc340..45207a27b6b3 100644
--- a/net-misc/nx/nx-3.4.0-r3.ebuild
+++ b/net-misc/nx/nx-3.4.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.4.0-r3.ebuild,v 1.6 2011/06/30 14:50:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.4.0-r3.ebuild,v 1.7 2011/10/26 18:34:04 ssuominen Exp $
EAPI=2
inherit autotools eutils multilib
@@ -50,6 +50,7 @@ src_prepare() {
# Quiet some warnings
cd "${WORKDIR}"/nxcomp
epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
+ epatch "${FILESDIR}"/${PN}-3.5.0-libpng15.patch
# GCC 4.4 + glibc 2.10
epatch "${FILESDIR}"/${PN}-3.3.0-nxcomp-glibc2.10.patch