diff -u desmume-0.9.11/debian/changelog desmume-0.9.11/debian/changelog
--- desmume-0.9.11/debian/changelog
+++ desmume-0.9.11/debian/changelog
@@ -1,3 +1,10 @@
+desmume (0.9.11-3) unstable; urgency=medium
+
+  * Import upstream patch to fix FTBFS with GCC7
+    Closes: #853372
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 22 Oct 2017 11:23:03 +0200
+
 desmume (0.9.11-2) unstable; urgency=medium
 
   * Import upstream patch to fix FTBFS with GCC6
diff -u desmume-0.9.11/debian/patches/series desmume-0.9.11/debian/patches/series
--- desmume-0.9.11/debian/patches/series
+++ desmume-0.9.11/debian/patches/series
@@ -4,0 +5 @@
+gcc7_fixes.patch
only in patch2:
unchanged:
--- desmume-0.9.11.orig/debian/patches/gcc7_fixes.patch
+++ desmume-0.9.11/debian/patches/gcc7_fixes.patch
@@ -0,0 +1,18 @@
+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;