[gnome-hearts] Build cleanly against gcc 4.6 and fix up the desktop file to validate

[Christopher Aillon]

commit 33489553a55a2b24810bae18c79e86ffb5b27bb5
Author: Christopher Aillon <caillon at redhat.com>
Date:   Mon Feb 7 18:00:47 2011 -0800

    Build cleanly against gcc 4.6 and fix up the desktop file to validate
    
    Rebuild for the http://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

 desktop-file.patch   |   16 ++++++++++++++++
 gcc46-warnings.patch |   35 +++++++++++++++++++++++++++++++++++
 gnome-hearts.spec    |    9 ++++++++-
 3 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/desktop-file.patch b/desktop-file.patch
new file mode 100644
index 0000000..8c2240f
--- /dev/null
+++ b/desktop-file.patch
@@ -0,0 +1,16 @@
+Index: gnome-hearts.desktop.in
+===================================================================
+--- gnome-hearts.desktop.in	(revision 210)
++++ gnome-hearts.desktop.in	(working copy)
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ _Name=Hearts
+ _Comment=Play the popular Hearts card game
+ Exec=gnome-hearts
+-Icon=gnome-hearts.png
++Icon=gnome-hearts
+ Terminal=false
+ Type=Application
+ Categories=GNOME;GTK;Game;CardGame;
diff --git a/gcc46-warnings.patch b/gcc46-warnings.patch
new file mode 100644
index 0000000..f23b26f
--- /dev/null
+++ b/gcc46-warnings.patch
@@ -0,0 +1,35 @@
+Index: src/events.c
+===================================================================
+--- src/events.c	(revision 217)
++++ src/events.c	(working copy)
+@@ -493,7 +493,7 @@
+ 	// Also update queen_breaks_hearts if hearts_broken is disabled
+ 	if (!cfg.hearts_break)
+ 	{
+-		gtk_toggle_button_set_active(glade_xml_get_widget(ui.xml, "queen_breaks_hearts"), FALSE);
++		gtk_toggle_button_set_active(glade_xml_get_widget(GTK_TOGGLE_BUTTON (ui.xml), "queen_breaks_hearts"), FALSE);
+ 		cfg.queen_breaks_hearts = FALSE;
+ 	}
+ 
+Index: src/cards-image.c
+===================================================================
+--- src/cards-image.c	(revision 217)
++++ src/cards-image.c	(working copy)
+@@ -69,7 +69,7 @@
+ 	if (active)
+ 	{
+ 		GdkPixbuf *active_card;
+-		guint px, py, width, height, rowstride;
++		guint px, py, rowstride;
+ 		guint16 red, green, blue;
+ 		guchar *pixels, *p;
+ 
+@@ -89,8 +89,6 @@
+ 		gdk_pixbuf_saturate_and_pixelate (active_card, active_card, 0, FALSE);
+ 
+ 		pixels = gdk_pixbuf_get_pixels (active_card);
+-		width = gdk_pixbuf_get_width (active_card);
+-		height = gdk_pixbuf_get_height (active_card);
+ 		rowstride = gdk_pixbuf_get_rowstride (active_card);
+ 
+ 		for (py = 0; py < cards->height; py++)
diff --git a/gnome-hearts.spec b/gnome-hearts.spec
index ff84820..8070b75 100644
--- a/gnome-hearts.spec
+++ b/gnome-hearts.spec
@@ -1,11 +1,13 @@
 Name:           gnome-hearts
 Version:        0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Hearts game for GNOME
 Group:          Amusements/Games
 License:        GPLv2+ and GFDL
 URL:            http://www.jejik.com/gnome-hearts/
 Source0:        http://www.jejik.com/files/gnome-hearts/gnome-hearts-%{version}.tar.gz
+Patch0:         gcc46-warnings.patch
+Patch1:         desktop-file.patch
 
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libglade2-devel
@@ -23,6 +25,8 @@ widely diverging playing styles.
 
 %prep
 %setup -q
+%patch0 -p0 -b .gcc46
+%patch1 -p0 -b .desktop
 
 %build
 %configure
@@ -46,6 +50,9 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Mon Feb  7 2010 Christopher Aillon <caillon at redhat.com> - 0.3-7
+- Fix up the .desktop file and build cleanly against gcc 4.6
+
 * Wed Jul 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3-6
 - Add BR: scrollkeeper