[SCM] PyKDE4 packaging branch, master, updated. debian/4.14.3-2-1-gec7a692
Scott Kitterman
kitterman at moszumanska.debian.org
Mon Jun 26 20:39:06 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=ec7a692
The following commit has been merged in the master branch:
commit ec7a6927e5a4194e4ac8ce36de0274d5a65d7c56
Author: Scott Kitterman <scott at kitterman.com>
Date: Mon Jun 26 16:38:53 2017 -0400
* Drop bindings for plasma webview bindings: No longer functional due to
QtWebKit being dropped from PyQt4 and obsolete (Closes: #865861)
- Add debian/patches/no_webview_webkit.patch
- Drop libqtwebkit-dev from build-depends
---
debian/changelog | 10 +++
debian/control | 1 -
debian/patches/no_webview_webkit.patch | 158 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 169 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e095d7c..b89d5b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pykde4 (4:4.14.3-3) unstable; urgency=medium
+
+ * Team upload.
+ * Drop bindings for plasma webview bindings: No longer functional due to
+ QtWebKit being dropped from PyQt4 and obsolete (Closes: #865861)
+ - Add debian/patches/no_webview_webkit.patch
+ - Drop libqtwebkit-dev from build-depends
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 26 Jun 2017 14:47:34 -0400
+
pykde4 (4:4.14.3-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index d09198b..7efe22e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9),
libphonon-dev (>= 4:4.6.0really4.4.4),
libqt4-dev (>= 4:4.7.1),
libqt4-opengl-dev (>= 4:4.7.1),
- libqtwebkit-dev,
libsoprano-dev (>= 2.7.0),
pkg-config,
pkg-kde-tools (>= 0.12),
diff --git a/debian/patches/no_webview_webkit.patch b/debian/patches/no_webview_webkit.patch
new file mode 100644
index 0000000..a398db8
--- /dev/null
+++ b/debian/patches/no_webview_webkit.patch
@@ -0,0 +1,158 @@
+--- pykde4-4.14.3.orig/CMakeLists.txt
++++ pykde4-4.14.3/CMakeLists.txt
+@@ -91,7 +91,6 @@ include_directories(
+ ${QT_QTSQL_INCLUDE_DIR}
+ ${QT_QTXML_INCLUDE_DIR}
+ ${QT_QTSVG_INCLUDE_DIR}
+- ${QT_QTWEBKIT_INCLUDE_DIR}
+ ${KDE4_INCLUDE_DIR}
+ ${KDE4_INCLUDE_DIR}/solid
+ ${KDE4_INCLUDE_DIR}/kio
+--- pykde4-4.14.3.orig/sip/plasma/abstractrunner.sip
++++ pykde4-4.14.3/sip/plasma/abstractrunner.sip
+@@ -94,7 +94,6 @@
+ #include <plasma/view.h>
+ #include <plasma/wallpaper.h>
+ #include <plasma/scripting/wallpaperscript.h>
+-#include <plasma/widgets/webview.h>
+ %End
+
+ namespace Plasma
+@@ -288,8 +287,6 @@ protected:
+ sipType = sipType_Plasma_SvgWidget;
+ else if (dynamic_cast<Plasma::TabBar*>(sipCpp))
+ sipType = sipType_Plasma_TabBar;
+- else if (dynamic_cast<Plasma::WebView*>(sipCpp))
+- sipType = sipType_Plasma_WebView;
+ else if (dynamic_cast<Plasma::CheckBox*>(sipCpp))
+ sipType = sipType_Plasma_CheckBox;
+ else if (dynamic_cast<Plasma::ComboBox*>(sipCpp))
+--- pykde4-4.14.3.orig/sip/plasma/animation.sip
++++ pykde4-4.14.3/sip/plasma/animation.sip
+@@ -163,8 +163,6 @@ protected:
+ sipType = sipType_Plasma_SvgWidget;
+ else if (dynamic_cast<Plasma::TabBar*>(sipCpp))
+ sipType = sipType_Plasma_TabBar;
+- else if (dynamic_cast<Plasma::WebView*>(sipCpp))
+- sipType = sipType_Plasma_WebView;
+ else if (dynamic_cast<Plasma::CheckBox*>(sipCpp))
+ sipType = sipType_Plasma_CheckBox;
+ else if (dynamic_cast<Plasma::ComboBox*>(sipCpp))
+@@ -292,5 +290,4 @@ public:
+ #include <plasma/view.h>
+ #include <plasma/wallpaper.h>
+ #include <plasma/scripting/wallpaperscript.h>
+-#include <plasma/widgets/webview.h>
+ %End
+--- pykde4-4.14.3.orig/sip/plasma/plasmamod.sip
++++ pykde4-4.14.3/sip/plasma/plasmamod.sip
+@@ -27,7 +27,6 @@
+ %Import QtGui/QtGuimod.sip
+ %Import QtNetwork/QtNetworkmod.sip
+ %Import QtSvg/QtSvgmod.sip
+-%Import QtWebKit/QtWebKitmod.sip
+ %Import QtXml/QtXmlmod.sip
+ %Import QtDeclarative/QtDeclarativemod.sip
+ %Import QtScript/QtScriptmod.sip
+@@ -116,5 +115,4 @@
+ %Include toolbutton.sip
+ %Include treeview.sip
+ %Include videowidget.sip
+-%Include webview.sip
+ %Include windoweffects.sip
+--- pykde4-4.14.3.orig/sip/plasma/webview.sip
++++ /dev/null
+@@ -1,93 +0,0 @@
+-// Copyright 2008 Simon Edwards <simon at simonzone.com>
+-
+-// Generated by twine
+-
+-// This program is free software; you can redistribute it and/or modify
+-// it under the terms of the GNU Library General Public License as
+-// published by the Free Software Foundation; either version 2, or
+-// (at your option) any later version.
+-
+-// This program is distributed in the hope that it will be useful,
+-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-// GNU General Public License for more details
+-
+-// You should have received a copy of the GNU Library General Public
+-// License along with this program; if not, write to the
+-// Free Software Foundation, Inc.,
+-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-
+-
+-namespace Plasma
+-{
+-
+-class WebView : QGraphicsWidget
+-{
+-%TypeHeaderCode
+-#include <plasma/widgets/webview.h>
+-%End
+-
+-
+-public:
+- explicit WebView (QGraphicsItem* parent = 0);
+- void setUrl (const KUrl& url);
+- KUrl url () const;
+-//ig void setHtml (const QByteArray& html, const KUrl& baseUrl = KUrl());
+- QString html () const;
+- void setHtml (const QString& html, const KUrl& baseUrl = KUrl());
+- QRectF geometry () const;
+- void setPage (QWebPage* page);
+- QWebPage* page () const;
+- QWebFrame* mainFrame () const;
+- void setDragToScroll (bool drag);
+- bool dragToScroll ();
+- void setGeometry (const QRectF& geometry);
+-
+-signals:
+- void loadProgress (int percent);
+- void loadFinished (bool success);
+-
+-protected:
+- void paint (QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+- void mouseMoveEvent (QGraphicsSceneMouseEvent* event);
+- void hoverMoveEvent (QGraphicsSceneHoverEvent* event);
+- void mousePressEvent (QGraphicsSceneMouseEvent* event);
+- void mouseDoubleClickEvent (QGraphicsSceneMouseEvent* event);
+- void mouseReleaseEvent (QGraphicsSceneMouseEvent* event);
+- void contextMenuEvent (QGraphicsSceneContextMenuEvent* event);
+- void wheelEvent (QGraphicsSceneWheelEvent* event);
+- void keyPressEvent (QKeyEvent* event);
+- void keyReleaseEvent (QKeyEvent* event);
+- void focusInEvent (QFocusEvent* event);
+- void focusOutEvent (QFocusEvent* event);
+- void dragEnterEvent (QGraphicsSceneDragDropEvent* event);
+- void dragLeaveEvent (QGraphicsSceneDragDropEvent* event);
+- void dragMoveEvent (QGraphicsSceneDragDropEvent* event);
+- void dropEvent (QGraphicsSceneDragDropEvent* event);
+-public:
+- ~WebView ();
+- QSizeF contentsSize () const;
+- void setScrollPosition (const QPointF& position);
+- QPointF scrollPosition () const;
+- QRectF viewportGeometry () const;
+-protected:
+- QSizeF sizeHint (Qt::SizeHint which, const QSizeF& constraint) const;
+-public:
+- qreal zoomFactor () const;
+- void setZoomFactor (const qreal zoom);
+-protected:
+- QVariant itemChange (QGraphicsItem::GraphicsItemChange change, const QVariant& value);
+-public:
+- void back ();
+- void forward ();
+- void reload ();
+- void stop ();
+-signals:
+- void urlChanged (const QUrl& url);
+-};
+-// WebView
+-
+-};
+-// Plasma
+-
+-
diff --git a/debian/patches/series b/debian/patches/series
index 9975f63..432c6a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ new_pyincludes.diff
cmake_no_bytecode.diff
pythonpluginfactory_python3.diff
kpythonpluginfactory_3.2support.diff
+no_webview_webkit.patch
--
PyKDE4 packaging
More information about the pkg-kde-commits
mailing list