[gentoo-commits] repo/gentoo:master commit in: games-arcade/berusky/, games-arcade/berusky/files/
commit: a9e380dae81591f4dac0ac8d658b54e7e3ae79db
Author: Sam James gentoo org>
AuthorDate: Mon Feb 6 21:59:56 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 6 21:59:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e380da
games-arcade/berusky: fix build w/ gcc 12
Closes: https://bugs.gentoo.org/890361
Signed-off-by: Sam James gentoo.org>
games-arcade/berusky/berusky-1.7.1-r2.ebuild | 3 ++-
.../files/berusky-1.7.1-missing-includes.patch | 22 ++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/games-arcade/berusky/berusky-1.7.1-r2.ebuild
b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
index 65f429dfe17f..f50ada36626b 100644
--- a/games-arcade/berusky/berusky-1.7.1-r2.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,6 +26,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.7.1-r2-gentoo.patch
+ "${FILESDIR}"/${PN}-1.7.1-missing-includes.patch
)
src_prepare() {
diff --git a/games-arcade/berusky/files/berusky-1.7.1-missing-includes.patch
b/games-arcade/berusky/files/berusky-1.7.1-missing-includes.patch
new file mode 100644
index ..a44d142b7307
--- /dev/null
+++ b/games-arcade/berusky/files/berusky-1.7.1-missing-includes.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/890361
+--- a/src/level_game.cpp
b/src/level_game.cpp
+@@ -27,6 +27,8 @@
+
+ #include "portability.h"
+
++#include
++#include
+ #ifdef LINUX
+ #include
+ #endif // LINUX
+--- a/src/level_game.h
b/src/level_game.h
+@@ -28,6 +28,7 @@
+ #ifndef __LEVEL_GAME_H__
+ #define __LEVEL_GAME_H__
+
++#include
+ #include
+ #include "stack.h"
+
[gentoo-commits] repo/gentoo:master commit in: games-arcade/berusky/, games-arcade/berusky/files/
commit: 689665a811a72189bcb6ea55363097db738c9810
Author: Sam James gentoo org>
AuthorDate: Sun Apr 25 19:12:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 25 19:13:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689665a8
games-arcade/berusky: install data files again
This was lost a few years ago in the games.eclass porting. Only now did
somebody notice!
Closes: https://bugs.gentoo.org/785259
Signed-off-by: Sam James gentoo.org>
...sky-1.7.1-r1.ebuild => berusky-1.7.1-r2.ebuild} | 31 ++
.../berusky/files/berusky-1.7.1-r2-gentoo.patch| 47 ++
2 files changed, 71 insertions(+), 7 deletions(-)
diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild
b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
similarity index 62%
rename from games-arcade/berusky/berusky-1.7.1-r1.ebuild
rename to games-arcade/berusky/berusky-1.7.1-r2.ebuild
index 57077ecfc39..66d347e826c 100644
--- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit desktop gnome2
DATAFILE="${PN}-data-1.7"
@@ -14,20 +15,36 @@ SRC_URI="https://www.anakreon.cz/download/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="
media-libs/libsdl[X,video]
media-libs/sdl-image[png]
x11-libs/gtk+:2
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.1-r1-gentoo.patch
+)
+
+src_prepare() {
+ mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . || die
+
+ default
+}
src_install() {
gnome2_src_install
- rm -rf "${ED}"/usr/doc
+
+ rm -rf "${ED}"/usr/doc || die
+
+ insinto /usr/share/${PN}
+ doins -r GameData Graphics Levels
+
+ insinto /var/lib/${PN}
+ doins berusky.ini
+
doicon -s 32 "${DISTDIR}"/${PN}.png
make_desktop_entry ${PN}
}
diff --git a/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch
b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch
new file mode 100644
index 000..6fd1381ad2a
--- /dev/null
+++ b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch
@@ -0,0 +1,47 @@
+--- a/Makefile.am
b/Makefile.am
+@@ -5,8 +5,7 @@
+
+ SUBDIRS = po src data
+
+-beruskydocdir = ${prefix}/doc/berusky
+-beruskydoc_DATA = \
++EXTRA_DIST = \
+ README\
+ COPYING\
+ AUTHORS\
+@@ -15,10 +14,6 @@
+ NEWS\
+ TODO
+
+-EXTRA_DIST = $(beruskydoc_DATA)
+-
+-
+-
+ # Copy all the spec files. Of cource, only one is actually used.
+ dist-hook:
+ for specfile in *.spec; do \
+--- a/data/Makefile.am
b/data/Makefile.am
+@@ -3,10 +3,3 @@
+ ## Created by Anjuta - will be overwritten
+ ## If you don't want it to overwrite it,
+ ##Please disable it in the Anjuta project configuration
+-
+-berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@
+-
+-berusky_data_DATA = \
+- berusky.ini
+-
+-EXTRA_DIST = $(berusky_data_DATA)
+--- a/src/defines.h
b/src/defines.h
+@@ -446,7 +446,7 @@
+ #define INI_USER_DIRECTORY "~/.berusky"
+ #define INI_USER_LEVELS"~/.berusky/User"
+ #define INI_USER_PROFILES "~/.berusky/Profiles"
+-#define INI_FILE_GLOBAL"/var/games/berusky/"INI_FILE_NAME
++#define INI_FILE_GLOBAL"/var/lib/berusky/"INI_FILE_NAME
+ #define INI_FILE_USER "~/.berusky/"INI_FILE_NAME
+ #define INI_FILE_LOCAL "./"INI_FILE_NAME
+ #elif WINDOWS
[gentoo-commits] repo/gentoo:master commit in: games-arcade/berusky/, games-arcade/berusky/files/
commit: 419f5a96488fecf5b71b312906425bd3527c95a7
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Apr 15 12:03:41 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Apr 15 12:08:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419f5a96
games-arcade/berusky: Drop old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-arcade/berusky/berusky-1.7.1.ebuild | 61 ---
.../berusky/files/berusky-1.7.1-gentoo.patch | 71 --
2 files changed, 132 deletions(-)
diff --git a/games-arcade/berusky/berusky-1.7.1.ebuild
b/games-arcade/berusky/berusky-1.7.1.ebuild
deleted file mode 100644
index 93f816e6bc8..000
--- a/games-arcade/berusky/berusky-1.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils gnome2-utils games
-
-DATAFILE=${PN}-data-1.7
-DESCRIPTION="free logic game based on an ancient puzzle named Sokoban"
-HOMEPAGE="http://anakreon.cz/?q=node/1";
-SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz
- http://www.anakreon.cz/download/${DATAFILE}.tar.gz
- https://dev.gentoo.org/~hasufell/distfiles/${PN}.png";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[X,video]
- media-libs/sdl-image[png]
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . || die
- epatch "${FILESDIR}"/${P}-gentoo.patch
- sed -i \
- -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
- -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
- src/defines.h berusky.ini \
- || die
- sed -i \
- -e "/AC_INIT/s/configure.in/${PN}, ${PV}/" \
- configure.in || die
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_install() {
- default
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r berusky.ini GameData Graphics Levels
- doicon -s 32 "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN}
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-arcade/berusky/files/berusky-1.7.1-gentoo.patch
b/games-arcade/berusky/files/berusky-1.7.1-gentoo.patch
deleted file mode 100644
index f26c233c39e..000
--- a/games-arcade/berusky/files/berusky-1.7.1-gentoo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
Makefile.am
-+++ Makefile.am
-@@ -5,8 +5,7 @@
-
- SUBDIRS = po src data
-
--beruskydocdir = ${prefix}/doc/berusky
--beruskydoc_DATA = \
-+EXTRA_DIST = \
- README\
- COPYING\
- AUTHORS\
-@@ -15,10 +14,6 @@
- NEWS\
- TODO
-
--EXTRA_DIST = $(beruskydoc_DATA)
--
--
--
- # Copy all the spec files. Of cource, only one is actually used.
- dist-hook:
- for specfile in *.spec; do \
data/Makefile.am
-+++ data/Makefile.am
-@@ -3,10 +3,3 @@
- ## Created by Anjuta - will be overwritten
- ## If you don't want it to overwrite it,
- ##Please disable it in the Anjuta project configuration
--
--berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@
--
--berusky_data_DATA = \
-- berusky.ini
--
--EXTRA_DIST = $(berusky_data_DATA)
berusky.ini
-+++ berusky.ini
-@@ -1,9 +1,9 @@
- # Configuration for berusky game
-
- # Game data location
--level_data = /usr/share/berusky/Levels
--game_data = /usr/share/berusky/GameData
--graphics_data = /usr/share/berusky/Graphics
-+level_data = @GENTOO_DATADIR@/Levels
-+game_data = @GENTOO_DATADIR@/GameData
-+graphics_data = @GENTOO_DATADIR@/Graphics
-
- # Graphics settings for game and editor
- # game runs in 640x480
-@@ -17,7 +17,7 @@
-
- # Game binary & tmp dir
- # they're used by editor for "run level" command
--game_binary = /usr/bin/berusky
-+game_binary = @GENTOO_BINDIR@/berusky
- tmp_data = /var/tmp
-
- # Dir for users levels (it's the default level dir for level editor)
src/defines.h
-+++ src/defines.h
-@@ -446,7 +446,7 @@
- #define INI_USER_DIRECTORY "~/.berusky"
- #define INI_USER_LEVELS"~/.berusky/User"
- #define INI_USER_PROFILES "~/.berusky/Profiles"
--#define INI_FILE_GLOBAL"/var/games/berusky/"INI_FILE_NAME
-+#define INI_FILE_GLOBAL"@GENTOO_DATADIR@/"INI_FILE_NAME
- #define INI_FILE_USER "~/.berusky/"INI_FILE_NAME
- #define INI_FILE_LOCAL "./"INI_FILE_NAME
- #elif WINDOWS
