[gentoo-commits] repo/proj/guru:dev commit in: games-engines/instead/files/, games-engines/instead/

[gentoo-commits] repo/proj/guru:dev commit in: games-engines/instead/files/, games-engines/instead/

[Golubev Alexander]

commit:     402d3e5f48f94e40606332b0a794b91aa01d0218
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 22 02:48:53 2021 +0000
Commit:     Golubev Alexander <fatzer2 <AT> gmail <DOT> com>
CommitDate: Tue Jun 22 02:49:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=402d3e5f

games-engines/instead: version bump to 3.3.5

Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>

 ...3.4-resolve-conflict-with-SDL-function-91.patch | 34 ----------------------
 .../{instead-3.3.4.ebuild => instead-3.3.5.ebuild} |  3 --
 2 files changed, 37 deletions(-)

diff --git a/games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch b/games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch
deleted file mode 100644
index 7c6c2f04d..000000000
--- a/games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d263759d94c45bea6acbf6fb079350bba6c6e3c6 Mon Sep 17 00:00:00 2001
-From: Peter Kosyh <p.kosyh@gmail.com>
-Date: Sun, 20 Jun 2021 23:13:29 +0300
-Subject: [PATCH] resolve conflict with SDL function: #91
-
----
- src/SDL_gif.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/SDL_gif.c b/src/SDL_gif.c
-index 543280cc..0a74cf1e 100644
---- a/src/SDL_gif.c
-+++ b/src/SDL_gif.c
-@@ -741,7 +741,7 @@ ReadImage(SDL_RWops * src, int len, int height, int cmapSize,
- }
- 
- /* Load a GIF type animation from an SDL datasource */
--static Animation_t *IMG_LoadGIFAnimation_RW(SDL_RWops *src)
-+static Animation_t *LoadGIFAnimation_RW(SDL_RWops *src)
- {
-     GIF_Anim_t *internal = IMG_LoadGIF_RW_Internal(src, SDL_TRUE);
-     if (internal) {
-@@ -782,7 +782,7 @@ Animation_t *GIF_LoadAnim(const char* file)
- 	SDL_RWops* src = RWFromIdf(instead_idf(), file);
- 	if (!src)
- 		return NULL;
--	anim = IMG_LoadGIFAnimation_RW(src);
-+	anim = LoadGIFAnimation_RW(src);
- 	SDL_RWclose(src);
- 	if (!anim)
- 		return NULL;
--- 
-2.31.1
-

diff --git a/games-engines/instead/instead-3.3.4.ebuild b/games-engines/instead/instead-3.3.5.ebuild
similarity index 96%
rename from games-engines/instead/instead-3.3.4.ebuild
rename to games-engines/instead/instead-3.3.5.ebuild
index 0b3ebfac9..f25d0ad53 100644
--- a/games-engines/instead/instead-3.3.4.ebuild
+++ b/games-engines/instead/instead-3.3.5.ebuild
@@ -60,9 +60,6 @@ DEPEND="${COMMON_DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-# https://bugs.gentoo.org/796962
-PATCHES=( "$FILESDIR/$P-resolve-conflict-with-SDL-function-91.patch" )
-
 src_prepare() {
 	l10n_find_plocales_changes "${S}/lang" "" ".ini"