[fakenes] Fix build with gcc-7.x

commit 9bbc55db7bd8407fcc07d55a250cf282d90f3901 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sun Mar 19 10:08:39 2017 +0000 Fix build with gcc-7.x fakenes-0.5.9-beta3-gcc7.patch | 18 ++++++++++++++++++ fakenes.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) --- diff --git a/fakenes-0.5.9-beta3-gcc7.patch b/fakenes-0.5.9-beta3-gcc7.patch new file mode 100644 index 0000000..22a3ce6 --- /dev/null +++ b/fakenes-0.5.9-beta3-gcc7.patch @@ -0,0 +1,18 @@ +--- a/src/nsf.cpp ++++ b/src/nsf.cpp +@@ -410,11 +410,11 @@ + clear_to_color(video_buffer, ppu_get_background_color()); + + textprintf_ex(video_buffer, small_font, 8, 8 + (12 * 0), 1 + 0x30, -1, "TITLE:"); +- textprintf_ex(video_buffer, small_font, 8 + 8, 8 + (12 * 1), 1 + 0x30, -1, (const char *)&nsf.name[0]); ++ textprintf_ex(video_buffer, small_font, 8 + 8, 8 + (12 * 1), 1 + 0x30, -1, "%s", (const char *)&nsf.name[0]); + textprintf_ex(video_buffer, small_font, 8, 8 + (12 * 2), 1 + 0x30, -1, "COMPILED BY:"); +- textprintf_ex(video_buffer, small_font, 8 + 8, 8 + (12 * 3), 1 + 0x30, -1, (const char *)&nsf.artist[0]); ++ textprintf_ex(video_buffer, small_font, 8 + 8, 8 + (12 * 3), 1 + 0x30, -1, "%s", (const char *)&nsf.artist[0]); + textprintf_ex(video_buffer, small_font, 8, 8 + (12 * 4), 1 + 0x30, -1, "COPYRIGHT:"); +- textprintf_ex(video_buffer, small_font, 8 + 8, 8 + (12 * 5), 1 + 0x30, -1, (const char *)&nsf.copyright[0]); ++ textprintf_ex(video_buffer, small_font, 8 + 8, 8 + (12 * 5), 1 + 0x30, -1, "%s", (const char *)&nsf.copyright[0]); + + textprintf_ex(video_buffer, small_font, 8, 8 + (12 * 7), 1 + 0x30, -1, "Track %d of %d", currentSong, nsf.totalSongs); + textprintf_ex(video_buffer, small_font, 8, 8 + (12 * 8) + 2, 1 + 0x30, -1, "Press A for next track"); + diff --git a/fakenes.spec b/fakenes.spec index 84aae00..02100a6 100644 --- a/fakenes.spec +++ b/fakenes.spec @@ -2,7 +2,7 @@ Name: fakenes Version: 0.5.9 -Release: 0.7.%{beta}%{?dist} +Release: 0.8.%{beta}%{?dist} Summary: Nintendo Entertainment System emulator Group: Amusements/Games License: Artistic @@ -15,6 +15,7 @@ Patch2: fakenes-0.5.9-beta3-gcc43.patch Patch3: fakenes-0.5.9-beta3-openal-build.patch Patch4: fakenes-0.5.9-beta3-allegro44-build.patch Patch5: fakenes-0.5.9-beta3-libm-build.patch +Patch6: fakenes-0.5.9-beta3-gcc7.patch BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel BuildRequires: libGLU-devel freealut-devel desktop-file-utils BuildRequires: libicns-utils @@ -36,6 +37,7 @@ well. There are also official builds available for Mac OS X. %patch3 -p1 -z .openal-build %patch4 -p1 -z .allegro44-build %patch5 -p1 -z .libm +%patch6 -p1 -z .gcc7 sed -i 's/\r//' docs/faq.html @@ -80,6 +82,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Mar 19 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.5.9-0.8.beta3 +- Fix build with gcc-7.x + * Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 0.5.9-0.7.beta3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild