Hello community,
here is the log from the commit of package kde4-webkitpart for openSUSE:Factory
checked in at Wed Jun 10 18:26:49 CEST 2009.
--------
--- KDE/kde4-webkitpart/kde4-webkitpart.changes 2009-05-18 09:38:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/kde4-webkitpart/kde4-webkitpart.changes 2009-06-03 09:38:49.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jun 3 09:30:14 CEST 2009 - beineri@opensuse.org
+
+- update to SVN 976977
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-webkitpart.spec ++++++
--- /var/tmp/diff_new_pack.e23156/_old 2009-06-10 18:26:22.000000000 +0200
+++ /var/tmp/diff_new_pack.e23156/_new 2009-06-10 18:26:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kde4-webkitpart (Version 4.2.3.svn967285)
+# spec file for package kde4-webkitpart (Version 4.2.4.svn976977)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,8 +23,8 @@
License: LGPL v2.0 or later; LGPL v2.1 or later
Group: System/GUI/KDE
Summary: WebKit render engine for Konqueror
-Version: 4.2.3.svn967285
-Release: 2
+Version: 4.2.4.svn976977
+Release: 1
Source0: libs.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@@ -93,6 +93,8 @@
%_kde_share_dir/apps/cmake/modules/FindWebKitPart.cmake
%changelog
+* Wed Jun 03 2009 beineri@opensuse.org
+- update to SVN 976977
* Mon May 18 2009 beineri@opensuse.org
- update file list
* Wed May 13 2009 beineri@opensuse.org
++++++ libs.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebpage.cpp new/libs/webkitkde/kdewebkit/kwebpage.cpp
--- old/libs/webkitkde/kdewebkit/kwebpage.cpp 2009-05-11 23:26:22.000000000 +0200
+++ new/libs/webkitkde/kdewebkit/kwebpage.cpp 2009-05-29 02:41:53.000000000 +0200
@@ -51,7 +51,6 @@
#include <QUiLoader>
#include
-#if KDE_IS_VERSION(4, 2, 70)
class NullNetworkReply : public QNetworkReply
{
public:
@@ -62,34 +61,31 @@
virtual qint64 readData(char*, qint64) { return -1; };
};
+#if KDE_IS_VERSION(4, 2, 70)
class NetworkAccessManager : public KIO::AccessManager
-{
-public:
- NetworkAccessManager(QObject *parent) : KIO::AccessManager(parent) {}
-protected:
- virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0)
- {
- if (WebKitSettings::self()->isAdFilterEnabled() && WebKitSettings::self()->isAdFiltered(req.url().toString())) {
- return new NullNetworkReply();
- }
- return KIO::AccessManager::createRequest(op, req, outgoingData);
- }
-};
#else
class NetworkAccessManager : public KNetworkAccessManager
+#endif
{
public:
+ #if KDE_IS_VERSION(4, 2, 70)
+ NetworkAccessManager(QObject *parent) : KIO::AccessManager(parent) {}
+ #else
NetworkAccessManager(QObject *parent) : KNetworkAccessManager(parent) {}
+ #endif
protected:
virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0)
{
if (WebKitSettings::self()->isAdFilterEnabled() && WebKitSettings::self()->isAdFiltered(req.url().toString())) {
- return new KNetworkReply(KNetworkAccessManager::Operation(), req, 0, this);
+ return new NullNetworkReply();
}
- return KNetworkAccessManager::createRequest(op, req, outgoingData);
+ #if KDE_IS_VERSION(4, 2, 70)
+ return KIO::AccessManager::createRequest(op, req, outgoingData);
+ #else
+ return KNetworkAccessManager::createRequest(op, req, outgoingData);
+ #endif
}
};
-#endif
class KWebPage::KWebPagePrivate
{
@@ -97,11 +93,7 @@
KWebPagePrivate() {}
QString getFileNameForDownload(const QNetworkRequest &request, QNetworkReply *reply) const;
-#if KDE_IS_VERSION(4, 2, 70)
- KIO::AccessManager* accessManager;
-#else
- KNetworkAccessManager* accessManager;
-#endif
+ NetworkAccessManager* accessManager;
};
QString KWebPage::KWebPagePrivate::getFileNameForDownload(const QNetworkRequest &request, QNetworkReply *reply) const
@@ -123,11 +115,7 @@
KWebPage::KWebPage(QObject *parent)
: QWebPage(parent), d(new KWebPage::KWebPagePrivate())
{
-#if KDE_IS_VERSION(4, 2, 70)
- d->accessManager = new KIO::AccessManager(this);
-#else
- d->accessManager = new KNetworkAccessManager(this);
-#endif
+ d->accessManager = new NetworkAccessManager(this);
setNetworkAccessManager(d->accessManager);
setPluginFactory(new KWebPluginFactory(pluginFactory(), this));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.desktop new/libs/webkitkde/part/webkitpart.desktop
--- old/libs/webkitkde/part/webkitpart.desktop 2009-03-23 16:00:56.000000000 +0100
+++ new/libs/webkitkde/part/webkitpart.desktop 2009-05-26 16:24:22.000000000 +0200
@@ -9,6 +9,7 @@
Comment[gl]=Compoñente HTML integrábel
Comment[km]=សមាសធាតុ HTML ដែលអាចបង្កប់បាន
Comment[lt]=Įdedamas HTML komponentas
+Comment[ml]=എംബഡബിള് ആയിട്ടുള്ള എച്ച്ടിഎംഎല് ഘടകം
Comment[nds]=Inbettbor HTML-Komponent
Comment[nl]=Inbedbare HTML-component
Comment[pa]=ਇੰਬੈੱਡਡ HTML ਭਾਗ
@@ -25,6 +26,7 @@
MimeType=text/html;application/xml;application/xhtml+xml;
Icon=webkit
Name=WebKit
+Name[ml]=വെബ്കിറ്റ്
Name[pa]=ਵੈੱਬਕਿੱਟ
Name[sv]=Webkit
Name[x-test]=xxWebKitxx
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org