Author: evgeni Date: 2017-10-22 09:24:25 +0000 (Sun, 22 Oct 2017) New Revision: 16032
Added: packages/trunk/desmume/debian/patches/gcc7_fixes.patch Modified: packages/trunk/desmume/debian/changelog packages/trunk/desmume/debian/patches/series Log: Import upstream patch to fix FTBFS with GCC7 Closes: #853372 Modified: packages/trunk/desmume/debian/changelog =================================================================== --- packages/trunk/desmume/debian/changelog 2017-10-21 15:07:22 UTC (rev 16031) +++ packages/trunk/desmume/debian/changelog 2017-10-22 09:24:25 UTC (rev 16032) @@ -1,3 +1,10 @@ +desmume (0.9.11-3) unstable; urgency=medium + + * Import upstream patch to fix FTBFS with GCC7 + Closes: #853372 + + -- Evgeni Golov <[email protected]> Sun, 22 Oct 2017 11:23:03 +0200 + desmume (0.9.11-2) unstable; urgency=medium * Import upstream patch to fix FTBFS with GCC6 Added: packages/trunk/desmume/debian/patches/gcc7_fixes.patch =================================================================== --- packages/trunk/desmume/debian/patches/gcc7_fixes.patch (rev 0) +++ packages/trunk/desmume/debian/patches/gcc7_fixes.patch 2017-10-22 09:24:25 UTC (rev 16032) @@ -0,0 +1,18 @@ +From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 +From: rogerman <[email protected]> +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; Modified: packages/trunk/desmume/debian/patches/series =================================================================== --- packages/trunk/desmume/debian/patches/series 2017-10-21 15:07:22 UTC (rev 16031) +++ packages/trunk/desmume/debian/patches/series 2017-10-22 09:24:25 UTC (rev 16032) @@ -2,3 +2,4 @@ add-keywords-to-desktop-files.patch osmesa_printf.patch gcc6_fixes.patch +gcc7_fixes.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
