diff options
Diffstat (limited to 'games-puzzle/neverball')
-rw-r--r-- | games-puzzle/neverball/Manifest | 3 | ||||
-rw-r--r-- | games-puzzle/neverball/files/neverball-1.6.0-gcc-10.patch | 42 | ||||
-rw-r--r-- | games-puzzle/neverball/neverball-1.6.0-r1.ebuild | 4 |
3 files changed, 47 insertions, 2 deletions
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest index ef9bcc0eaabe..b37763b18d21 100644 --- a/games-puzzle/neverball/Manifest +++ b/games-puzzle/neverball/Manifest @@ -1,3 +1,4 @@ +AUX neverball-1.6.0-gcc-10.patch 1174 BLAKE2B 21c1c9ef20bea6a4912b6195ec470342a64ee0105748bffefefac49f3cc53ea21555f234c944b9ac6c3a484402cb41bb777f932f6809731d2b5407dab8b2dbf4 SHA512 b48a657ab19b3249bbc5ee556ade4b2539cacab116f2e315f53b7aba1d0d13cace4483263e0b9ccafeee03fa78190cb9ea421349f89a6ddbb58cb95b193b14f2 DIST neverball-1.6.0.tar.gz 37772911 BLAKE2B c9ebf9b5e87665055d3c09b93ffa71d8bf9b953b8a4b9ab7a0e7667c5521c94c80fa66c8df496066434b25319f7d22498ad19fa52e5ffee71ff4ee25188e3c41 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787 -EBUILD neverball-1.6.0-r1.ebuild 1994 BLAKE2B 4ea20e44571cffddd17e7f972e59f8bce89c5838ca4aaa6e8812ae510b7015f5ae1d927d111f5ef4df2924bfb144ed0fb57b2cdfbe0baafe1d74efb597d5793e SHA512 8d0d793fcca8fd5268c3d84fb1f4a8a6c8b66e04dd2092c3de41f9c19b74a0f1be26eb9721419f38010ff799ab676af30fe47676a3214e8fc3a087f7dbf9e448 +EBUILD neverball-1.6.0-r1.ebuild 2034 BLAKE2B 76e6fa7b897223befeb518fd0bede2d5a266a67e815a3957b47657c1385bafd65319f5743d0512c6892bb987958a23941b8ac9d60f995992a52d31848400bca4 SHA512 259fd9d22fa30802aece13358234a69c752beadb457f6e3e8f23e7265b37894411cfc55495cabb5af676386f69372758f8f3b9eec5f2c06f1ab0f7fac49d4bc9 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 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 000000000000..54bd211080c6 --- /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 <slyfox@gentoo.org> +Date: Mon, 3 Feb 2020 20:25:57 +0000 +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 <slyfox@gentoo.org> +--- + 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 f2991bb60a72..de40b601028e 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 \ |