* [gentoo-commits] repo/gentoo:master commit in: games-rpg/freedroidrpg/, games-rpg/freedroidrpg/files/
@ 2020-09-13 12:50 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2020-09-13 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 8debeb4149f2bd0d067b7fbc6b3235ff69f4ed0c
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sat Sep 12 22:42:58 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 12:49:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8debeb41
games-rpg/freedroidrpg: fix build on gcc 10
And fix prefix and add py3.8
Closes: https://bugs.gentoo.org/706930
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17516
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/freedroidrpg-1.0_rc2-fnocommon.patch | 49 ++++++++++++++++++++++
games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild | 9 +++-
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch b/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
new file mode 100644
index 00000000000..fd8bc4f9293
--- /dev/null
+++ b/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
@@ -0,0 +1,49 @@
+Fixes build. https://bugs.gentoo.org/706930#c8
+
+--- freedroidrpg-1.0RC2/src/global.h 2019-03-30 23:20:31.000000000 +1000
++++ freedroidrpg-1.0RC2/src/global.h 2020-06-21 20:51:01.566218463 +1000
+@@ -36,7 +36,6 @@
+ #define INTERN_FOR _main_c
+ #include "extint_macros.h"
+
+-EXTERN float FPSover1;
+ EXTERN char *AllSkillTexts[];
+ EXTERN char font_switchto_red[];
+ EXTERN char font_switchto_blue[];
+--- freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h 2019-03-30 23:20:31.000000000 +1000
++++ freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h 2020-06-21 20:41:58.424710693 +1000
+@@ -36,7 +36,7 @@
+
+ void leveleditor_init_tools(void);
+
+-struct leveleditor_tool tool_place, tool_move, tool_select;
++EXTERN struct leveleditor_tool tool_place, tool_move, tool_select;
+
+ #define EVENT_LEFT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 1))
+ #define EVENT_RIGHT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 3))
+--- freedroidrpg-1.0RC2/src/mapgen/mapgen.h 2019-03-30 23:20:31.000000000 +1000
++++ freedroidrpg-1.0RC2/src/mapgen/mapgen.h 2020-06-21 20:43:53.255723534 +1000
+@@ -64,9 +64,9 @@
+ extern int total_rooms;
+
+ // Interface to the game
+-void (*dungeonmap_convert) (int, int, unsigned char *);
+-void (*dungeonmap_place_enemies) (struct roominfo *);
+-void (*dungeonmap_gift) (struct roominfo *);
++extern void (*dungeonmap_convert) (int, int, unsigned char *);
++extern void (*dungeonmap_place_enemies) (struct roominfo *);
++extern void (*dungeonmap_gift) (struct roominfo *);
+
+ int generate_dungeon_gram(int, int);
+
+--- freedroidrpg-1.0RC2/src/struct.h 2019-05-13 01:03:36.000000000 +1000
++++ freedroidrpg-1.0RC2/src/struct.h 2020-06-21 20:38:22.189812908 +1000
+@@ -1063,7 +1063,7 @@
+ struct tux_part_instances default_instances; // Default part instances
+ tux_part_render_motionclass *render_order; // The render_sets of each motion class
+ int gun_muzzle_height; // Vertical offset to apply to bullets
+-} tux_rendering;
++};
+
+ /**
+ * Contains a set of Tux's parts images for a motion class.
diff --git a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
index a78a6e42162..e132d4f54ac 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit autotools flag-o-matic desktop python-any-r1 xdg
MY_PV=$(ver_rs 2 '')
@@ -37,6 +38,10 @@ BDEPEND="
S="${WORKDIR}/${PN}-${MY_PV^^}"
+PATCHES=(
+ "${FILESDIR}/${P}-fnocommon.patch"
+)
+
src_prepare() {
default
@@ -56,7 +61,7 @@ src_configure() {
local myconf=(
--disable-fastmath
--with-embedded-lua
- --localedir=/usr/share/locale
+ --localedir="${EPREFIX}/usr/share/locale"
$(use_enable nls)
$(use_enable opengl)
$(use_enable sound)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-rpg/freedroidrpg/, games-rpg/freedroidrpg/files/
@ 2022-11-16 18:57 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-11-16 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 679d3e745b2df3d3a0dd23bd143baec761da965a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 18:23:52 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 18:56:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679d3e74
games-rpg/freedroidrpg: drop vulnerable 1.0_rc2-r1
Bug: https://bugs.gentoo.org/729326
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-rpg/freedroidrpg/Manifest | 1 -
.../files/freedroidrpg-1.0_rc2-fnocommon.patch | 49 ------------
.../freedroidrpg/freedroidrpg-1.0_rc2-r1.ebuild | 88 ----------------------
3 files changed, 138 deletions(-)
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 8d38b9e3f491..0ac1d2328fcd 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,2 +1 @@
-DIST freedroidRPG-1.0rc2.tar.gz 233852127 BLAKE2B c87c2314d17037873acf4fc24ce20790c9ec40c8f7b1ea27e6ab9c543abb671bc50b3ff5b86900f7111d1f1a899213dcb90529d2e39918801c9cc3a42585f02e SHA512 a79afdb089691dd59b0128f34f7068c69fac8c057a0485bca3275f4914b1c9c0f21cbb9102ecdc99911b70456c078dbdeb8981fd7714836cd9535677bcc4d1e7
DIST freedroidRPG-1.0rc3.tar.gz 237674000 BLAKE2B 44031686ccd9af3bb082ec9cd2bf233792d2b1019a35b0fc2585df39a05b678ef784f9ff5861fbbcfe7ea624a338f6ab28f855158b7c1d18d52fa9e410410d7d SHA512 51125619fb57f8cb16746b3ff100175ab7917c567c8b1efcbc1aebc80a4774501a934b2fd544d65f1420212f9043015c2b88f08d785e765a30ce478157d887fd
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch b/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
deleted file mode 100644
index fd8bc4f9293c..000000000000
--- a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fixes build. https://bugs.gentoo.org/706930#c8
-
---- freedroidrpg-1.0RC2/src/global.h 2019-03-30 23:20:31.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/global.h 2020-06-21 20:51:01.566218463 +1000
-@@ -36,7 +36,6 @@
- #define INTERN_FOR _main_c
- #include "extint_macros.h"
-
--EXTERN float FPSover1;
- EXTERN char *AllSkillTexts[];
- EXTERN char font_switchto_red[];
- EXTERN char font_switchto_blue[];
---- freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h 2019-03-30 23:20:31.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h 2020-06-21 20:41:58.424710693 +1000
-@@ -36,7 +36,7 @@
-
- void leveleditor_init_tools(void);
-
--struct leveleditor_tool tool_place, tool_move, tool_select;
-+EXTERN struct leveleditor_tool tool_place, tool_move, tool_select;
-
- #define EVENT_LEFT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 1))
- #define EVENT_RIGHT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 3))
---- freedroidrpg-1.0RC2/src/mapgen/mapgen.h 2019-03-30 23:20:31.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/mapgen/mapgen.h 2020-06-21 20:43:53.255723534 +1000
-@@ -64,9 +64,9 @@
- extern int total_rooms;
-
- // Interface to the game
--void (*dungeonmap_convert) (int, int, unsigned char *);
--void (*dungeonmap_place_enemies) (struct roominfo *);
--void (*dungeonmap_gift) (struct roominfo *);
-+extern void (*dungeonmap_convert) (int, int, unsigned char *);
-+extern void (*dungeonmap_place_enemies) (struct roominfo *);
-+extern void (*dungeonmap_gift) (struct roominfo *);
-
- int generate_dungeon_gram(int, int);
-
---- freedroidrpg-1.0RC2/src/struct.h 2019-05-13 01:03:36.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/struct.h 2020-06-21 20:38:22.189812908 +1000
-@@ -1063,7 +1063,7 @@
- struct tux_part_instances default_instances; // Default part instances
- tux_part_render_motionclass *render_order; // The render_sets of each motion class
- int gun_muzzle_height; // Vertical offset to apply to bullets
--} tux_rendering;
-+};
-
- /**
- * Contains a set of Tux's parts images for a motion class.
diff --git a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2-r1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2-r1.ebuild
deleted file mode 100644
index b89390f2d7d2..000000000000
--- a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit lua-single python-any-r1 xdg
-
-MY_PV=$(ver_rs 2 '')
-
-DESCRIPTION="Modification of the classical Freedroid engine into an RPG"
-HOMEPAGE="https://www.freedroid.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-$(ver_cut 1-2)/freedroidRPG-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV^^}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug devtools nls opengl profile +sound"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- ${LUA_DEPS}
- media-libs/libpng:=
- media-libs/libsdl[opengl?,sound?,video]
- >=media-libs/sdl-gfx-2.0.21:=
- media-libs/sdl-image[jpeg,png]
- sys-libs/zlib:=
- devtools? ( media-libs/sdl-ttf )
- nls? ( virtual/libintl )
- opengl? (
- media-libs/glew:0=
- virtual/opengl
- )
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/sdl-mixer[vorbis]
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}/${P}-fnocommon.patch"
-)
-
-pkg_setup() {
- lua-single_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- python_fix_shebang src/gen_savestruct.py
- rm data/sound/speak.py || die # unused, prevent installing
-}
-
-src_configure() {
- local econfargs=(
- $(use_enable debug backtrace)
- $(use_enable debug)
- $(use_enable devtools dev-tools)
- $(use_enable nls)
- $(use_enable opengl)
- $(use_enable profile rtprof)
- $(use_enable sound)
- $(use_with debug extra-warnings)
- )
- econf "${econfargs[@]}"
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if [[ ${REPLACING_VERSIONS} ]]; then
- local min="1.0_rc1"
- if ver_test ${REPLACING_VERSIONS} -lt ${min}; then
- elog "${P} is not compatible with save games before ${min}."
- elog "Please start a new character."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-16 18:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-16 18:57 [gentoo-commits] repo/gentoo:master commit in: games-rpg/freedroidrpg/, games-rpg/freedroidrpg/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2020-09-13 12:50 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox