summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2018-03-25 02:16:42 -0400
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-04 23:37:58 +0200
commitf8c5ab82437990540303065670b04fa21b71df82 (patch)
treef553dec049831906d83f94f31b70d519568b833e /games-emulation/desmume/files
parentgames-sports/torcs: Fix building with GCC-7 (diff)
downloadgentoo-f8c5ab82437990540303065670b04fa21b71df82.tar.gz
gentoo-f8c5ab82437990540303065670b04fa21b71df82.tar.bz2
gentoo-f8c5ab82437990540303065670b04fa21b71df82.zip
games-emulation/desmume: Fix building with GCC-7
Closes: https://bugs.gentoo.org/646352 Closes: https://github.com/gentoo/gentoo/pull/7606 Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'games-emulation/desmume/files')
-rw-r--r--games-emulation/desmume/files/desmume-0.9.11-gcc7.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
new file mode 100644
index 000000000000..8b8a67f2291a
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
@@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/646352
+Patch: https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch
+
+From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001
+From: rogerman <rogerman@users.sf.net>
+Date: Mon, 17 Aug 2015 21:15:04 +0000
+Subject: Fix bug with libfat string handling.
+
+diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp
+index 765d7ae5..b6d7f01f 100644
+--- a/src/utils/libfat/directory.cpp
++++ b/src/utils/libfat/directory.cpp
+@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len
+ int bytes;
+ size_t count = 0;
+
+- while (count < len-1 && src != '\0') {
++ while (count < len-1 && *src != '\0') {
+ bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
+ if (bytes > 0) {
+ *dst = (ucs2_t)tempChar;