gnuplot: switch to wxWidgets-gtk3

This commit is contained in:
newbluemoon 2018-09-13 10:26:59 +02:00 committed by maxice8
parent 97468b4ceb
commit 7830ec8df7

View file

@ -1,7 +1,7 @@
# Template file for 'gnuplot' # Template file for 'gnuplot'
pkgname=gnuplot pkgname=gnuplot
version=5.2.4 version=5.2.4
revision=4 revision=5
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"
@ -15,7 +15,7 @@ checksum=1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb
subpackages="gnuplot-common" subpackages="gnuplot-common"
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
makedepends+=" cairo-devel pango-devel wxWidgets-devel qt5-tools-devel qt5-svg-devel" makedepends+=" cairo-devel pango-devel wxWidgets-gtk3-devel qt5-tools-devel qt5-svg-devel"
subpackages+=" gnuplot-wx gnuplot-qt" subpackages+=" gnuplot-wx gnuplot-qt"
fi fi
@ -46,7 +46,7 @@ do_configure() {
cd ${wrksrc}/x11 cd ${wrksrc}/x11
./configure ${configure_args} --disable-wxwidgets --without-cairo --without-qt ./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=wx-config-gtk3 LIBS="-lX11"
cd ${wrksrc}/qt cd ${wrksrc}/qt
./configure ${configure_args} --with-qt --disable-wxwidgets ./configure ${configure_args} --with-qt --disable-wxwidgets
else else