[qtiplot] 03/05: Fix build with >=sip-4.19. (Closes: #872636)
Anton Gladky
gladk at moszumanska.debian.org
Tue Aug 29 21:16:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository qtiplot.
commit 247542e2e2f39f2dc15b761a8aac1060e3fca5d9
Author: Andreas Sturmlechner <asturm at gentoo.org>
Date: Tue Aug 29 21:52:03 2017 +0200
Fix build with >=sip-4.19. (Closes: #872636)
---
debian/patches/15_fix_sip_4-9_compilatio.patch | 153 +++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 154 insertions(+)
diff --git a/debian/patches/15_fix_sip_4-9_compilatio.patch b/debian/patches/15_fix_sip_4-9_compilatio.patch
new file mode 100644
index 0000000..950138a
--- /dev/null
+++ b/debian/patches/15_fix_sip_4-9_compilatio.patch
@@ -0,0 +1,153 @@
+From 68af1bcdec50266f55ffd8cbd32e5522b820935a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm at gentoo.org>
+Date: Sun, 5 Mar 2017 13:41:36 +0100
+Subject: [PATCH] sci-visualization/qtiplot: Fix build with >=sip-4.19
+
+Thanks-to: Fabio Rossi <rossi.f at inwind.it>
+Gentoo-bug: 609280
+
+Package-Manager: Portage-2.3.3, Repoman-2.3.1
+---
+ .../qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch | 38 ++++++++++++++++++++++
+ .../qtiplot/qtiplot-0.9.8.9-r3.ebuild | 5 +--
+ .../qtiplot/qtiplot-0.9.8.9-r4.ebuild | 36 ++++++++++----------
+ 3 files changed, 60 insertions(+), 19 deletions(-)
+ create mode 100644 sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch
+
+diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch
+new file mode 100644
+index 000000000000..a1ea502787c3
+--- /dev/null
++++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch
+@@ -0,0 +1,38 @@
++--- a/qtiplot/src/scripting/qti.sip 2017-02-13 17:01:03.123828499 +0100
+++++ b/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)
+diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
+index c716e31a7bb1..65c127fe41f9 100644
+--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
++++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
+@@ -1,4 +1,4 @@
+-# Copyright 1999-2016 Gentoo Foundation
++# Copyright 1999-2017 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+
+ EAPI=5
+@@ -75,7 +75,8 @@ PATCHES=(
+ "${FILESDIR}"/${P}-private.patch
+ "${FILESDIR}"/${P}-sip-4.15.patch
+ "${FILESDIR}"/${P}-PyQt4-4.11.3.patch
+- )
++ "${FILESDIR}"/${P}-sip-4.19.patch
++)
+
+ RESTRICT="!bindist? ( bindist )"
+
+diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
+index 963f9190a1a9..42a68ecc39cb 100644
+--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
++++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
+@@ -1,4 +1,4 @@
+-# Copyright 1999-2016 Gentoo Foundation
++# Copyright 1999-2017 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+
+ EAPI=6
+@@ -31,36 +31,37 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+ # qwtplot3d much modified from original upstream
+ # >=x11-libs/qwt-5.3 they are using trunk checkouts
+-CDEPEND="
+- media-libs/libemf
+- dev-qt/qthelp:4
+- dev-qt/qtgui:4
+- dev-qt/qtopengl:4
+- dev-qt/qt3support:4
+- dev-qt/qthelp:4[compat]
+- dev-qt/qtsvg:4
+- >=x11-libs/gl2ps-1.3.5[png]
++RDEPEND="
+ >=dev-cpp/muParser-1.32
+ >=dev-libs/boost-1.35.0:=
+ dev-libs/quazip[qt4]
++ dev-qt/qt3support:4
++ dev-qt/qtgui:4
++ dev-qt/qthelp:4
++ dev-qt/qthelp:4[compat]
++ dev-qt/qtopengl:4
++ dev-qt/qtsvg:4
++ media-libs/libemf
+ media-libs/libpng:=
+ sci-libs/alglib:=
+ >=sci-libs/gsl-2
+ sci-libs/tamu_anova
++ >=x11-libs/gl2ps-1.3.5[png]
+ latex? ( dev-tex/qtexengine )
+ mono? ( dev-dotnet/libgdiplus )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+- )"
+-DEPEND="${CDEPEND}
++ )
++"
++DEPEND="${RDEPEND}
+ virtual/pkgconfig
+- python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] )
+ doc? (
+ >=app-text/docbook-sgml-utils-0.6.14-r1
+- >=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+-
+-RDEPEND="${CDEPEND}"
++ >=app-text/docbook-xml-dtd-4.4-r2:4.4
++ )
++ python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] )
++"
+
+ PATCHES=(
+ "${WORKDIR}"/${P}-origin.patch
+@@ -77,7 +78,8 @@ PATCHES=(
+ "${FILESDIR}"/${P}-sip-4.15.patch
+ "${FILESDIR}"/${P}-PyQt4-4.11.3.patch
+ "${FILESDIR}"/${P}-gsl-2.patch
+- )
++ "${FILESDIR}"/${P}-sip-4.19.patch
++)
+
+ RESTRICT="!bindist? ( bindist )"
+
diff --git a/debian/patches/series b/debian/patches/series
index 8cdbf0c..bb6ca59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ disable_en_pdf.patch
10_adopt_to_gsl2.diff
fix_stack_overflow.patch
11_ftbfs-gcc-6.cpp
+15_fix_sip_4-9_compilatio.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qtiplot.git
More information about the debian-science-commits
mailing list