commit: 9caae14a07be903424c6b0b4c60c776c35bf89c6 Author: Alexey Sokolov <sokolov <AT> google <DOT> com> AuthorDate: Wed Sep 2 01:25:27 2020 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Sep 6 20:59:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9caae14a
games-puzzle/gnurobbo: version bump 0.68 Also import debian patch to fix build Closes: https://bugs.gentoo.org/711992 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/17371 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-puzzle/gnurobbo/Manifest | 3 ++- .../gnurobbo/files/gnurobbo-0.66-underlink.patch | 18 ------------------ .../gnurobbo/files/gnurobbo-0.68-cflags-d.patch | 14 ++++++++++++++ .../{gnurobbo-0.66-r1.ebuild => gnurobbo-0.68.ebuild} | 17 ++++++++++++----- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest index 9c62a6dc283..79fab2bf4a5 100644 --- a/games-puzzle/gnurobbo/Manifest +++ b/games-puzzle/gnurobbo/Manifest @@ -1 +1,2 @@ -DIST gnurobbo-0.66-source.tar.gz 1765034 BLAKE2B 4a88d1281fdea44516c86e704a828e1d3ef2116cc7d6401960524ea53435828bb09f73adf57016bf3b7a0fa107ee411c575ca2f288375148658bf1bdf0b16aa2 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c +DIST gnurobbo-0.68-single-variable-declarations.patch 41708 BLAKE2B 05de30e26be4c927c0ec23b2e2b9ce40dd4ef115928fc297235f10740286e9668ac67ac48d78e9ec5b52ce4c61b196407e1a0c5cac3af4d65e7031a9c69246ea SHA512 e8a498983bd5a8174e851f317088852e3f1ea510efa2377b71b9fe43005403a163c468ff7fdbaca2bd15524f51234de595d87b7791d24d0e9b871d1772f06854 +DIST gnurobbo-0.68-source.tar.gz 2400364 BLAKE2B bfc97fef53b8dc35fd21131557ab7f679890f20b1635268241ff0364262d2fdf7070fd889b6ebc62af8ae8740f5520de3d411acb91158382d6be0ff19c62aaeb SHA512 cf2ebfa556bf9852142c83f9d6fc304ed973d02983179fda0a7db8af0951116b6327ec7bbb462541f2678d32d4d9760e80b1c82c98a64138b25596cf1e3d52f6 diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch deleted file mode 100644 index af69bd9e1c9..00000000000 --- a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Makefile.old 2011-06-20 21:19:49.578922392 +0200 -+++ b/Makefile 2011-06-20 21:20:28.535421648 +0200 -@@ -39,14 +39,13 @@ - CFLAGS?=-O3 -pipe - CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ - -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) --LDFLAGS= - # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers) - #CFLAGS?=-O0 -pipe -g -pg - #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ - # -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) - #LDFLAGS=-pg - LINK=$(CC) --LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) -+LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) -lm - - # You won't need to alter anything below - all: $(SOURCES) $(TARGET) diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.68-cflags-d.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.68-cflags-d.patch new file mode 100644 index 00000000000..84a7567a788 --- /dev/null +++ b/games-puzzle/gnurobbo/files/gnurobbo-0.68-cflags-d.patch @@ -0,0 +1,14 @@ +Description: Drop -d which causes an error with GCC 7 +Author: Stephen Kitt <sk...@debian.org> + +--- a/Makefile ++++ b/Makefile +@@ -61,7 +61,7 @@ + + + +-CFLAGS+=-d -Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" $(SMOOTH_SCRL) $(LIGHTNING)\ ++CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" $(SMOOTH_SCRL) $(LIGHTNING)\ + -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) + LDFLAGS?= + # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers) diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild similarity index 60% rename from games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild rename to games-puzzle/gnurobbo/gnurobbo-0.68.ebuild index 39a81fdcd79..0e48270ff56 100644 --- a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild +++ b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild @@ -1,17 +1,21 @@ -# 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 desktop DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux" HOMEPAGE="http://gnurobbo.sourceforge.net/"; -SRC_URI="mirror://sourceforge/gnurobbo/${P}-source.tar.gz" +SRC_URI=" + mirror://sourceforge/gnurobbo/${P}-source.tar.gz + 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 +" LICENSE="GPL-2 BitstreamVera" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +S="${WORKDIR}/${P}/${PN}" RDEPEND=" media-libs/libsdl[sound,video,joystick] @@ -21,11 +25,14 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${P}-underlink.patch ) +PATCHES=( + "${FILESDIR}/${P}-cflags-d.patch" + "${DISTDIR}/${P}-single-variable-declarations.patch" +) src_compile() { emake \ - PACKAGE_DATA_DIR="/usr/share/${PN}" \ + PACKAGE_DATA_DIR="${EPREFIX}/usr/share/${PN}" \ BINDIR="/usr/bin" \ DOCDIR="/usr/share/doc/${PF}" }
