mirror of
https://git.freebsd.org/ports.git
synced 2025-05-21 11:33:15 -04:00
* This is mostly based on the work by Adriaan de Groot <groot@kde.org> in our development repo. PR: 217305 PR: 218539 Submitted by: Adriaan de Groot <groot@kde.org> Reviewed by: rakuco, mat Approved by: rakuco (mentor) Exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D9771
46 lines
1.8 KiB
Text
46 lines
1.8 KiB
Text
Obtained from: https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-visualization/qtiplot
|
|
|
|
sci-visualization/qtiplot: Fix build with >=sip-4.19
|
|
Thanks-to: Fabio Rossi <rossi.f@inwind.it>
|
|
Gentoo-bug: 609280
|
|
|
|
Package-Manager: Portage-2.3.3, Repoman-2.3.1
|
|
|
|
--- qtiplot/src/scripting/qti.sip 2017-02-13 17:01:03.123828499 +0100
|
|
+++ qtiplot/src/scripting/qti.sip 2017-02-13 17:02:12.628828234 +0100
|
|
@@ -148,14 +148,14 @@
|
|
}
|
|
break;
|
|
case Table::Date:
|
|
- if (sipCanConvertToType(item, sipType_QDateTime, 0)) {
|
|
+ if (sipCanConvertToType(item, sipFindType("QDateTime"), 0)) {
|
|
int isErr = 0;
|
|
- QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipType_QDateTime,
|
|
+ QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipFindType("QDateTime"),
|
|
0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr));
|
|
if (isErr)
|
|
return 1;
|
|
table->setText(row, col, dateTime->toString(table->columnFormat(col)));
|
|
- delete dateTime;
|
|
+ //delete dateTime;
|
|
}
|
|
else {
|
|
if (PyType_Ready(item_type) == 0)
|
|
@@ -164,14 +164,14 @@
|
|
}
|
|
break;
|
|
case Table::Time:
|
|
- if (sipCanConvertToType(item, sipType_QTime, 0)) {
|
|
+ if (sipCanConvertToType(item, sipFindType("QTime"), 0)) {
|
|
int isErr = 0;
|
|
- QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipType_QTime,
|
|
+ QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipFindType("QTime"),
|
|
0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr));
|
|
if (isErr)
|
|
return 1;
|
|
table->setText(row, col, time->toString(table->columnFormat(col)));
|
|
- delete time;
|
|
+ //delete time;
|
|
}
|
|
else {
|
|
if (PyType_Ready(item_type) == 0)
|