Date: Wed, 06 Oct 2010 17:27:41 -0700 (PDT) From: "Jason E. Hale" <bsdkaffee@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/151274: [MAINTAINER] deskutils/plasma-applet-yawp: Fix build/crash with KDE 4.5.2 Message-ID: <4cad13fd.4a8ee50a.572e.1dfc@mx.google.com> Resent-Message-ID: <201010070030.o970UJfl087988@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151274 >Category: ports >Synopsis: [MAINTAINER] deskutils/plasma-applet-yawp: Fix build/crash with KDE 4.5.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Oct 07 00:30:18 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 8.0-RELEASE i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Fri Nov 27 18:56:06 EST 2009 root@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA8 i386 KDE 4.5.2 >Description: - Fix build of deskutils/plasma-applet-yawp with KDE 4.5.2. - If yawp was already installed (built against KDE 4.5.0 or 4.5.1 libraries) it will crash plasma in KDE 4.5.2. - Bump PORTREVISION since previously installed versions will crash plasma. >How-To-Repeat: Use attached diff. New patches: files/patch-ions__ion_accuweather.cpp files/patch-ions__ion_accuweather.h files/patch-ions__ion_google.cpp files/patch-ions__ion_google.h files/patch-ions__ion_wunderground.cpp files/patch-ions__ion_wunderground.h >Fix: --- 2010-10-06-plasma-applet-yawp.diff begins here --- diff -ruN plasma-applet-yawp.orig/Makefile plasma-applet-yawp/Makefile --- plasma-applet-yawp.orig/Makefile 2010-10-06 19:44:25.000000000 -0400 +++ plasma-applet-yawp/Makefile 2010-10-06 19:42:50.000000000 -0400 @@ -7,6 +7,7 @@ PORTNAME= yawp PORTVERSION= 0.3.4 +PORTREVISION= 1 CATEGORIES= deskutils kde MASTER_SITES= SF PKGNAMEPREFIX= plasma-applet- diff -ruN plasma-applet-yawp.orig/files/patch-ions__ion_accuweather.cpp plasma-applet-yawp/files/patch-ions__ion_accuweather.cpp --- plasma-applet-yawp.orig/files/patch-ions__ion_accuweather.cpp 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-yawp/files/patch-ions__ion_accuweather.cpp 2010-10-06 19:37:47.000000000 -0400 @@ -0,0 +1,12 @@ +--- ./ions/ion_accuweather.cpp.orig 2010-10-06 19:19:45.000000000 -0400 ++++ ./ions/ion_accuweather.cpp 2010-10-06 19:26:10.000000000 -0400 +@@ -234,7 +234,8 @@ + + #if KDE_VERSION_MINOR >= 3 + /** Triggered when we get initial setup data for ions that provide a list of places */ +- emit(resetCompleted(this, true)); ++ m_sourcesToReset = sources(); ++ updateAllSources(); + #endif + dEndFunct(); + } diff -ruN plasma-applet-yawp.orig/files/patch-ions__ion_accuweather.h plasma-applet-yawp/files/patch-ions__ion_accuweather.h --- plasma-applet-yawp.orig/files/patch-ions__ion_accuweather.h 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-yawp/files/patch-ions__ion_accuweather.h 2010-10-06 19:31:22.000000000 -0400 @@ -0,0 +1,11 @@ +--- ./ions/ion_accuweather.h.orig 2010-10-06 19:19:59.000000000 -0400 ++++ ./ions/ion_accuweather.h 2010-10-06 19:27:18.000000000 -0400 +@@ -199,6 +199,8 @@ + + inline QString stringConverter( const QString & sValue ) const { return sValue.isEmpty() ? "N/A" : sValue; } + ++ QStringList m_sourcesToReset; ++ + struct Private; + Private * const d; + }; diff -ruN plasma-applet-yawp.orig/files/patch-ions__ion_google.cpp plasma-applet-yawp/files/patch-ions__ion_google.cpp --- plasma-applet-yawp.orig/files/patch-ions__ion_google.cpp 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-yawp/files/patch-ions__ion_google.cpp 2010-10-06 19:31:22.000000000 -0400 @@ -0,0 +1,12 @@ +--- ./ions/ion_google.cpp.orig 2010-10-06 19:20:27.000000000 -0400 ++++ ./ions/ion_google.cpp 2010-10-06 19:30:00.000000000 -0400 +@@ -209,7 +209,8 @@ + + #if KDE_VERSION_MINOR >= 3 + /** Triggered when we get initial setup data for ions that provide a list of places */ +- emit(resetCompleted(this, true)); ++ m_sourcesToReset = sources(); ++ updateAllSources(); + #endif + } + diff -ruN plasma-applet-yawp.orig/files/patch-ions__ion_google.h plasma-applet-yawp/files/patch-ions__ion_google.h --- plasma-applet-yawp.orig/files/patch-ions__ion_google.h 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-yawp/files/patch-ions__ion_google.h 2010-10-06 19:31:22.000000000 -0400 @@ -0,0 +1,11 @@ +--- ./ions/ion_google.h.orig 2010-10-06 19:20:41.000000000 -0400 ++++ ./ions/ion_google.h 2010-10-06 19:27:02.000000000 -0400 +@@ -85,6 +85,8 @@ + + QString getIconName( const QString & sNodeValue ); + ++ QStringList m_sourcesToReset; ++ + struct Private; + Private * const d; + }; diff -ruN plasma-applet-yawp.orig/files/patch-ions__ion_wunderground.cpp plasma-applet-yawp/files/patch-ions__ion_wunderground.cpp --- plasma-applet-yawp.orig/files/patch-ions__ion_wunderground.cpp 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-yawp/files/patch-ions__ion_wunderground.cpp 2010-10-06 19:31:22.000000000 -0400 @@ -0,0 +1,12 @@ +--- ./ions/ion_wunderground.cpp.orig 2010-10-06 19:20:53.000000000 -0400 ++++ ./ions/ion_wunderground.cpp 2010-10-06 19:31:07.000000000 -0400 +@@ -215,7 +215,8 @@ + + #if KDE_VERSION_MINOR >= 3 + /** Triggered when we get initial setup data for ions that provide a list of places */ +- emit(resetCompleted(this, true)); ++ m_sourcesToReset = sources(); ++ updateAllSources(); + #endif + dEndFunct(); + } diff -ruN plasma-applet-yawp.orig/files/patch-ions__ion_wunderground.h plasma-applet-yawp/files/patch-ions__ion_wunderground.h --- plasma-applet-yawp.orig/files/patch-ions__ion_wunderground.h 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-yawp/files/patch-ions__ion_wunderground.h 2010-10-06 19:31:22.000000000 -0400 @@ -0,0 +1,11 @@ +--- ./ions/ion_wunderground.h.orig 2010-10-06 19:21:08.000000000 -0400 ++++ ./ions/ion_wunderground.h 2010-10-06 19:30:22.000000000 -0400 +@@ -88,6 +88,8 @@ + void readWeatherForecast( QXmlStreamReader & xml, XmlWeatherData & data ); + void updateWeatherSource( const XmlWeatherData & data, const QString & sSource, const QString & sLocation ); + ++ QStringList m_sourcesToReset; ++ + struct Private; + Private * const d; + }; --- 2010-10-06-plasma-applet-yawp.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4cad13fd.4a8ee50a.572e.1dfc>