gentoo resync : 17.06.2021

4 files changed, 16 insertions, 9 deletions

diff --git a/games-arcade/abe/files/abe-1.1-doublefree.patch b/games-arcade/abe/files/abe-1.1-doublefree.patch
index ce7389d97100..82d49031844c 100644
--- a/games-arcade/abe/files/abe-1.1-doublefree.patch
+++ b/games-arcade/abe/files/abe-1.1-doublefree.patch
@@ -1,5 +1,7 @@
---- a/src/Main.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/Main.c	2011-03-14 10:08:31.846413904 -0600
+Fix a double free() bug.  Sent upstream 15 Mar 2011:
+https://sourceforge.net/p/abe/patches/1/
+--- a/src/Main.c
++++ b/src/Main.c
 @@ -35,8 +35,6 @@
      for(i = 0; modes[i]; ++i)
        printf("\t%d x %d\n", modes[i]->w, modes[i]->h);
diff --git a/games-arcade/abe/files/abe-1.1-format-security.patch b/games-arcade/abe/files/abe-1.1-format-security.patch
index ad88b4b60486..9f98b080f53d 100644
--- a/games-arcade/abe/files/abe-1.1-format-security.patch
+++ b/games-arcade/abe/files/abe-1.1-format-security.patch
@@ -1,5 +1,6 @@
---- ./src/Game.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ ./src/Game.c	2013-11-20 12:30:00.000000000 -0700
+Fix build failure with -Werror=format-security
+--- ./src/Game.c
++++ ./src/Game.c
 @@ -6,21 +6,14 @@ Game game;
  
  // path_sprintf should not be used by other .c files, as it does not fit for them.
diff --git a/games-arcade/abe/files/abe-1.1-format.patch b/games-arcade/abe/files/abe-1.1-format.patch
index 529534745712..eed86f83483d 100644
--- a/games-arcade/abe/files/abe-1.1-format.patch
+++ b/games-arcade/abe/files/abe-1.1-format.patch
@@ -1,5 +1,7 @@
---- a/src/MapIO.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/MapIO.c	2011-03-14 10:15:33.166949366 -0600
+Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011:
+https://sourceforge.net/p/abe/patches/2/
+--- a/src/MapIO.c
++++ b/src/MapIO.c
 @@ -93,7 +93,7 @@
    // compression step 1: read compressed data from disk
    // FIXME: what would be nicer is to only allocate as much mem as used on disk.
diff --git a/games-arcade/abe/files/abe-1.1-settings.patch b/games-arcade/abe/files/abe-1.1-settings.patch
index ea5809f7386a..c0471a03388a 100644
--- a/games-arcade/abe/files/abe-1.1-settings.patch
+++ b/games-arcade/abe/files/abe-1.1-settings.patch
@@ -1,6 +1,8 @@
-diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
---- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
-+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
+From Fedora:
+Enable changing the video settings.Sent upstream 2 Apr 2006:
+https://sourceforge.net/p/abe/bugs/1/
+--- a/src/Menu.c
++++ b/src/Menu.c
 @@ -116,7 +116,7 @@
    if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
      return sound_loaded;