diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-12-28 00:09:58 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-12-28 00:09:58 +0000 |
| commit | 53297825d1bed34e400d831e1641c8d1a928deb4 (patch) | |
| tree | feedb49b92dbe052e7949a540241e509b1236008 /x11-misc/xrmap | |
| parent | Drop pointless gksu/kdesu dependency (bug 486442); major ebuild cleanup; remo... (diff) | |
| download | gentoo-2-53297825d1bed34e400d831e1641c8d1a928deb4.tar.gz gentoo-2-53297825d1bed34e400d831e1641c8d1a928deb4.tar.bz2 gentoo-2-53297825d1bed34e400d831e1641c8d1a928deb4.zip | |
Bug #426206: compile-fix for newer zlib & GCC.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-misc/xrmap')
| -rw-r--r-- | x11-misc/xrmap/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xrmap/files/xrmap-2.33-zlib.patch | 20 | ||||
| -rw-r--r-- | x11-misc/xrmap/xrmap-2.33-r1.ebuild | 7 |
3 files changed, 30 insertions, 6 deletions
diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog index ca2ebbe12cf6..64db7967691e 100644 --- a/x11-misc/xrmap/ChangeLog +++ b/x11-misc/xrmap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xrmap -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.23 2011/10/08 16:45:18 phajdan.jr Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.24 2013/12/28 00:09:57 robbat2 Exp $ + + 28 Dec 2013; Robin H. Johnson <robbat2@gentoo.org> + +files/xrmap-2.33-zlib.patch, xrmap-2.33-r1.ebuild: + Bug #426206: compile-fix for newer zlib & GCC. 08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xrmap-2.33-r1.ebuild: x86 stable wrt bug #385981 @@ -93,4 +97,3 @@ 06 Mar 2004; Markus Nigbur <pyrania@gentoo.org> xrmap-2.10.ebuild: Initial import. - diff --git a/x11-misc/xrmap/files/xrmap-2.33-zlib.patch b/x11-misc/xrmap/files/xrmap-2.33-zlib.patch new file mode 100644 index 000000000000..8b7301b7b61e --- /dev/null +++ b/x11-misc/xrmap/files/xrmap-2.33-zlib.patch @@ -0,0 +1,20 @@ +--- xrmap-2.33.orig/earthview/earthview.c 2005-07-12 06:56:41.000000000 -0700 ++++ xrmap-2.33/earthview/earthview.c 2013-12-27 15:59:14.068667773 -0800 +@@ -96,7 +96,7 @@ + char *data_file = NULL; + char *cps_file, *cps_dir; + FILE *fd = NULL; +-gzFile *gzd = NULL; ++gzFile gzd = NULL; + + /* Predefined color schemes */ + /* You can of course add as many as you like... */ +@@ -212,7 +212,7 @@ + return n; + } + +-int ngzread(gzFile *gzd) ++int ngzread(gzFile gzd) + { + unsigned char c; + int n; diff --git a/x11-misc/xrmap/xrmap-2.33-r1.ebuild b/x11-misc/xrmap/xrmap-2.33-r1.ebuild index 4a108aa2fa95..4ba405ce42fa 100644 --- a/x11-misc/xrmap/xrmap-2.33-r1.ebuild +++ b/x11-misc/xrmap/xrmap-2.33-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.3 2011/10/08 16:45:18 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.4 2013/12/28 00:09:57 robbat2 Exp $ EAPI=2 inherit eutils toolchain-funcs @@ -47,7 +47,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-Makefile.kit.patch \ "${FILESDIR}"/${P}-as-needed.patch \ "${FILESDIR}"/${P}-parallel-make.patch \ - "${FILESDIR}"/${P}-libpng15.patch + "${FILESDIR}"/${P}-libpng15.patch \ + "${FILESDIR}"/${P}-zlib.patch sed -e 's,^\(X11DIR=\).*,\1/usr/,g' \ -e 's,^\(EDITOR=\).*,\1less,g' \ |