From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- x11-misc/xmountains/Manifest | 6 +++- .../files/xmountains-2.9-fno-common.patch | 20 ++++++++++++ .../xmountains/files/xmountains-2.9-global.patch | 26 ++++++++++++++++ .../xmountains/files/xmountains-2.9-main.patch | 11 +++++++ .../xmountains/files/xmountains-2.9-string.patch | 11 +++++++ x11-misc/xmountains/xmountains-2.9-r1.ebuild | 36 ++++++++++------------ 6 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 x11-misc/xmountains/files/xmountains-2.9-fno-common.patch create mode 100644 x11-misc/xmountains/files/xmountains-2.9-global.patch create mode 100644 x11-misc/xmountains/files/xmountains-2.9-main.patch create mode 100644 x11-misc/xmountains/files/xmountains-2.9-string.patch (limited to 'x11-misc/xmountains') diff --git a/x11-misc/xmountains/Manifest b/x11-misc/xmountains/Manifest index cfdae3010630..9854483c3df9 100644 --- a/x11-misc/xmountains/Manifest +++ b/x11-misc/xmountains/Manifest @@ -1,3 +1,7 @@ +AUX xmountains-2.9-fno-common.patch 532 BLAKE2B 01985319fdc0781ece1714ab3ee3a2caac6826cc49d733e1c85cbe6435a8cce797a2f1893051f2b391364bf420c604471138a9d337e3c0af621149f4b2b67a00 SHA512 b7e8d74ae1f90bfc032a132b4cf7d04a25995cc2154b561e5bfec3ee5bfe6598792e0ae169eb1b14a4e69fff4f3e2049f442d7812ff98eeb38d8953b5b487468 +AUX xmountains-2.9-global.patch 984 BLAKE2B ba8154a70f9e6bd96a0e70750ab36deb3d4663df6e5681d287273db195ee2049dc2f448769013f7c517e89fdf11bcef3802c62b7662bb814ee6e4a86dad53baa SHA512 8e0ff0972d143bdbe1f761d9b6c45ecbcb383ce256b8788f86ef4ea73557090edecc19516644f22ca4e8632fd9c9cb47e8f9dfd459c6f8a4eb839bd3300fe450 +AUX xmountains-2.9-main.patch 183 BLAKE2B 1b7e21c1b29b2dd90723b6781a720822b09f9e962f917822c6009dd537464bf6d0b8a2814ff6d58eb0cfc007ee6ab0f4ce374ecf5e0b2264db7c72d910aef757 SHA512 f249c0c9003b82ddde41b19759e9f744157362bfaf444e6106142f92d56564f5f4efe4666508aa08ec7de9d2293448b7b067498eb7c2987683cf97f98e5025e6 +AUX xmountains-2.9-string.patch 206 BLAKE2B 107932b5dc3fae88a0d046eca8f37e2094ad48bc98a4afbaab335237dac500797ce6bda5244ee29e52f2f16cbf1d344a2cff2c183efefd643a275aed8a65e59a SHA512 e40870b0ff1cbefbcfdf38e90515b0d02b1283fc5517d0c016f85b3e3d42c26148d1e323665b731949266eeebf8f8625586537ff489d7920dc0e4ec369245e91 DIST xmountains_2.9.tar.gz 27951 BLAKE2B f540196fab487dd7e73c3b39dd5233807fdc0f9c9409e6f68c56cabb26e0cc9287865ab497b08dbdc56661a3bcc0f6df03eed87b80f8ded56b2b9e4bd5cc9287 SHA512 635fe9ae6a53996bcc5c537499d3c74d8fef9a6d2a422fa7469637a6a20fb52de9fb20e265becc0d2dae3a1d1793a7fa7f33c9d4de62837639142b37b431b898 -EBUILD xmountains-2.9-r1.ebuild 920 BLAKE2B af4730cbe9db68d560a6470c9651e37e0b12c7ee956fc4f4c8b40f5187168f35a3e1bb2af09702ac16dbefdd30326bed9a4c2cd5f0be38dbf7ef8b652b6cd48e SHA512 411764768b7d1547df42288a4a0200d19180aae0fb5faf4a9ee0167bf68f5da6323c961922f04ad893b24c5d1f2fe43c086a9a5c51f9c1ebc6bde825e6a6f44e +EBUILD xmountains-2.9-r1.ebuild 844 BLAKE2B 8b0da5c5483c09d573222fe6738e9f06a59a529d6a177cf24b881cb9c959b13339ca56077a3f5438a4892ade284d80a777fec7f78f2cba3737342aae4938b97a SHA512 89c351970a453b5ec8811de87f12bcb4baa3ef79ef057b9a4661b861041214ca8925b8d2dc7b3cfd4ef2388a660fb8648bfe5607d0ab47c12f7749593467142b MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab diff --git a/x11-misc/xmountains/files/xmountains-2.9-fno-common.patch b/x11-misc/xmountains/files/xmountains-2.9-fno-common.patch new file mode 100644 index 000000000000..e7140ca4fada --- /dev/null +++ b/x11-misc/xmountains/files/xmountains-2.9-fno-common.patch @@ -0,0 +1,20 @@ +--- a/X_graphics.c ++++ b/X_graphics.c +@@ -10,7 +10,6 @@ + #include "paint.h" + char X_graphics_Id[]="$Id: X_graphics.c,v 1.26 2009/08/28 09:09:17 spb Exp $"; + +-char *display=NULL; /* name of display to open, NULL for default */ + char *geom=NULL; /* geometry of window, NULL for default */ + + Atom wm_protocols; +@@ -264,7 +263,8 @@ + graph_height = gptr->graph_height; + /*{{{open display*/ + +- dpy = XOpenDisplay(display); ++/* display to open, NULL for default */ ++ dpy = XOpenDisplay(NULL); + + if( ! dpy ) + { diff --git a/x11-misc/xmountains/files/xmountains-2.9-global.patch b/x11-misc/xmountains/files/xmountains-2.9-global.patch new file mode 100644 index 000000000000..65ef65fa2040 --- /dev/null +++ b/x11-misc/xmountains/files/xmountains-2.9-global.patch @@ -0,0 +1,26 @@ +--- a/Makefile.alt ++++ b/Makefile.alt +@@ -8,17 +8,17 @@ + + LOCAL_LIBRARIES = -lX11 + SYS_LIBRARIES = -lm +- SRCS = calcalt.c random.c artist.c global.c xmountains.c X_graphics.c print_alg.c +- OBJS = calcalt.o random.o artist.o global.o xmountains.o X_graphics.o print_alg.o +- HDRS = crinkle.h global.h paint.h patchlevel.h copyright.h ++ SRCS = calcalt.c random.c artist.c xmountains.c X_graphics.c print_alg.c ++ OBJS = calcalt.o random.o artist.o xmountains.o X_graphics.o print_alg.o ++ HDRS = crinkle.h paint.h patchlevel.h copyright.h + + xmountains: $(OBJS) + $(CC) $(LDFLAGS) -o xmountains $(OBJS) -lX11 -lm + + + calcalt.o: crinkle.h +-artist.o: global.h paint.h crinkle.h +-global.o: crinkle.h paint.h +-xmountains.o: paint.h global.h patchlevel.h copyright.h crinkle.h ++artist.o: paint.h crinkle.h ++: crinkle.h paint.h ++xmountains.o: paint.h patchlevel.h copyright.h crinkle.h + X_graphics.o: paint.h crinkle.h + diff --git a/x11-misc/xmountains/files/xmountains-2.9-main.patch b/x11-misc/xmountains/files/xmountains-2.9-main.patch new file mode 100644 index 000000000000..26297783c7ee --- /dev/null +++ b/x11-misc/xmountains/files/xmountains-2.9-main.patch @@ -0,0 +1,11 @@ +--- a/xmountains.c ++++ b/xmountains.c +@@ -144,7 +144,7 @@ + void seed_uni(int ijkl); + void plot_column(Graph *g); + +-main (argc,argv) ++int main (argc,argv) + int argc; + char **argv; + { diff --git a/x11-misc/xmountains/files/xmountains-2.9-string.patch b/x11-misc/xmountains/files/xmountains-2.9-string.patch new file mode 100644 index 000000000000..97540b2792e7 --- /dev/null +++ b/x11-misc/xmountains/files/xmountains-2.9-string.patch @@ -0,0 +1,11 @@ +--- a/xmountains.c ++++ b/xmountains.c +@@ -1,7 +1,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild b/x11-misc/xmountains/xmountains-2.9-r1.ebuild index 712987fe73bd..3ba1649dc3fd 100644 --- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild +++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild @@ -1,43 +1,39 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI=7 inherit toolchain-funcs -MY_P=${P/-/_} - DESCRIPTION="Fractal terrains of snow-capped mountains near water" HOMEPAGE="https://spbooth.github.io/xmountains/" -SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz" +SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${P/-/_}.tar.gz" LICENSE="HPND" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND=" x11-libs/libX11 - x11-misc/xbitmaps" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - + x11-misc/xbitmaps +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-2.9-fno-common.patch + "${FILESDIR}"/${PN}-2.9-global.patch + "${FILESDIR}"/${PN}-2.9-main.patch + "${FILESDIR}"/${PN}-2.9-string.patch +) S=${WORKDIR} -src_prepare() { - default - # add missing include for strcmp - sed -i xmountains.c -e '1a#include /* strcmp() */' || die - # remove obsolete references to global.* - sed -i Makefile.alt README -e 's|global\..||g' || die -} - src_compile() { emake \ -f Makefile.alt \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ + LDFLAGS="${CFLAGS} ${LDFLAGS}" \ ${PN} } -- cgit v1.2.3