[gentoo-commits] repo/gentoo:master commit in: sci-visualization/qtiplot/, sci-visualization/qtiplot/files/
commit: 68af1bcdec50266f55ffd8cbd32e5522b820935a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 5 12:41:36 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 5 12:42:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68af1bcd sci-visualization/qtiplot: Fix build with >=sip-4.19 Thanks-to: Fabio Rossi 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(-) 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 000..a1ea502787c --- /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.sip2017-02-13 17:01:03.123828499 +0100 b/qtiplot/src/scripting/qti.sip2017-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(sipConvertToType(item, sipType_QDateTime, ++ QDateTime* dateTime = reinterpret_cast (sipConvertToType(item, sipFindType("QDateTime"), + 0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, )); + 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 (sipConvertToType(item, sipType_QTime, ++ QTime* time = reinterpret_cast (sipConvertToType(item, sipFindType("QTime"), + 0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, )); + 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 c716e31a7bb..65c127fe41f 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 963f9190a1a..42a68ecc39c 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? (
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/qtiplot/, sci-visualization/qtiplot/files/
commit: d8536989154b2c485d0e6f799272e3b89ef2d9a8 Author: Justin Lecher gentoo org> AuthorDate: Thu Feb 18 16:33:59 2016 + Commit: Justin Lecher gentoo org> CommitDate: Thu Feb 18 16:34:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8536989 sci-visualization/qtiplot: Add compatibility patch for gsl API cahnge Thanks Jürgen Rose for the patch Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=574620 Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> sci-visualization/qtiplot/Manifest | 1 + .../qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch | 36 + .../qtiplot/qtiplot-0.9.8.9-r2.ebuild | 4 +- .../qtiplot/qtiplot-0.9.8.9-r3.ebuild | 4 +- ...0.9.8.9-r3.ebuild => qtiplot-0.9.8.9-r4.ebuild} | 46 +++--- 5 files changed, 65 insertions(+), 26 deletions(-) diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest index 1fd7b6f..2271a07 100644 --- a/sci-visualization/qtiplot/Manifest +++ b/sci-visualization/qtiplot/Manifest @@ -1,2 +1,3 @@ DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99 SHA512 62f5bb531c2fc7e061661ab5733a70acf9a61ff90a934af42b5741c63478caebabc8240f37d25660f623c5cbcd530e1303e967a095ca99b3452f29cfb5200b69 WHIRLPOOL 94b4b704737c2e6bb86caa00497164749df7eb01b13b49d06daa8f33b3e34d23782bde4fec617f35755c2e2f4286327bb39270bf48a9f020e94ef113f9d962bb +DIST qtiplot-0.9.8.9-origin.patch.xz 89660 SHA256 8d1a9927fad711b7e357641926b884f68d28f8e2f648f6a7c071514d5d552c11 SHA512 adbd002975bb49997eb610b150c1bbfe9c9617b0b5bbb70f52df7475339b7d68cada175eb9f6048f6ece043ca3dcf5c62ef361d82bc670b1576ee8493d6b757c WHIRLPOOL 41fd5c1627737f060d7a0d99682e58417e050c7655798453a602c1cf9409d5bab319870b6054efe3542ac038c2bc32f804ae427646a3f56290a2c5b1905cbcd4 DIST qtiplot-0.9.8.9.tar.bz2 16202943 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 SHA512 3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a WHIRLPOOL 3cf9d9ab7d58301364a61f6c5ad51858ffe1e6214c5971c1d042c7894fcb70fa4b28fe0e6631f142ab8fa9b2c2b979e4e178bc44b1961cde70b29d9aaa2c7d3f diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch new file mode 100644 index 000..9ad8919 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch @@ -0,0 +1,36 @@ + * Info: Using [gentoo] (https://bugs.gentoo.org/xmlrpc.cgi) + * Info: Getting attachment 425760 + * Info: Viewing attachment: "fix_fit_gsl_fdfsolver.patch" +diff --git a/qtiplot/src/analysis/Fit.cpp b/qtiplot/src/analysis/Fit.cpp +index 22cb5be..555f21d 100755 +--- a/qtiplot/src/analysis/Fit.cpp b/qtiplot/src/analysis/Fit.cpp +@@ -106,6 +106,7 @@ void Fit::init() + gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int , int ) + { + const gsl_multifit_fdfsolver_type *T; ++ gsl_matrix *J; + if (d_solver) + T = gsl_multifit_fdfsolver_lmder; + else +@@ -128,7 +129,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int + } + + if (status){ +- gsl_multifit_covar (s->J, 0.0, covar); ++ gsl_multifit_fdfsolver_jac (s, J); ++ gsl_multifit_covar (J, 0.0, covar); + iterations = 0; + return s; + } +@@ -155,7 +157,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int + status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance); + } while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations); + +- gsl_multifit_covar (s->J, 0.0, covar); ++ gsl_multifit_fdfsolver_jac (s, J); ++ gsl_multifit_covar (J, 0.0, covar); + + iterations = iter; + return s; + diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild index f93b945..e2db5e6 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -45,7 +45,7 @@ CDEPEND=" dev-libs/quazip media-libs/libpng:= sci-libs/alglib:= - sci-libs/gsl + http://soft.proindependent.com/qtiplot.html +HOMEPAGE=" + http://soft.proindependent.com/qtiplot.html http://www.staff.science.uu.nl/~zeven101/qtiplot.html; SRC_URI=" https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2; + https://dev.gentoo.org/~jlec/distfiles/${P}-origin.patch.xz; LICENSE="GPL-2 GPL-3"