[qtiplot] 01/01: First try to fix #882026

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository qtiplot.

commit 1843f2737a0293739c637dc8a526b315d786346d
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Dec 30 17:49:53 2017 +0100

    First try to fix #882026
---
 debian/patches/20_fix_FTBFS_sip4.19.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/20_fix_FTBFS_sip4.19.patch b/debian/patches/20_fix_FTBFS_sip4.19.patch
new file mode 100644
index 0000000..5d7a76f
--- /dev/null
+++ b/debian/patches/20_fix_FTBFS_sip4.19.patch
@@ -0,0 +1,31 @@
+Description: Use new sip-API
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/882026
+Last-Update: 2017-12-30
+
+--- qtiplot-0.9.8.9.orig/qtiplot/src/scripting/PythonScripting.cpp
++++ qtiplot-0.9.8.9/qtiplot/src/scripting/PythonScripting.cpp
+@@ -58,7 +58,7 @@ typedef struct _traceback {
+ #include <QMessageBox>
+ 
+ // includes sip.h, which undefines Qt's "slots" macro since SIP 4.6
+-#include "sipAPIqti.h"
++#include "sip.h"
+ extern "C" void initqti();
+ 
+ const char* PythonScripting::langName = "Python";
+@@ -359,10 +359,11 @@ bool PythonScripting::setQObject(QObject
+ 	if(!val) return false;
+ 	PyObject *pyobj=NULL;
+ 
+-	PyGILState_STATE state = PyGILState_Ensure();
++	sipAPIDef sip_API;
+ 
+-	sipWrapperType * klass = sipFindClass(val->className());
+-	if (klass) pyobj = sipConvertFromInstance(val, klass, NULL);
++	PyGILState_STATE state = PyGILState_Ensure();
++	const auto klass = sip_API.api_find_class(val->className());
++	if (klass) pyobj = sip_API.api_convert_from_type(val, klass->wt_td, NULL);
+ 
+ 	if (pyobj) {
+ 		if (dict)
diff --git a/debian/patches/series b/debian/patches/series
index bb6ca59..b0b299f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ disable_en_pdf.patch
 fix_stack_overflow.patch
 11_ftbfs-gcc-6.cpp
 15_fix_sip_4-9_compilatio.patch
+20_fix_FTBFS_sip4.19.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qtiplot.git