* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/qtiplot/, sci-visualization/qtiplot/files/
@ 2017-03-05 12:42 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-03-05 12:42 UTC (permalink / raw
To: gentoo-commits
commit: 68af1bcdec50266f55ffd8cbd32e5522b820935a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 5 12:41:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 12:42:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68af1bcd
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(-)
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 00000000000..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.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 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? (
>=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 )"
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/qtiplot/, sci-visualization/qtiplot/files/
@ 2016-02-18 16:34 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2016-02-18 16:34 UTC (permalink / raw
To: gentoo-commits
commit: d8536989154b2c485d0e6f799272e3b89ef2d9a8
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 16:33:59 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 16:34:32 2016 +0000
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 <jlec <AT> 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 0000000..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 &iterations, int &status)
+ {
+ 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 &iteration
+ }
+
+ 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 &iteration
+ 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
+ <sci-libs/gsl-2
sci-libs/tamu_anova
latex? ( dev-tex/qtexengine )
mono? ( dev-dotnet/libgdiplus )
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 eec88b2..060eeae 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-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
+ <sci-libs/gsl-2
sci-libs/tamu_anova
latex? ( dev-tex/qtexengine )
mono? ( dev-dotnet/libgdiplus )
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
similarity index 86%
copy from sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
copy to sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
index eec88b2..5163a6a 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs
+inherit eutils qmake-utils python-single-r1 toolchain-funcs xdg
DESCRIPTION="Qt based clone of the Origin plotting package"
-HOMEPAGE="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"
SLOT="0"
@@ -45,7 +46,7 @@ CDEPEND="
dev-libs/quazip
media-libs/libpng:=
sci-libs/alglib:=
- sci-libs/gsl
+ >=sci-libs/gsl-2
sci-libs/tamu_anova
latex? ( dev-tex/qtexengine )
mono? ( dev-dotnet/libgdiplus )
@@ -63,7 +64,7 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}"
PATCHES=(
- "${DISTDIR}"/${P}-origin.patch.bz2
+ "${WORKDIR}"/${P}-origin.patch
"${FILESDIR}"/${P}-origin-2.patch
"${FILESDIR}"/${P}-qt48.patch
"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
@@ -76,6 +77,7 @@ PATCHES=(
"${FILESDIR}"/${P}-private.patch
"${FILESDIR}"/${P}-sip-4.15.patch
"${FILESDIR}"/${P}-PyQt4-4.11.3.patch
+ "${FILESDIR}"/${P}-gsl-2.patch
)
RESTRICT="!bindist? ( bindist )"
@@ -87,13 +89,15 @@ pkg_setup() {
src_prepare() {
local mylibs
- qt4-r2_src_prepare
+ xdg_src_prepare
- rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die
+ rm -rf \
+ 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} \
+ || die
sed \
-e "s:dll:static:g" \
-e "/INSTALLS/d" \
- -i 3rdparty/qwtplot3d/*.pro
+ -i 3rdparty/qwtplot3d/*.pro || die
mylibs="${mylibs} -lquazip"
use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
@@ -111,7 +115,7 @@ src_prepare() {
QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
- EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF
+ EMF_INCLUDEPATH = "${EPREFIX}"/usr/include/libEMF
SYS_LIBS = -lgl2ps ${mylibs} -lGLU
LUPDATE = lupdate
@@ -176,9 +180,11 @@ src_prepare() {
chmod -x qtiplot/qti_wordlist.txt
# sed out debian paths
- sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+ sed \
+ -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
-i manual/qtiplot.dsl || die
- sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+ sed \
+ -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
-i manual/qtiplot_html.xsl || die
sed \
@@ -192,16 +198,16 @@ src_configure() {
}
src_compile() {
- emake
+ default
lrelease qtiplot/qtiplot.pro || die
if use doc; then
- cd manual
+ cd manual || die
emake web
fi
}
src_install() {
- qt4-r2_src_install
+ emake INSTALL_ROOT="${D}" install
insinto /usr/share/qtiplot
doins qtiplot/qti_wordlist.txt
@@ -209,7 +215,7 @@ src_install() {
newicon qtiplot_logo.png qtiplot.png
make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
- use doc && dohtml -r manual/html/*
+ use doc && dodoc -r manual/html
use python && python_optimize
@@ -230,9 +236,5 @@ pkg_postinst() {
dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
fi
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
+ xdg_pkg_postinst
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-05 12:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-05 12:42 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/qtiplot/, sci-visualization/qtiplot/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2016-02-18 16:34 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox