1 |
commit: 402d3e5f48f94e40606332b0a794b91aa01d0218 |
2 |
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jun 22 02:48:53 2021 +0000 |
4 |
Commit: Golubev Alexander <fatzer2 <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Jun 22 02:49:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=402d3e5f |
7 |
|
8 |
games-engines/instead: version bump to 3.3.5 |
9 |
|
10 |
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com> |
11 |
|
12 |
...3.4-resolve-conflict-with-SDL-function-91.patch | 34 ---------------------- |
13 |
.../{instead-3.3.4.ebuild => instead-3.3.5.ebuild} | 3 -- |
14 |
2 files changed, 37 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index 7c6c2f04d..000000000 |
19 |
--- a/games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch |
20 |
+++ /dev/null |
21 |
@@ -1,34 +0,0 @@ |
22 |
-From d263759d94c45bea6acbf6fb079350bba6c6e3c6 Mon Sep 17 00:00:00 2001 |
23 |
-From: Peter Kosyh <p.kosyh@×××××.com> |
24 |
-Date: Sun, 20 Jun 2021 23:13:29 +0300 |
25 |
-Subject: [PATCH] resolve conflict with SDL function: #91 |
26 |
- |
27 |
---- |
28 |
- src/SDL_gif.c | 4 ++-- |
29 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
30 |
- |
31 |
-diff --git a/src/SDL_gif.c b/src/SDL_gif.c |
32 |
-index 543280cc..0a74cf1e 100644 |
33 |
---- a/src/SDL_gif.c |
34 |
-+++ b/src/SDL_gif.c |
35 |
-@@ -741,7 +741,7 @@ ReadImage(SDL_RWops * src, int len, int height, int cmapSize, |
36 |
- } |
37 |
- |
38 |
- /* Load a GIF type animation from an SDL datasource */ |
39 |
--static Animation_t *IMG_LoadGIFAnimation_RW(SDL_RWops *src) |
40 |
-+static Animation_t *LoadGIFAnimation_RW(SDL_RWops *src) |
41 |
- { |
42 |
- GIF_Anim_t *internal = IMG_LoadGIF_RW_Internal(src, SDL_TRUE); |
43 |
- if (internal) { |
44 |
-@@ -782,7 +782,7 @@ Animation_t *GIF_LoadAnim(const char* file) |
45 |
- SDL_RWops* src = RWFromIdf(instead_idf(), file); |
46 |
- if (!src) |
47 |
- return NULL; |
48 |
-- anim = IMG_LoadGIFAnimation_RW(src); |
49 |
-+ anim = LoadGIFAnimation_RW(src); |
50 |
- SDL_RWclose(src); |
51 |
- if (!anim) |
52 |
- return NULL; |
53 |
--- |
54 |
-2.31.1 |
55 |
- |
56 |
|
57 |
diff --git a/games-engines/instead/instead-3.3.4.ebuild b/games-engines/instead/instead-3.3.5.ebuild |
58 |
similarity index 96% |
59 |
rename from games-engines/instead/instead-3.3.4.ebuild |
60 |
rename to games-engines/instead/instead-3.3.5.ebuild |
61 |
index 0b3ebfac9..f25d0ad53 100644 |
62 |
--- a/games-engines/instead/instead-3.3.4.ebuild |
63 |
+++ b/games-engines/instead/instead-3.3.5.ebuild |
64 |
@@ -60,9 +60,6 @@ DEPEND="${COMMON_DEPEND}" |
65 |
|
66 |
DOCS=( AUTHORS ChangeLog README.md ) |
67 |
|
68 |
-# https://bugs.gentoo.org/796962 |
69 |
-PATCHES=( "$FILESDIR/$P-resolve-conflict-with-SDL-function-91.patch" ) |
70 |
- |
71 |
src_prepare() { |
72 |
l10n_find_plocales_changes "${S}/lang" "" ".ini" |