summaryrefslogtreecommitdiff
path: root/games-kids/tuxmath/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
commitd18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /games-kids/tuxmath/files
parente748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
gentoo resync : 15.06.2021
Diffstat (limited to 'games-kids/tuxmath/files')
-rw-r--r--games-kids/tuxmath/files/tuxmath-2.0.3-blits-to-tmblits.patch36
-rw-r--r--games-kids/tuxmath/files/tuxmath-2.0.3-fno-common.patch8
2 files changed, 44 insertions, 0 deletions
diff --git a/games-kids/tuxmath/files/tuxmath-2.0.3-blits-to-tmblits.patch b/games-kids/tuxmath/files/tuxmath-2.0.3-blits-to-tmblits.patch
new file mode 100644
index 000000000000..ff6e875d62f0
--- /dev/null
+++ b/games-kids/tuxmath/files/tuxmath-2.0.3-blits-to-tmblits.patch
@@ -0,0 +1,36 @@
+Fixes immediate crash on titlescreen with gcc10+
+Patch from debian:
+https://bugs.debian.org/986623
+--- a/src/titlescreen.c
++++ b/src/titlescreen.c
+@@ -57,3 +57,3 @@
+ unsigned char type;
+-} blits[MAX_UPDATES];
++} tmblits[MAX_UPDATES];
+
+@@ -1021,4 +1021,4 @@
+ for (i = 0; i < MAX_UPDATES; ++i) {
+- blits[i].srcrect = &srcupdate[i];
+- blits[i].dstrect = &dstupdate[i];
++ tmblits[i].srcrect = &srcupdate[i];
++ tmblits[i].dstrect = &dstupdate[i];
+ }
+@@ -1034,4 +1034,4 @@
+ for (i = 0; i < numupdates; i++)
+- if (blits[i].type == 'E')
+- SDL_LowerBlit(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
++ if (tmblits[i].type == 'E')
++ SDL_LowerBlit(tmblits[i].src, tmblits[i].srcrect, screen, tmblits[i].dstrect);
+ // SNOW_erase();
+@@ -1040,4 +1040,4 @@
+ for (i = 0; i < numupdates; i++)
+- if (blits[i].type == 'D')
+- SDL_BlitSurface(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
++ if (tmblits[i].type == 'D')
++ SDL_BlitSurface(tmblits[i].src, tmblits[i].srcrect, screen, tmblits[i].dstrect);
+ // SNOW_draw();
+@@ -1069,3 +1069,3 @@
+
+- update = &blits[numupdates++];
++ update = &tmblits[numupdates++];
+
diff --git a/games-kids/tuxmath/files/tuxmath-2.0.3-fno-common.patch b/games-kids/tuxmath/files/tuxmath-2.0.3-fno-common.patch
new file mode 100644
index 000000000000..ffd711f21ce0
--- /dev/null
+++ b/games-kids/tuxmath/files/tuxmath-2.0.3-fno-common.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/795069
+https://github.com/tux4kids/tuxmath/pull/15
+--- a/src/menu_lan.c
++++ b/src/menu_lan.c
+@@ -39,3 +39,2 @@
+ /* lan_player_type now defined in network.h */
+-lan_player_type lan_player_info[MAX_CLIENTS];
+