diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.recipe b/sci-visualization/gnuplot/gnuplot-5.2.8.recipe index 80a3b0250..ff51ce6e4 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.8.recipe +++ b/sci-visualization/gnuplot/gnuplot-5.2.8.recipe @@ -6,11 +6,11 @@ as a plotting engine by third-party applications like Octave." HOMEPAGE="http://www.gnuplot.info/" COPYRIGHT="1986-1993, 1998, 2004-2019 Thomas Williams, Colin Kelley" LICENSE="Gnuplot" -REVISION="1" +REVISION="2" SOURCE_URI="https://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz" CHECKSUM_SHA256="60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37" -ARCHITECTURES="all !x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" if [ "$targetArchitecture" = x86_gcc2 ]; then SECONDARY_ARCHITECTURES="x86" fi diff --git a/sci-visualization/gnuplot/gnuplot-5.2.5.recipe b/sci-visualization/gnuplot/gnuplot-6.0.0.recipe similarity index 71% rename from sci-visualization/gnuplot/gnuplot-5.2.5.recipe rename to sci-visualization/gnuplot/gnuplot-6.0.0.recipe index 22ce29626..6363404e8 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.5.recipe +++ b/sci-visualization/gnuplot/gnuplot-6.0.0.recipe @@ -4,15 +4,15 @@ visualize mathematical functions and data interactively, but has grown to \ support many non-interactive uses such as web scripting. It is also used \ as a plotting engine by third-party applications like Octave." HOMEPAGE="http://www.gnuplot.info/" -COPYRIGHT="1986-1993, 1998, 2004-2018 Thomas Williams, Colin Kelley" +COPYRIGHT="1986-1993, 1998, 2004-2023 Thomas Williams, Colin Kelley" LICENSE="Gnuplot" -REVISION="6" +REVISION="1" SOURCE_URI="https://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz" -CHECKSUM_SHA256="039db2cce62ddcfd31a6696fe576f4224b3bc3f919e66191dfe2cdb058475caa" +CHECKSUM_SHA256="635a28f0993f6ab0d1179e072ad39b8139d07f51237f841d93c6c2ff4b1758ec" -ARCHITECTURES="all !x86_gcc2 ?x86" +ARCHITECTURES="!all !x86_gcc2" if [ "$targetArchitecture" = x86_gcc2 ]; then -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86" fi commandBinDir=$binDir @@ -33,6 +33,12 @@ REQUIRES=" lib:libjpeg$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libpng16$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Svg$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix lib:libreadline$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libvpx$secondaryArchSuffix @@ -46,6 +52,12 @@ BUILD_REQUIRES=" devel:libgd$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix # devel:libpango_1.0$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix + devel:libQt5PrintSupport$secondaryArchSuffix + devel:libQt5Svg$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix devel:libreadline$secondaryArchSuffix >= 8 devel:libvpx$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -58,8 +70,10 @@ BUILD_PREREQUIRES=" cmd:cmp cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix + cmd:uic$secondaryArchSuffix " PATCH() @@ -73,7 +87,10 @@ BUILD() aclocal automake runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \ + --with-bitmap-terminals \ --without-cairo \ + --with-lua=no \ + --with-qt=qt5 make $jobArgs }