diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 14:26:05 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 14:26:05 +0000 |
| commit | e45005fd8924c9d4e86a9402309decbf44b9eb28 (patch) | |
| tree | 350e65e43cbf6ed147002bfdf552853faf0cb770 /net-print | |
| parent | ppc stable #280080 (diff) | |
| download | gentoo-2-e45005fd8924c9d4e86a9402309decbf44b9eb28.tar.gz gentoo-2-e45005fd8924c9d4e86a9402309decbf44b9eb28.tar.bz2 gentoo-2-e45005fd8924c9d4e86a9402309decbf44b9eb28.zip | |
Fix building with GLIBC 2.10+ wrt #273833.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/xpp/ChangeLog | 8 | ||||
| -rw-r--r-- | net-print/xpp/files/xpp-glibc-2.10.patch | 12 | ||||
| -rw-r--r-- | net-print/xpp/xpp-1.5.ebuild | 10 |
3 files changed, 23 insertions, 7 deletions
diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog index e7d4ff12bed4..fd57e4b69b3a 100644 --- a/net-print/xpp/ChangeLog +++ b/net-print/xpp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/xpp -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.19 2008/12/15 02:05:01 yngwin Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.20 2009/08/09 14:26:04 ssuominen Exp $ + + 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> xpp-1.5.ebuild, + +files/xpp-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #273833. 15 Dec 2008; Ben de Groot <yngwin@gentoo.org> xpp-1.5.ebuild: Pinning fltk dep on slot 1.1, bug 246445 diff --git a/net-print/xpp/files/xpp-glibc-2.10.patch b/net-print/xpp/files/xpp-glibc-2.10.patch new file mode 100644 index 000000000000..dd58c0958b82 --- /dev/null +++ b/net-print/xpp/files/xpp-glibc-2.10.patch @@ -0,0 +1,12 @@ +diff -ur xpp-1.5.orig/xpp.cxx xpp-1.5/xpp.cxx +--- xpp-1.5.orig/xpp.cxx 2004-12-06 21:00:04.000000000 +0200 ++++ xpp-1.5/xpp.cxx 2009-08-09 17:27:01.000000000 +0300 +@@ -168,7 +168,7 @@ + { + char *tmp; + +- if ((tmp = strchr(dest,'/'))) { ++ if ((tmp = const_cast <char*> (strchr(dest,'/')))) { + tmp[0] = '\0'; + instance = tmp + 1; + } diff --git a/net-print/xpp/xpp-1.5.ebuild b/net-print/xpp/xpp-1.5.ebuild index 4fa9ce9cf538..4c4ed46c14a6 100644 --- a/net-print/xpp/xpp-1.5.ebuild +++ b/net-print/xpp/xpp-1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.7 2008/12/15 02:05:01 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.8 2009/08/09 14:26:04 ssuominen Exp $ EAPI="1" inherit eutils @@ -14,8 +14,7 @@ IUSE="" SLOT="0" LICENSE="GPL-2" -DEPEND="virtual/libc - >=net-print/cups-1.1.14 +DEPEND=">=net-print/cups-1.1.14 x11-libs/fltk:1.1 media-libs/jpeg media-libs/libpng @@ -27,7 +26,8 @@ DEPEND="virtual/libc src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/xpp-gcc4.patch" + epatch "${FILESDIR}"/xpp-gcc4.patch \ + "${FILESDIR}"/xpp-glibc-2.10.patch } src_compile() { |