jwrdegoede pushed to KoboDeluxe (f22). "Fix crash when build with gcc-5.1 (rhbz#1227807) (..more)"

[notifications at fedoraproject.org]

From 92c26bff9027a2a74387d32ea5b4be3070623a25 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Fri, 5 Jun 2015 12:55:12 +0200
Subject: Fix crash when build with gcc-5.1 (rhbz#1227807)

- Better description for the appdata file

diff --git a/KoboDeluxe-0.5.1-midi-crash-fix.patch b/KoboDeluxe-0.5.1-midi-crash-fix.patch
new file mode 100644
index 0000000..0b0fd10
--- /dev/null
+++ b/KoboDeluxe-0.5.1-midi-crash-fix.patch
@@ -0,0 +1,13 @@
+diff -up KoboDeluxe-0.5.1/sound/a_midicon.c~ KoboDeluxe-0.5.1/sound/a_midicon.c
+--- KoboDeluxe-0.5.1/sound/a_midicon.c~	2015-06-03 20:31:31.000000000 +0200
++++ KoboDeluxe-0.5.1/sound/a_midicon.c	2015-06-03 20:47:40.836311461 +0200
+@@ -120,7 +120,8 @@ static inline void __press(unsigned ch,
+ {
+ 	m[ch].next[key] = -1;
+ 	m[ch].prev[key] = m[ch].last;
+-	m[ch].next[m[ch].last] = (char)key;
++	if (m[ch].last != -1)
++		m[ch].next[m[ch].last] = (char)key;
+ 	m[ch].last = (char)key;
+ }
+ 
diff --git a/KoboDeluxe.appdata.xml b/KoboDeluxe.appdata.xml
index eb24989..7d33478 100644
--- a/KoboDeluxe.appdata.xml
+++ b/KoboDeluxe.appdata.xml
@@ -7,8 +7,16 @@
   <summary>Third person scrolling 2D shooter</summary>
   <description>
     <p>
-      Kobo Deluxe is a retro styled top-down arena shooter. Kobo Deluxe
-      offers a classic arcade gameplay.
+      Kobo Deluxe is a retro styled top-down arena shooter with a simple
+      and responsive control system  - which you'll need to tackle the
+      tons of enemy ships that shoot at you, chase you, circle around
+      you shooting, or even launch other ships at you, while you're
+      trying to destroy the labyrinth shaped bases.
+    </p>
+    <p>
+     There are 50 action packed levels with smoothly increasing difficulty,
+     and different combinations of enemies that require different tactics
+     to be dealt with successfully.
     </p>
     <p>
       Kobo Deluxe features OpenGL acceleration (optional), an intuitive
diff --git a/KoboDeluxe.spec b/KoboDeluxe.spec
index cf6157f..5a69e21 100644
--- a/KoboDeluxe.spec
+++ b/KoboDeluxe.spec
@@ -1,6 +1,6 @@
 Name:           KoboDeluxe
 Version:        0.5.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Third person scrolling 2D shooter
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,6 +12,7 @@ Source3:        %{name}.appdata.xml
 Patch1:         KoboDeluxe-defaults.patch
 Patch2:         KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch
 Patch3:         KoboDeluxe-0.5.1-gcc44.patch
+Patch4:         KoboDeluxe-0.5.1-midi-crash-fix.patch
 BuildRequires:  SDL_image-devel desktop-file-utils libappstream-glib
 Requires:       hicolor-icon-theme
 Requires(pre):  shadow-utils
@@ -32,6 +33,7 @@ to be dealt with successfully.
 %patch1 -p1 -z .defaults
 %patch2 -p1 -b .pipe-unistd
 %patch3 -p1
+%patch4 -p1
 sed -i 's|$(sharedstatedir)/kobo-deluxe/scores|%{_var}/games/kobo-deluxe|g' \
   configure
 iconv -f ISO-8859-1 -t UTF8 README > tmp;         mv tmp README
@@ -44,11 +46,6 @@ iconv -f ISO2022JP -t UTF8 README.xkobo.jp > tmp; mv tmp README.xkobo.jp
 %build
 %configure --disable-dependency-tracking --enable-opengl
 make %{?_smp_mflags}
-# Workaround for GCC-5 optimization bug causing segfaults
-# https://bugzilla.redhat.com/show_bug.cgi?id=1227807
-CFLAGS="$(echo $RPM_OPT_FLAGS | sed s/-O2/-O/)"
-touch sound/a_midicon.c
-make CFLAGS="$CFLAGS -I/usr/include/SDL"
 
 
 %install
@@ -96,6 +93,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun  5 2015 Hans de Goede <hdegoede at redhat.com> - 0.5.1-18
+- Fix crash when build with gcc-5.1 (rhbz#1227807)
+- Better description for the appdata file
+
 * Wed Jun  3 2015 Hans de Goede <hdegoede at redhat.com> - 0.5.1-17
 - Add an appdata file
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/KoboDeluxe.git/commit/?h=f22&id=92c26bff9027a2a74387d32ea5b4be3070623a25