jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gnuplot: update to 5.0.3

Browse source
This commit is contained in:
Alessio Sergi 2016-02-22 20:25:03 +01:00
parent a07f96e1ed
commit 374a2a0e9e
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
srcpkgs/gnuplot/patches/musl-isnan.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git src/qtterminal/qt_conversion.cpp src/qtterminal/qt_conversion.cpp
index 38fd177..95ee48c 100644
--- src/qtterminal/qt_conversion.cpp
+++ src/qtterminal/qt_conversion.cpp
@@ -126,7 +126,7 @@ QImage qt_imageToQImage(int M, int N, coordval* image, t_imagecolor color_mode)
QRgb* line = (QRgb*)(qimage.scanLine(n));
for (int m = 0; m < M; m++)
{
- if (isnan(*image))
+ if (std::isnan(*image))
{
image++;
*line++ = 0x00000000;

22
srcpkgs/gnuplot/template
View file

@ -1,24 +1,21 @@
# Template file for 'gnuplot' # Template file for 'gnuplot'
pkgname=gnuplot pkgname=gnuplot
version=5.0.2 version=5.0.3
revision=2 revision=1
configure_args="--with-readline=builtin" configure_args="--with-readline=builtin"
hostmakedepends="pkg-config lua52" hostmakedepends="pkg-config lua52"
makedepends="zlib-devel libX11-devel gd-devel lua52-devel" makedepends="zlib-devel libX11-devel gd-devel lua52-devel"
depends="gnuplot-common>=${version}_${revision}" depends="gnuplot-common>=${version}_${revision}"
replaces="gnuplot<4.6.6_1"
short_desc="Command-line driven graphing utility" short_desc="Command-line driven graphing utility"
maintainer="Eivind Uggedal <eivind@uggedal.com>" maintainer="Eivind Uggedal <eivind@uggedal.com>"
homepage="http://www.gnuplot.info/" homepage="http://www.gnuplot.info/"
license="gnuplot" license="gnuplot"
distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
checksum=5a2b31d375f56d29272193370705164cde49545a332841183bcca44f02b1d890 checksum=5f6ee35f3f22014058e999911934bfa9db28e02a2722a7001c192cd182b8c715
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
subpackages="gnuplot-common" subpackages="gnuplot-common"
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
makedepends+=" cairo-devel pango-devel wxWidgets-devel qt-devel" makedepends+=" cairo-devel pango-devel wxWidgets-devel qt5-tools-devel qt5-svg-devel"
subpackages+=" gnuplot-wx gnuplot-qt" subpackages+=" gnuplot-wx gnuplot-qt"
fi fi
@ -44,13 +41,10 @@ pre_configure() {
cp -a x11 qt cp -a x11 qt
fi fi
} }
do_configure() { do_configure() {
export LUA_CFLAGS="-L${XBPS_CROSS_BASE}/usr/include/lua5.2"
export LUA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -llua5.2"
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
cd ${wrksrc}/x11 cd ${wrksrc}/x11
./configure ${configure_args} --without-qt --disable-wxwidgets --without-cairo --disable-wxt ./configure ${configure_args} --disable-wxwidgets --without-cairo --without-qt
cd ${wrksrc}/wx cd ${wrksrc}/wx
./configure ${configure_args} --without-qt ac_cv_path_WX_CONFIG=/usr/bin/wx-config-3.0 LIBS="-lX11" ./configure ${configure_args} --without-qt ac_cv_path_WX_CONFIG=/usr/bin/wx-config-3.0 LIBS="-lX11"
cd ${wrksrc}/qt cd ${wrksrc}/qt
@ -60,7 +54,6 @@ do_configure() {
./configure ${configure_args} ./configure ${configure_args}
fi fi
} }
do_build() { do_build() {
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
make -C wx ${makejobs} make -C wx ${makejobs}
@ -68,7 +61,6 @@ do_build() {
fi fi
make -C x11 ${makejobs} make -C x11 ${makejobs}
} }
do_install() { do_install() {
# install x11 and rename binary # install x11 and rename binary
make -C x11 DESTDIR=${DESTDIR} install make -C x11 DESTDIR=${DESTDIR} install
@ -91,7 +83,6 @@ do_install() {
} }
gnuplot-common_package() { gnuplot-common_package() {
replaces="gnuplot<4.6.6_1"
short_desc+=" - common files" short_desc+=" - common files"
pkg_install() { pkg_install() {
vmove usr/share/gnuplot/${version%.*}/PostScript vmove usr/share/gnuplot/${version%.*}/PostScript
@ -105,9 +96,7 @@ gnuplot-common_package() {
vmove usr/share/man/man1/gnuplot.1 vmove usr/share/man/man1/gnuplot.1
} }
} }
gnuplot-wx_package() { gnuplot-wx_package() {
replaces="gnuplot<4.6.6_1"
depends="gnuplot-common>=${version}_${revision}" depends="gnuplot-common>=${version}_${revision}"
short_desc+=" - wxWidgets frontend" short_desc+=" - wxWidgets frontend"
alternatives="gnuplot:gnuplot:/usr/bin/gnuplot-wx" alternatives="gnuplot:gnuplot:/usr/bin/gnuplot-wx"
@ -115,7 +104,6 @@ gnuplot-wx_package() {
vmove usr/bin/gnuplot-wx vmove usr/bin/gnuplot-wx
} }
} }
gnuplot-qt_package() { gnuplot-qt_package() {
depends="gnuplot-common>=${version}_${revision}" depends="gnuplot-common>=${version}_${revision}"
short_desc+=" - Qt frontend" short_desc+=" - Qt frontend"