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 | c4030cae55d5a01659a3dd3d1eadcf9822ce38df (patch) | |
| tree | 288692693d22970fb8bf04e4251c5a5f62f1ebae /net-print/xpp | |
| parent | ppc stable #280080 (diff) | |
| download | historical-c4030cae55d5a01659a3dd3d1eadcf9822ce38df.tar.gz historical-c4030cae55d5a01659a3dd3d1eadcf9822ce38df.tar.bz2 historical-c4030cae55d5a01659a3dd3d1eadcf9822ce38df.zip | |
Fix building with GLIBC 2.10+ wrt #273833.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'net-print/xpp')
| -rw-r--r-- | net-print/xpp/ChangeLog | 8 | ||||
| -rw-r--r-- | net-print/xpp/Manifest | 5 | ||||
| -rw-r--r-- | net-print/xpp/files/xpp-glibc-2.10.patch | 12 | ||||
| -rw-r--r-- | net-print/xpp/xpp-1.5.ebuild | 10 |
4 files changed, 26 insertions, 9 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/Manifest b/net-print/xpp/Manifest index 26a6004e1351..a2839b5af728 100644 --- a/net-print/xpp/Manifest +++ b/net-print/xpp/Manifest @@ -1,7 +1,8 @@ AUX cups.diff 1254 RMD160 9ea69ce980bc1734ecbfabb9ffb6561d742291f2 SHA1 f30caaf6bf822655070dbeed604ca5faae9aee11 SHA256 4f15d4d53af3b10f889a196503e6c013dc01f93662bd1958e46ef0d7b71a788f AUX inputslider.h.patch 622 RMD160 77f0ced592ddf6d77d806ffe1b8f87cd5339d47b SHA1 b823be889c91271012062e31cd1f55e895e407af SHA256 4a8babc92dc06d5aca33b4267c95b7e5cf5b83133a3d85744ce512836aa0dfd3 AUX xpp-gcc4.patch 495 RMD160 8ec96cb332954380a3040915a6748311ad6c0d7c SHA1 ecf24161a4b276f7fc36e88610be5351bf06360d SHA256 0a3af70845f496e929537d2ebe011291e98d34b15bc90d6b09d9920e6ec06267 +AUX xpp-glibc-2.10.patch 368 RMD160 3327f4c12d525f5857cc67327d34f73c38e3f641 SHA1 e186e630873fb15a032572d61e20294e6175bd10 SHA256 072349dca84c0c956235e4f8c5d78d579da94be1dbdf2ea4a37bb2b9335b96ae DIST xpp-1.5.tar.gz 107755 RMD160 a64ec4c93013d1db08a6c9b6705b43850c36c337 SHA1 7f3c1427979516e47402a0acb708eb83b68daa61 SHA256 4d5b0c5467b10ababa4304c2fabf3f8cc7b715cc6a6a4844dc735bd7678a845d -EBUILD xpp-1.5.ebuild 935 RMD160 8c85bfba56aa8a5f852d1c8f3f1b6f640b1b34c1 SHA1 6fc4862cb6bf5a28e72aceac9cad842094efb274 SHA256 071d452911660bda9255f563c9cffbec5c0ac3ed84f0f746fce363eb80fd1acc -MISC ChangeLog 2753 RMD160 707563e7559b7827cc5e4f6ddca41a17ee05807f SHA1 144b5f8f76beb738ae4e2602bc9b5472b88ac61d SHA256 077a94853d5d14a3a1b357e458616e3a4a77c1dfe5d3e5d1358466779cbca9c3 +EBUILD xpp-1.5.ebuild 963 RMD160 6cbf9b3c1fc31855c87fdc9b297644b39413f853 SHA1 7d46b72ebf919f5a1ac520335096fe0507e7473e SHA256 2d2af64d1fcae80651ab68d41cf22ce56f5acaa48006b6bbf6ae065662db1161 +MISC ChangeLog 2903 RMD160 592e257a82e0019422472a827b1203fc1a43f6de SHA1 d47eeb85cb4d227426800a27a1793359b3dc2036 SHA256 06cae3b375a5ba716c436e266924f0c47c6260832ceab2b7506176b555e4cf24 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 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() { |