summary refs log tree commit diff
path: root/gnu/packages/patches/desmume-gcc7-fixes.patch
diff options
context:
space:
mode:
authorraingloom <raingloom@protonmail.com>2020-02-19 14:36:26 +0100
committerJakub Kądziołka <kuba@kadziolka.net>2020-02-23 18:14:44 +0100
commitf267420707142dc17f8e9f976f98447697823c85 (patch)
tree9dd5c475899f7e752f2525b2842527ae096d1a3b /gnu/packages/patches/desmume-gcc7-fixes.patch
parentf6b4d395fd321d43fd548ba832c78320ac3f8d51 (diff)
downloadguix-f267420707142dc17f8e9f976f98447697823c85.tar.gz
gnu: desmume: fix build on new GCC versions
* gnu/packages/emulation.scm (desmume): add patches
* gnu/packages/patches/desmume-gcc6-fixes.patch: new file
* gnu/packages/patches/desmume-gcc7-fixes.patch: new file
* gnu/local.mk (dist_patch_DATA): register the above

Note: desmume-gcc6-fixes.patch contains some CRLF line endings.

Signed-off-by: Jakub Kądziołka <kuba@kadziolka.net>
Diffstat (limited to 'gnu/packages/patches/desmume-gcc7-fixes.patch')
-rw-r--r--gnu/packages/patches/desmume-gcc7-fixes.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/gnu/packages/patches/desmume-gcc7-fixes.patch b/gnu/packages/patches/desmume-gcc7-fixes.patch
new file mode 100644
index 0000000000..a4934ff6e6
--- /dev/null
+++ b/gnu/packages/patches/desmume-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;