1 |
commit: 9caae14a07be903424c6b0b4c60c776c35bf89c6 |
2 |
Author: Alexey Sokolov <sokolov <AT> google <DOT> com> |
3 |
AuthorDate: Wed Sep 2 01:25:27 2020 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 6 20:59:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9caae14a |
7 |
|
8 |
games-puzzle/gnurobbo: version bump 0.68 |
9 |
|
10 |
Also import debian patch to fix build |
11 |
|
12 |
Closes: https://bugs.gentoo.org/711992 |
13 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
14 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
15 |
Closes: https://github.com/gentoo/gentoo/pull/17371 |
16 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
17 |
|
18 |
games-puzzle/gnurobbo/Manifest | 3 ++- |
19 |
.../gnurobbo/files/gnurobbo-0.66-underlink.patch | 18 ------------------ |
20 |
.../gnurobbo/files/gnurobbo-0.68-cflags-d.patch | 14 ++++++++++++++ |
21 |
.../{gnurobbo-0.66-r1.ebuild => gnurobbo-0.68.ebuild} | 17 ++++++++++++----- |
22 |
4 files changed, 28 insertions(+), 24 deletions(-) |
23 |
|
24 |
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest |
25 |
index 9c62a6dc283..79fab2bf4a5 100644 |
26 |
--- a/games-puzzle/gnurobbo/Manifest |
27 |
+++ b/games-puzzle/gnurobbo/Manifest |
28 |
@@ -1 +1,2 @@ |
29 |
-DIST gnurobbo-0.66-source.tar.gz 1765034 BLAKE2B 4a88d1281fdea44516c86e704a828e1d3ef2116cc7d6401960524ea53435828bb09f73adf57016bf3b7a0fa107ee411c575ca2f288375148658bf1bdf0b16aa2 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c |
30 |
+DIST gnurobbo-0.68-single-variable-declarations.patch 41708 BLAKE2B 05de30e26be4c927c0ec23b2e2b9ce40dd4ef115928fc297235f10740286e9668ac67ac48d78e9ec5b52ce4c61b196407e1a0c5cac3af4d65e7031a9c69246ea SHA512 e8a498983bd5a8174e851f317088852e3f1ea510efa2377b71b9fe43005403a163c468ff7fdbaca2bd15524f51234de595d87b7791d24d0e9b871d1772f06854 |
31 |
+DIST gnurobbo-0.68-source.tar.gz 2400364 BLAKE2B bfc97fef53b8dc35fd21131557ab7f679890f20b1635268241ff0364262d2fdf7070fd889b6ebc62af8ae8740f5520de3d411acb91158382d6be0ff19c62aaeb SHA512 cf2ebfa556bf9852142c83f9d6fc304ed973d02983179fda0a7db8af0951116b6327ec7bbb462541f2678d32d4d9760e80b1c82c98a64138b25596cf1e3d52f6 |
32 |
|
33 |
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch |
34 |
deleted file mode 100644 |
35 |
index af69bd9e1c9..00000000000 |
36 |
--- a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch |
37 |
+++ /dev/null |
38 |
@@ -1,18 +0,0 @@ |
39 |
---- a/Makefile.old 2011-06-20 21:19:49.578922392 +0200 |
40 |
-+++ b/Makefile 2011-06-20 21:20:28.535421648 +0200 |
41 |
-@@ -39,14 +39,13 @@ |
42 |
- CFLAGS?=-O3 -pipe |
43 |
- CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ |
44 |
- -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) |
45 |
--LDFLAGS= |
46 |
- # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers) |
47 |
- #CFLAGS?=-O0 -pipe -g -pg |
48 |
- #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ |
49 |
- # -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) |
50 |
- #LDFLAGS=-pg |
51 |
- LINK=$(CC) |
52 |
--LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) |
53 |
-+LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) -lm |
54 |
- |
55 |
- # You won't need to alter anything below |
56 |
- all: $(SOURCES) $(TARGET) |
57 |
|
58 |
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.68-cflags-d.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.68-cflags-d.patch |
59 |
new file mode 100644 |
60 |
index 00000000000..84a7567a788 |
61 |
--- /dev/null |
62 |
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.68-cflags-d.patch |
63 |
@@ -0,0 +1,14 @@ |
64 |
+Description: Drop -d which causes an error with GCC 7 |
65 |
+Author: Stephen Kitt <skitt@××××××.org> |
66 |
+ |
67 |
+--- a/Makefile |
68 |
++++ b/Makefile |
69 |
+@@ -61,7 +61,7 @@ |
70 |
+ |
71 |
+ |
72 |
+ |
73 |
+-CFLAGS+=-d -Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" $(SMOOTH_SCRL) $(LIGHTNING)\ |
74 |
++CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" $(SMOOTH_SCRL) $(LIGHTNING)\ |
75 |
+ -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) |
76 |
+ LDFLAGS?= |
77 |
+ # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers) |
78 |
|
79 |
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild |
80 |
similarity index 60% |
81 |
rename from games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild |
82 |
rename to games-puzzle/gnurobbo/gnurobbo-0.68.ebuild |
83 |
index 39a81fdcd79..0e48270ff56 100644 |
84 |
--- a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild |
85 |
+++ b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild |
86 |
@@ -1,17 +1,21 @@ |
87 |
-# Copyright 1999-2018 Gentoo Foundation |
88 |
+# Copyright 1999-2020 Gentoo Authors |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
|
91 |
-EAPI=6 |
92 |
+EAPI=7 |
93 |
inherit desktop |
94 |
|
95 |
DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux" |
96 |
HOMEPAGE="http://gnurobbo.sourceforge.net/" |
97 |
-SRC_URI="mirror://sourceforge/gnurobbo/${P}-source.tar.gz" |
98 |
+SRC_URI=" |
99 |
+ mirror://sourceforge/gnurobbo/${P}-source.tar.gz |
100 |
+ https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/0.68+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> ${P}-single-variable-declarations.patch |
101 |
+" |
102 |
|
103 |
LICENSE="GPL-2 BitstreamVera" |
104 |
SLOT="0" |
105 |
KEYWORDS="~amd64 ~x86" |
106 |
IUSE="" |
107 |
+S="${WORKDIR}/${P}/${PN}" |
108 |
|
109 |
RDEPEND=" |
110 |
media-libs/libsdl[sound,video,joystick] |
111 |
@@ -21,11 +25,14 @@ RDEPEND=" |
112 |
" |
113 |
DEPEND="${RDEPEND}" |
114 |
|
115 |
-PATCHES=( "${FILESDIR}"/${P}-underlink.patch ) |
116 |
+PATCHES=( |
117 |
+ "${FILESDIR}/${P}-cflags-d.patch" |
118 |
+ "${DISTDIR}/${P}-single-variable-declarations.patch" |
119 |
+) |
120 |
|
121 |
src_compile() { |
122 |
emake \ |
123 |
- PACKAGE_DATA_DIR="/usr/share/${PN}" \ |
124 |
+ PACKAGE_DATA_DIR="${EPREFIX}/usr/share/${PN}" \ |
125 |
BINDIR="/usr/bin" \ |
126 |
DOCDIR="/usr/share/doc/${PF}" |
127 |
} |