[SCM] PyKDE4 packaging branch, master, updated. debian/4.14.3-3-3-ga2726b8

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=a2726b8

The following commit has been merged in the master branch:
commit a2726b88c90265ebaa11a0c07b67032b3a427982
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 26 12:49:59 2017 +0100

    fix ftbfs (#881827)
---
 debian/changelog                          |  1 +
 debian/patches/qt_checkstate_pointer.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5c457e2..d7df6f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pykde4 (4:4.14.3-4) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Backport upstream commit 2d1eadf5d0148c88cb4393993f0269e196cbe7b1 to fix
     build with sip >= 4.19; patch upstream_Fix-build-with-sip-4.19.patch.
+  * Fix sip-related FTBFS. (Closes: #881827)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Dec 2017 11:59:05 +0100
 
diff --git a/debian/patches/qt_checkstate_pointer.diff b/debian/patches/qt_checkstate_pointer.diff
new file mode 100644
index 0000000..641e2d4
--- /dev/null
+++ b/debian/patches/qt_checkstate_pointer.diff
@@ -0,0 +1,26 @@
+Author: Pino Toscano <pino at debian.org>
+Last-Update: 2017-12-26
+Forwarded: no
+
+--- a/sip/kdeui/kfontchooser.sip
++++ b/sip/kdeui/kfontchooser.sip
+@@ -59,7 +59,7 @@ public:
+ 
+     typedef QFlags<KFontChooser::DisplayFlag> DisplayFlags;
+ 
+-    explicit                KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)];
++    explicit                KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)];
+ %MethodCode
+ Py_BEGIN_ALLOW_THREADS
+     sipCpp = new sipKFontChooser (a0, *a1, *a2, a3, &a4);
+--- a/sip/kdeui/kfontdialog.sip
++++ b/sip/kdeui/kfontdialog.sip
+@@ -28,7 +28,7 @@ class KFontDialog : KDialog
+ 
+ 
+ public:
+-    explicit                KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)];
++    explicit                KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)];
+ %MethodCode
+ Py_BEGIN_ALLOW_THREADS
+     sipCpp= new sipKFontDialog (a0, *a1, *a2, &a3);
diff --git a/debian/patches/series b/debian/patches/series
index 605f817..9aab523 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ pythonpluginfactory_python3.diff
 kpythonpluginfactory_3.2support.diff
 no_webview_webkit.patch
 upstream_Fix-build-with-sip-4.19.patch
+qt_checkstate_pointer.diff

-- 
PyKDE4 packaging