From de45d5f9b4457667c5d2f2b4b7f0ebdf0958ca07 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Wed, 23 Sep 2026 21:26:43 +0100 Subject: [PATCH] Ports: Update gnuplot to 6.0.5 --- Ports/AvailablePorts.md | 2 +- Ports/gnuplot/package.sh | 9 ++------- ...001-Don-t-build-the-docs-and-the-demo.patch | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index bfb96acfc4b..fa91ded20ad 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -112,7 +112,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`gnuapl`](gnuapl/) | GNU APL | 1.8 | https://www.gnu.org/software/apl/ | | [`gnucobol`](gnucobol/) | GnuCOBOL | 3.1.2 | https://gnucobol.sourceforge.io/ | | [`gnupg`](gnupg/) | GnuPG | 2.4.5 | https://gnupg.org/software/index.html | -| [`gnuplot`](gnuplot/) | Gnuplot | 5.4.9 | http://www.gnuplot.info/ | +| [`gnuplot`](gnuplot/) | Gnuplot | 6.0.5 | http://www.gnuplot.info/ | | [`gperf`](gperf/) | GNU gperf | 3.3 | https://www.gnu.org/software/gperf/ | | [`gpgme`](gpgme/) | GnuPG Made Easy (GPGME) | 2.2.0 | https://gnupg.org/software/gpgme/index.html | | [`grep`](grep/) | GNU Grep | 3.12 | https://www.gnu.org/software/grep/ | diff --git a/Ports/gnuplot/package.sh b/Ports/gnuplot/package.sh index 91ff6721878..137b29861d2 100755 --- a/Ports/gnuplot/package.sh +++ b/Ports/gnuplot/package.sh @@ -1,10 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh port='gnuplot' -version='5.4.9' +version='6.0.5' useconfigure='true' -# Note: gnuplot's source code is hosted on SourceForge, but using the GitHub mirror makes downloading a versioned .tar.gz easier. files=( - "https://github.com/gnuplot/gnuplot/archive/${version}.tar.gz#0806ab023193e0b303db443167783ae9f51622a044a8a08af781088bbb4aea53" + "https://downloads.sourceforge.net/project/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz#73237f37f03306d68bfae133a9a50d5e9341384e198d5ab37eeca9ab534deed8" ) depends=( 'libgd' @@ -19,10 +18,6 @@ configopts=( 'libgd_LIBS=-liconv -lfreetype -lfontconfig -lpng' ) -pre_configure() { - run ./prepare -} - install() { run make install-strip } diff --git a/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch b/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch index b4e4970be68..b02336503ce 100644 --- a/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch +++ b/Ports/gnuplot/patches/0001-Don-t-build-the-docs-and-the-demo.patch @@ -7,10 +7,11 @@ Subject: [PATCH] Don't build the docs and the demo - demo - x86_64-serenity-gcc: error: unrecognized command line option '-rdynamic' --- Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + Makefile.in | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 7e2c4008cda62e8b8e2959e4d2953722f6d350db..a8df6c0617210c7d7344052e3a34c56993232b33 100644 +index 08cbf1ccc30eaaaa1d57eccdef4b8d3d7b355118..8ca4cac24374ea4ea42646c9ed14b8e33fd1f7bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,10 @@ @@ -25,3 +26,16 @@ index 7e2c4008cda62e8b8e2959e4d2953722f6d350db..a8df6c0617210c7d7344052e3a34c569 EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \ PATCHLEVEL PGPKEYS README RELEASE_NOTES \ +diff --git a/Makefile.in b/Makefile.in +index d7a20e5a23ebf57192512b677613932fb633c51e..7fc8a3dff1b15eba351e05a6e153ff235130b004 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -359,7 +359,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = config m4 term src docs man demo share ++SUBDIRS = config m4 term src man share + EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \ + PATCHLEVEL PGPKEYS README RELEASE_NOTES \ + win