[gentoo-commits] repo/gentoo:master commit in: games-puzzle/neverball/, games-puzzle/neverball/files/

2020-02-03 Thread Sergei Trofimovich 
commit: 35da04f7cbcc863140405bff2922f1d296f0c32b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  3 20:32:32 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  3 20:32:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35da04f7

games-puzzle/neverball: tweak for gcc-10

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/708050
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../neverball/files/neverball-1.6.0-gcc-10.patch   | 42 ++
 games-puzzle/neverball/neverball-1.6.0-r1.ebuild   |  4 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch 
b/games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch
new file mode 100644
index 000..54bd211080c
--- /dev/null
+++ b/games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch
@@ -0,0 +1,42 @@
+From a42492b8db06934c7a794630db92e3ff6ebaadaa Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Mon, 3 Feb 2020 20:25:57 +
+Subject: [PATCH] share/text.h: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+cc .. -o neverball ...
+ld: ball/st_save.o:(.bss+0x0):
+  multiple definition of `text_input'; share/text.o:(.bss+0x0): first defined 
here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/708050
+Signed-off-by: Sergei Trofimovich 
+---
+ share/text.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/share/text.h
 b/share/text.h
+@@ -15,7 +15,7 @@ int text_length(const char *);
+ 
+ 
/*---*/
+ 
+-char text_input[MAXSTR];
++extern char text_input[MAXSTR];
+ 
+ void text_input_start(void (*cb)(int typing));
+ void text_input_stop(void);
+-- 
+2.25.0
+

diff --git a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild 
b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
index f2991bb60a7..de40b601028 100644
--- a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
+++ b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
sys-devel/gettext
 "
 
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
 src_prepare() {
default
sed -i \

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/neverball/, games-puzzle/neverball/files/

2015-12-16 Thread Michael Sterrett 
commit: 353f08f3e69746840366fad109547c82744b2859
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Dec 17 07:01:37 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Dec 17 07:01:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353f08f3

clean old (drops ppc support)

Package-Manager: portage-2.2.24

 games-puzzle/neverball/Manifest|  1 -
 .../neverball/files/neverball-1.5.4-libpng.patch   | 21 --
 .../neverball/files/neverball-1.5.4-lm.patch   | 28 
 .../files/neverball-1.5.4-underlink.patch  | 11 ---
 games-puzzle/neverball/neverball-1.5.4.ebuild  | 84 --
 5 files changed, 145 deletions(-)

diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
index 9160adc..7fe978a 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,2 +1 @@
-DIST neverball-1.5.4.tar.gz 26767623 SHA256 
ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6 SHA512 
ffc0473ea3882edb84f190aa696c2e5fa1a38ea50f73bc144a3b694fd80c71a8d9936aa34f8bbd096523493849d428928a6efd2650c6da4c9962e0355d3cb9c2
 WHIRLPOOL 
c0e6731ee28eb8ac987d5ca98ecbd93fb7d091060e2da51c6fe69043f05fe7d5f8179e62183f946e40b2f734a8041ab35ae1fdd4024e5ff6e25ab8633853e1f4
 DIST neverball-1.6.0.tar.gz 37772911 SHA256 
73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0 SHA512 
174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
 WHIRLPOOL 
017ac177b3557e0473d94288c0645ce7e6ddf15cdfbddb6798b22a6341d9864532d0d2263ed785bbed8c1bf5c9e4acbc6e31effdcc06b299a8fcf7c1fa60e514

diff --git a/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch 
b/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
deleted file mode 100644
index d7b2246..000
--- a/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: neverball-1.5.4/share/base_image.c
-===
 neverball-1.5.4.orig/share/base_image.c
-+++ neverball-1.5.4/share/base_image.c
-@@ -15,6 +15,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #include "glext.h"
-@@ -94,7 +95,7 @@ static void *image_load_png(const char *
- default: longjmp(png_jmpbuf(readp), -1);
- }
- 
--if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep
-+if (!(bytep = png_malloc(readp, h * sizeof(png_bytep
- longjmp(png_jmpbuf(readp), -1);
- 
- /* Allocate the final pixel buffer and read pixels there. */

diff --git a/games-puzzle/neverball/files/neverball-1.5.4-lm.patch 
b/games-puzzle/neverball/files/neverball-1.5.4-lm.patch
deleted file mode 100644
index 4245e28..000
--- a/games-puzzle/neverball/files/neverball-1.5.4-lm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix link faiure against -lm
-
-x86_64-pc-linux-gnu-gcc -Wall -ansi -pedantic -march=core2 -O2 -pipe -ggdb -o 
neverball-mapc share/vec3.o share/base_image.o share/solid.o share/binary.o 
share/base_config.o share/common.o share/fs.o share/fs_png.o share/fs_jpg.o 
share/dir.o share/array.o share/mapc.o -Wl,-O1 -Wl,--as-needed -ljpeg -lpng15 
-lphysfs
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: 
share/mapc.o: undefined reference to symbol 'acosf@@GLIBC_2.2.5'
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: 
note: 'acosf@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it 
to the linker command line
-
-Gentoo-bug: http://bugs.gentoo.org/464014
-diff --git a/Makefile b/Makefile
-index 62a87e9..1816707 100644
 a/Makefile
-+++ b/Makefile
-@@ -132,6 +132,7 @@ ifdef DARWIN
- endif
- 
- BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
-+MAPC_LIBS := -lm # only acosf user
- 
- ifdef DARWIN
- BASE_LIBS += -L/opt/local/lib
-@@ -318,7 +319,7 @@ $(PUTT_TARG) : $(PUTT_OBJS)
-   $(CC) $(ALL_CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LDFLAGS) $(ALL_LIBS)
- 
- $(MAPC_TARG) : $(MAPC_OBJS)
--  $(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(BASE_LIBS)
-+  $(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) 
$(MAPC_LIBS) $(BASE_LIBS)
- 
- # Work around some extremely helpful sdl-config scripts.
- 

diff --git a/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch 
b/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch
deleted file mode 100644
index c6f27cc..000
--- a/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 Makefile.old   2011-06-22 06:30:52.441788160 +0200
-+++ Makefile   2011-06-22 06:31:59.754087534 +0200
-@@ -138,7 +138,7 @@
- endif
- 
- ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
---lvorbisfile $(OGL_LIBS)
-+-lvorbisfile $(OGL_LIBS) -lX11
- 
- 
#--