Hello community,
here is the log from the commit of package extragear-plasma
checked in at Thu Apr 24 01:28:06 CEST 2008.
--------
--- KDE/extragear-plasma/extragear-plasma.changes 2008-02-03 17:08:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/extragear-plasma/extragear-plasma.changes 2008-04-23 16:03:20.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr 23 16:03:13 CEST 2008 - dmueller@suse.de
+
+- update dilbet comic provider
+
+-------------------------------------------------------------------
New:
----
comic-dataengine-update.diff
extragear-plasma-pics.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extragear-plasma.spec ++++++
--- /var/tmp/diff_new_pack.r23726/_old 2008-04-24 01:27:47.000000000 +0200
+++ /var/tmp/diff_new_pack.r23726/_new 2008-04-24 01:27:47.000000000 +0200
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: extragear-plasma
BuildRequires: kdebase4-workspace-devel libqimageblitz-devel
%if %suse_version > 1020
@@ -19,9 +20,10 @@
Group: System/GUI/KDE
Summary: More KDE Workspace Widgets
Version: 4.0.1
-Release: 1
-%define rversion 4.0.1
-Source0: %name-%rversion.tar.bz2
+Release: 46
+Source0: %name-%version.tar.bz2
+Source1: %name-pics.tar.bz2
+Patch0: comic-dataengine-update.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@@ -35,7 +37,8 @@
The KDE Team
%prep
-%setup -q -n extragear-plasma-%rversion
+%setup -q -a 1 -n extragear-plasma-%version
+%patch0
%build
%cmake_kde4 -d build
@@ -76,6 +79,8 @@
/usr/share/kde4/apps/plasma-bluemarble
%changelog
+* Wed Apr 23 2008 dmueller@suse.de
+- update dilbet comic provider
* Sat Feb 02 2008 stbinner@suse.de
- update to 4.0.1 release
* Sun Jan 06 2008 stbinner@suse.de
@@ -92,5 +97,5 @@
- update to 3.96.1
* Wed Nov 14 2007 dmueller@suse.de
- update to 3.96.0
-* Thu Nov 08 2007 dmueller@suse.de
+* Fri Nov 09 2007 dmueller@suse.de
- update to 3.95.2
++++++ comic-dataengine-update.diff ++++++
--- dataengines/comic/dilbertprovider.cpp
+++ dataengines/comic/dilbertprovider.cpp
@@ -25,6 +25,8 @@
#include "dilbertprovider.h"
+#include <KUrl>
+
class DilbertProvider::Private
{
public:
@@ -55,22 +57,27 @@
return;
}
- const QString pattern( "![](\"/comics/dilbert/archive/images/dilbert")
readAll() );
+ const QString data = QString::fromUtf8( mHttp->readAll() );
- int pos = exp.indexIn( data ) + pattern.length();
+ const int pos = exp.indexIn( data );
- const QString sub = data.mid( pos, data.indexOf( '"', pos ) - pos );
+ KUrl url;
- QUrl url( QString( "http://dilbert.com/comics/dilbert/archive/images/dilbert%1" ).arg( sub ) );
+ if (pos > -1) {
+ QString sub = exp.cap(1);
+ url = KUrl( QString( "http://dilbert.com/%1" ).arg( sub ) );
+ } else {
+ url = KUrl( QString( "http://dilbert.com/img/v1/404.gif" ) );
+ }
- mImageHttp = new QHttp( "dilbert.com", 80, mParent );
- mImageHttp->setHost( url.host() );
- mImageHttp->get( url.path() );
+ mImageHttp = new QHttp( "dilbert.com", 80, mParent );
+ mImageHttp->setHost( url.host() );
+ mImageHttp->get( url.path() );
- mParent->connect( mImageHttp, SIGNAL( done( bool ) ), mParent, SLOT( imageRequestFinished( bool ) ) );
+ mParent->connect( mImageHttp, SIGNAL( done( bool ) ), mParent, SLOT( imageRequestFinished( bool ) ) );
}
void DilbertProvider::Private::imageRequestFinished( bool error )
@@ -88,7 +95,8 @@
DilbertProvider::DilbertProvider( const QDate &date, QObject *parent )
: ComicProvider( parent ), d( new Private( this, date ) )
{
- QUrl url( QString( "http://dilbert.com/comics/dilbert/archive/dilbert-%1.html" ).arg( date.toString( "yyyyMMdd" ) ) );
+ KUrl url( QString( "http://dilbert.com/strips/comic/%1/" )
+ .arg( date.toString( "yyyy-MM-dd" ) ) );
QHttpRequestHeader header( "GET", url.path() );
header.setValue( "User-Agent", "Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.6 (like Gecko)" );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
