[kde-plasma-yawp] - better patch for KDE4.5

Orcan Ogetbil oget at fedoraproject.org
Sun Oct 3 22:19:34 UTC 2010


commit 9257a4c46d8c1de90bc6d912495d7c5cc2a9c671
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Oct 3 18:19:29 2010 -0400

    - better patch for KDE4.5

 kde-plasma-yawp.spec |    5 ++++-
 yawp-kde4.5.patch    |   12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/kde-plasma-yawp.spec b/kde-plasma-yawp.spec
index ac0e401..befd887 100644
--- a/kde-plasma-yawp.spec
+++ b/kde-plasma-yawp.spec
@@ -1,6 +1,6 @@
 Name:           kde-plasma-yawp
 Version:        0.3.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Yet Another Weather Plasmoid
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 03 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.4-4
+- better patch for KDE4.5
+
 * Sun Oct 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.3.4-2
 - add minimum kde runtime dep
 
diff --git a/yawp-kde4.5.patch b/yawp-kde4.5.patch
index 6b0ab78..4d50783 100644
--- a/yawp-kde4.5.patch
+++ b/yawp-kde4.5.patch
@@ -105,7 +105,7 @@ diff -rupN yawp-0.3.4.old/ions/ion_accuweather.cpp yawp.trunk/ions/ion_accuweath
  	QHash<QByteArray, ImageData *>    vImageData;	// Satellite url is the key to the ImageData
  	QHash<KJob *,  ImageData *>       vImageJobs;
 +	
-+#if KDE_IS_VERSION(4,5,60)
++#if KDE_IS_VERSION(4,5,1)
 +	QStringList                       sourcesToReset;
 +#endif
  };
@@ -120,7 +120,7 @@ diff -rupN yawp-0.3.4.old/ions/ion_accuweather.cpp yawp.trunk/ions/ion_accuweath
 -    emit(resetCompleted(this, true));
 +	/**  Triggered when we get initial setup data for ions that provide a list of places
 +	*/
-+#if KDE_IS_VERSION(4,5,60)
++#if KDE_IS_VERSION(4,5,1)
 +	d->sourcesToReset = sources();
 +	updateAllSources();
 +#elif KDE_VERSION_MINOR >= 3
@@ -143,7 +143,7 @@ diff -rupN yawp-0.3.4.old/ions/ion_google.cpp yawp.trunk/ions/ion_google.cpp
  	QHash<KJob *, XmlServiceData *>     vJobData;
  	QHash<QString, KJob *>              vActiveJobs;
  	
-+#if KDE_IS_VERSION(4,5,60)
++#if KDE_IS_VERSION(4,5,1)
 +	QStringList                         sourcesToReset;
 +#endif
 +	
@@ -157,7 +157,7 @@ diff -rupN yawp-0.3.4.old/ions/ion_google.cpp yawp.trunk/ions/ion_google.cpp
 -#if KDE_VERSION_MINOR >= 3
  	/**  Triggered when we get initial setup data for ions that provide a list of places */
 -    emit(resetCompleted(this, true));
-+#if KDE_IS_VERSION(4,5,60)
++#if KDE_IS_VERSION(4,5,1)
 +	d->sourcesToReset = sources();
 +	updateAllSources();
 +#elif KDE_VERSION_MINOR >= 3
@@ -181,7 +181,7 @@ diff -rupN yawp-0.3.4.old/ions/ion_wunderground.cpp yawp.trunk/ions/ion_wundergr
 	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,60)
++#if KDE_IS_VERSION(4,5,1)
 +	QStringList                       sourcesToReset;
 +#endif
  	
@@ -193,7 +193,7 @@ diff -rupN yawp-0.3.4.old/ions/ion_wunderground.cpp yawp.trunk/ions/ion_wundergr
  
 -#if KDE_VERSION_MINOR >= 3
  	/**  Triggered when we get initial setup data for ions that provide a list of places */
-+#if KDE_IS_VERSION(4,5,60)
++#if KDE_IS_VERSION(4,5,1)
 +	d->sourcesToReset = sources();
 +	updateAllSources();
 +#elif KDE_VERSION_MINOR >= 3


More information about the scm-commits mailing list