[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/files/
commit: 4c0a71cc4d4a4ce8b123112c691d7677dee25cf2 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Jan 27 04:27:54 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Jan 27 04:29:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0a71cc x11-misc/xmountains: Replace local patch with upstream patch Upstream commit at https://github.com/spbooth/xmountains/commit/e530b35948da644a190847b2e6ebe08fd38f6d4a Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/xmountains/files/xmountains-2.9-global.patch | 2 +- x11-misc/xmountains/files/xmountains-2.9-string.patch | 11 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/x11-misc/xmountains/files/xmountains-2.9-global.patch b/x11-misc/xmountains/files/xmountains-2.9-global.patch index 77ce47ac4eb..65ef65fa204 100644 --- a/x11-misc/xmountains/files/xmountains-2.9-global.patch +++ b/x11-misc/xmountains/files/xmountains-2.9-global.patch @@ -1,4 +1,4 @@ a/Makefile.alt.JeR +--- a/Makefile.alt +++ b/Makefile.alt @@ -8,17 +8,17 @@ diff --git a/x11-misc/xmountains/files/xmountains-2.9-string.patch b/x11-misc/xmountains/files/xmountains-2.9-string.patch index c78569a2116..97540b2792e 100644 --- a/x11-misc/xmountains/files/xmountains-2.9-string.patch +++ b/x11-misc/xmountains/files/xmountains-2.9-string.patch @@ -1,8 +1,11 @@ a/xmountains.c.JeR +--- a/xmountains.c +++ b/xmountains.c -@@ -1,4 +1,5 @@ +@@ -1,7 +1,7 @@ -+#include /* strcmp() */ #include #include - #include +-#include ++#include + #include + #include + #include
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/, x11-misc/xmountains/files/
commit: 610599d8a8ea30956f5c9ce12db2d2f221dc4b34
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Jan 27 04:20:45 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Jan 27 04:21:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610599d8
x11-misc/xmountains: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706606
Signed-off-by: Jeroen Roovers gentoo.org>
.../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 | 8 +
x11-misc/xmountains/xmountains-2.9-r1.ebuild | 36 ++
5 files changed, 81 insertions(+), 20 deletions(-)
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 000..e7140ca4fad
--- /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 000..77ce47ac4eb
--- /dev/null
+++ b/x11-misc/xmountains/files/xmountains-2.9-global.patch
@@ -0,0 +1,26 @@
+--- a/Makefile.alt.JeR
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 000..26297783c7e
--- /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 000..c78569a2116
--- /dev/null
+++ b/x11-misc/xmountains/files/xmountains-2.9-string.patch
@@ -0,0 +1,8 @@
+--- a/xmountains.c.JeR
b/xmountains.c
+@@ -1,4 +1,5 @@
+
++#include /* strcmp() */
+ #include
+ #include
+ #include
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index 712987fe73b..3ba1649dc3f 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
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/
commit: 8f8ea308d162483cefd6476ea05cd3bfe745e1a5
Author: Harri Nieminen gmail com>
AuthorDate: Tue Mar 28 18:31:52 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Apr 1 10:23:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8ea308
x11-misc/xmountains: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4319
x11-misc/xmountains/xmountains-2.9.ebuild | 45 ---
1 file changed, 45 deletions(-)
diff --git a/x11-misc/xmountains/xmountains-2.9.ebuild
b/x11-misc/xmountains/xmountains-2.9.ebuild
deleted file mode 100644
index 6a7c0b6cd9c..000
--- a/x11-misc/xmountains/xmountains-2.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Fractal terrains of snow-capped mountains near water"
-HOMEPAGE="http://www.epcc.ed.ac.uk/~spb/xmountains/;
-SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz;
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-misc/xbitmaps
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- x11-proto/xproto"
-
-S=${WORKDIR}
-
-src_prepare() {
- # 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}" \
- ${PN}
-}
-
-src_install() {
- dobin ${PN}
- dodoc README
- newman ${PN}.man ${PN}.1
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/
commit: 5c7d45af63b6e53e33b85bf546cda9cf4d0fa54b
Author: Michael Weber gentoo org>
AuthorDate: Tue Mar 21 15:33:44 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Wed Mar 22 07:29:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c7d45af
x11-misc/xmountains: ppc stable (bug 613104)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"
x11-misc/xmountains/xmountains-2.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index 7f797aef7ba..b3e18f2cd2b 100644
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/
commit: 3e2f059e96bc3210324d7fceeadba0bbc98aa799
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Mar 21 14:32:29 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Mar 21 14:32:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2f059e
x11-misc/xmountains: x86 stable wrt bug #613104
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xmountains/xmountains-2.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index d258ff3fe58..7f797aef7ba 100644
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/
commit: dd805f4a7a1d759784cffd88388ac79a16fda42c
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 20 11:03:28 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 20 11:03:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd805f4a
x11-misc/xmountains: amd64 stable wrt bug #613104
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/xmountains/xmountains-2.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index 7bf5d4f892c..d258ff3fe58 100644
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz;
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xmountains/
commit: b4f8b8fae3ad4f7337ca9b8cb1a7a19a559049b2
Author: Harri Nieminen gmail com>
AuthorDate: Thu Mar 2 09:10:01 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Mar 4 15:18:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f8b8fa
x11-misc/xmountains: EAPI bump 4 -> 6
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4098
x11-misc/xmountains/xmountains-2.9-r1.ebuild | 48
1 file changed, 48 insertions(+)
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
new file mode 100644
index 000..7bf5d4f892c
--- /dev/null
+++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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;
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+ x11-libs/libX11
+ x11-misc/xbitmaps"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+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}" \
+ ${PN}
+}
+
+src_install() {
+ dobin ${PN}
+ newman ${PN}.man ${PN}.1
+ einstalldocs
+}
