[kde-plasma-yawp] - Fix crash when built against KDE 4.5.1 RHBZ#641971

[Orcan Ogetbil]

commit e4d3091d317868999f0bf10f7362f101434d7910
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Mon Oct 11 22:11:29 2010 -0400

    - Fix crash when built against KDE 4.5.1 RHBZ#641971

 kde-plasma-yawp.spec |    9 +++++-
 yawp-kde4.5.1.patch  |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
---
diff --git a/kde-plasma-yawp.spec b/kde-plasma-yawp.spec
index 39d2862..0b98e32 100644
--- a/kde-plasma-yawp.spec
+++ b/kde-plasma-yawp.spec
@@ -1,11 +1,13 @@
 Name:           kde-plasma-yawp
 Version:        0.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Yet Another Weather Plasmoid
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.kde-look.org/content/show.php?content=94106
 Source0:        http://downloads.sourceforge.net/yawp/yawp-%{version}.tar.bz2
+# Fix crash when built against KDE 4.5.1 RHBZ#641971
+Patch0:         yawp-kde4.5.1.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +26,7 @@ This colorful plasmoid shows weather maps, reports and forecasts.
 
 %prep
 %setup -q -n yawp-%{version}
-
+%patch0 -p1 -b .451
 
 %build
 mkdir -p %{_target_platform}
@@ -61,6 +63,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 11 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.5-2
+- Fix crash when built against KDE 4.5.1 RHBZ#641971
+
 * Fri Oct 08 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.5-1
 - update to 0.3.5
 
diff --git a/yawp-kde4.5.1.patch b/yawp-kde4.5.1.patch
new file mode 100644
index 0000000..39d8b22
--- /dev/null
+++ b/yawp-kde4.5.1.patch
@@ -0,0 +1,63 @@
+diff -rupN yawp-0.3.5.old/ions/ion_accuweather.cpp yawp-0.3.5/ions/ion_accuweather.cpp
+--- yawp-0.3.5.old/ions/ion_accuweather.cpp	2010-10-08 14:44:48.000000000 -0400
++++ yawp-0.3.5/ions/ion_accuweather.cpp	2010-10-11 13:06:02.000000000 -0400
+@@ -77,7 +77,7 @@ struct AccuWeatherIon::Private
+ 	QHash<QByteArray, ImageData *>    vImageData;	// Satellite url is the key to the ImageData
+ 	QHash<KJob *,  ImageData *>       vImageJobs;
+ 	
+-#if KDE_IS_VERSION(4,5,2)
++#if KDE_IS_VERSION(4,5,1)
+ 	QStringList                       sourcesToReset;
+ #endif
+ };
+@@ -258,7 +258,7 @@ AccuWeatherIon::reset()
+ 
+ 	/**  Triggered when we get initial setup data for ions that provide a list of places
+ 	*/
+-#if KDE_IS_VERSION(4,5,2)
++#if KDE_IS_VERSION(4,5,1)
+ 	d->sourcesToReset = sources();
+ 	updateAllSources();
+ #elif KDE_VERSION_MINOR >= 3
+diff -rupN yawp-0.3.5.old/ions/ion_google.cpp yawp-0.3.5/ions/ion_google.cpp
+--- yawp-0.3.5.old/ions/ion_google.cpp	2010-10-08 14:44:48.000000000 -0400
++++ yawp-0.3.5/ions/ion_google.cpp	2010-10-11 13:06:02.000000000 -0400
+@@ -99,7 +99,7 @@ struct GoogleIon::Private
+ 	QHash<KJob *, XmlServiceData *>     vJobData;
+ 	QHash<QString, KJob *>              vActiveJobs;
+ 	
+-#if KDE_IS_VERSION(4,5,2)
++#if KDE_IS_VERSION(4,5,1)
+ 	QStringList                         sourcesToReset;
+ #endif
+ 	
+@@ -231,7 +231,7 @@ GoogleIon::reset()
+ 	d->vActiveJobs.clear();
+ 
+ 	/**  Triggered when we get initial setup data for ions that provide a list of places */
+-#if KDE_IS_VERSION(4,5,2)
++#if KDE_IS_VERSION(4,5,1)
+ 	d->sourcesToReset = sources();
+ 	updateAllSources();
+ #elif KDE_VERSION_MINOR >= 3
+diff -rupN yawp-0.3.5.old/ions/ion_wunderground.cpp yawp-0.3.5/ions/ion_wunderground.cpp
+--- yawp-0.3.5.old/ions/ion_wunderground.cpp	2010-10-08 14:44:48.000000000 -0400
++++ yawp-0.3.5/ions/ion_wunderground.cpp	2010-10-11 13:06:02.000000000 -0400
+@@ -141,7 +141,7 @@ struct WundergroundIon::Private
+ 	QHash<QString, XmlLookupResult *> vLookupResults;	// key is the location we're looking for
+ 	QHash<QString, XmlWeatherData *>  vWeatherData;	// key is ServiceId (e.g.: airport:EDDC)
+ 	
+-#if KDE_IS_VERSION(4,5,2)
++#if KDE_IS_VERSION(4,5,1)
+ 	QStringList                       sourcesToReset;
+ #endif
+ 	
+@@ -238,7 +238,7 @@ WundergroundIon::reset()
+ 	d->vWeatherData.clear();
+ 
+ 	/**  Triggered when we get initial setup data for ions that provide a list of places */
+-#if KDE_IS_VERSION(4,5,2)
++#if KDE_IS_VERSION(4,5,1)
+ 	d->sourcesToReset = sources();
+ 	updateAllSources();
+ #elif KDE_VERSION_MINOR >= 3