gnuplot: rebuild against wx 3.0.

This commit is contained in:
Christian Neukirchen 2015-11-11 14:39:13 +01:00
parent 0ef2b69dbd
commit bffdf47c65

View file

@ -1,7 +1,7 @@
# Template file for 'gnuplot' # Template file for 'gnuplot'
pkgname=gnuplot pkgname=gnuplot
version=5.0.1 version=5.0.1
revision=2 revision=3
configure_args="--with-readline=builtin" configure_args="--with-readline=builtin"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="zlib-devel libX11-devel gd-devel lua52-devel" makedepends="zlib-devel libX11-devel gd-devel lua52-devel"
@ -18,7 +18,7 @@ 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 wxGTK-devel qt-devel" makedepends+=" cairo-devel pango-devel wxWidgets-devel qt-devel"
subpackages+=" gnuplot-wx gnuplot-qt" subpackages+=" gnuplot-wx gnuplot-qt"
fi fi
@ -50,9 +50,9 @@ do_configure() {
cd ${wrksrc}/x11 cd ${wrksrc}/x11
./configure ${configure_args} --without-qt --disable-wxwidgets --without-cairo --disable-wxt ./configure ${configure_args} --without-qt --disable-wxwidgets --without-cairo --disable-wxt
cd ${wrksrc}/wx cd ${wrksrc}/wx
./configure ${configure_args} ./configure ${configure_args} --without-qt ac_cv_path_WX_CONFIG=/usr/bin/wx-config-3.0 LIBS="-lX11"
cd ${wrksrc}/qt cd ${wrksrc}/qt
./configure ${configure_args} --enable-qt --disable-wxwidgets ./configure ${configure_args} --with-qt --disable-wxwidgets
else else
cd ${wrksrc}/x11 cd ${wrksrc}/x11
./configure ${configure_args} ./configure ${configure_args}