Репозиторий Sisyphus
Последнее обновление: 18 февраля 2019 | Пакетов: 18500 | Посещений: 13037438
en ru br
Репозитории ALT
S:0.9.8.9-alt8.svn20120124
5.1: 0.9.7.10-alt1.svn20091021.1
4.1: 0.9.2-alt1.1
4.0: 0.8.9-alt2
3.0: 0.5.8.3-alt1
www.altlinux.org/Changes

Группа :: Науки/Прочее
Пакет: qtiplot

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: qtiplot-0.9.8.9-debian-fix_FTBFS_sip4.19.patch
Скачать


Description: Use new sip-API
Author: Anton Gladky <gladk@debian.org>, Vladimir
Origin: https://bugs.gentoo.org/641514#c2
Bug-Debian: https://bugs.debian.org/882026
Last-Update: 2017-12-30
Index: qtiplot-0.9.8.9/qtiplot/src/scripting/PythonScripting.cpp
===================================================================
--- 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)
Index: qtiplot-0.9.8.9/qtiplot/src/scripting/qti.sip
===================================================================
--- qtiplot-0.9.8.9.orig/qtiplot/src/scripting/qti.sip
+++ qtiplot-0.9.8.9/qtiplot/src/scripting/qti.sip
@@ -3243,11 +3243,11 @@ public:
 %MethodCode
   SIPQTI_APP(new sipFFT(app, a0, *a1, a2, a3))
 %End
-  FFT(QwtPlotCurve *&) /NoDerived/;
+  FFT(QwtPlotCurve *) /NoDerived/;
 %MethodCode
   SIPQTI_APP(new sipFFT(app, a0))
 %End
-  FFT(QwtPlotCurve *&, double, double) /NoDerived/;
+  FFT(QwtPlotCurve *, double, double) /NoDerived/;
 %MethodCode
   SIPQTI_APP(new sipFFT(app, a0, a1, a2))
 %End
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin