diff options
| author | tcberner <tcberner@FreeBSD.org> | 2017-04-30 18:07:23 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2017-04-30 18:07:23 +0800 |
| commit | a10b20936507869f5c602054ddc8aef5d0cd759f (patch) | |
| tree | 14a76c1351a42a41d3f48c96da3e0b221f278796 /math | |
| parent | a05611c310beba6a3c8e6804fc08fe199de8c98f (diff) | |
| download | freebsd-ports-gnome-a10b20936507869f5c602054ddc8aef5d0cd759f.tar.gz freebsd-ports-gnome-a10b20936507869f5c602054ddc8aef5d0cd759f.tar.zst freebsd-ports-gnome-a10b20936507869f5c602054ddc8aef5d0cd759f.zip | |
Update py-sip to 4.19.2, py-qt4 to 4.12 and py-qt5 to 5.7.1
* 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
Diffstat (limited to 'math')
| -rw-r--r-- | math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19 | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19 b/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19 new file mode 100644 index 000000000000..ed805d10c6e1 --- /dev/null +++ b/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19 @@ -0,0 +1,46 @@ +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) |