Thanks, applied as 6f368f2378ef014debb4e1aa480a2fa7cb83cf93.

Michael

[sent from post-receive hook]

On Mon, 18 May 2026 09:53:47 +0200, Thorsten Scherer <[email protected]> 
wrote:
> Signed-off-by: Thorsten Scherer <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> diff --git 
> a/patches/gnuplot-4.6.7/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
>  
> b/patches/gnuplot-4.6.7/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> deleted file mode 100644
> index 764411d22ae4..000000000000
> --- 
> a/patches/gnuplot-4.6.7/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From: Bernhard Walle <[email protected]>
> -Date: Sun, 22 Jan 2012 00:03:59 +0100
> -Subject: [PATCH] Don't use LDFLAGS when building the documentation generator
> -
> -The documentation generator is a tool running on the build machine.
> -Therefore the LDFLAGS computed for the cross compiler may not work, such
> -as the "-Wl,-rpath-link" flag which is not understood by the Darwin
> -linker.
> -
> -The doc2gih is simple and doesn't require an external library. So we
> -don't also need special LDFLAGS. Omit them.
> -
> -Signed-off-by: Bernhard Walle <[email protected]>
> ----
> - docs/Makefile.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/docs/Makefile.in b/docs/Makefile.in
> -index 1552a3b76da1..d48dac68c590 100644
> ---- a/docs/Makefile.in
> -+++ b/docs/Makefile.in
> -@@ -85,7 +85,7 @@ LIBS = @LIBS@
> - 
> - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) 
> $(CFLAGS)
> - CCLD = $(CC)
> --LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
> -+LINK = $(CCLD) $(CFLAGS) -o $@
> - 
> - .c.o:
> -     $(COMPILE) -c $<
> diff --git a/patches/gnuplot-4.6.7/series b/patches/gnuplot-4.6.7/series
> deleted file mode 100644
> index fb98f2d0f18e..000000000000
> --- a/patches/gnuplot-4.6.7/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> -# e1be0237a784ae87b7f45927269e59ad  - git-ptx-patches magic
> diff --git a/rules/gnuplot.in b/rules/gnuplot.in
> deleted file mode 100644
> index 92215bda7cdd..000000000000
> --- a/rules/gnuplot.in
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=scientific
> -menuconfig GNUPLOT
> -     tristate
> -     prompt "gnuplot                       "
> -     select LIBC_M
> -     select GCCLIBS_CXX
> -     select GCCLIBS_GCC_S
> -     select ZLIB
> -     select LIBGD            if GNUPLOT_GD
> -     select LIBGD_PNG        if GNUPLOT_GD
> -     select XORG_LIB_XT      if GNUPLOT_X
> -     help
> -       A command-line driven interactive plotting program for
> -       making 2D and 3D graphs from data and functions.
> -
> -       Supports lots of output formats, including drivers for
> -       many printers, (La)TeX, (x)fig, Postscript, and so on.
> -
> -       Data files and self-defined functions can be manipulated by internal
> -       C-like language.  Can perform smoothing, spline-fitting, or nonlinear
> -       fits. Can work with complex numbers.
> -
> -       STAGING: remove in PTXdist 2026.03.0
> -       Unmaintained in PTXdist and fails to build with current toolchains.
> -       Needs updating to the latest version.
> -
> -if GNUPLOT
> -
> -config GNUPLOT_HELP
> -     bool
> -     prompt "Install interactive help"
> -     help
> -       Installs the interactive help files on the target.
> -       Requires about 600 kByte of space.
> -
> -config GNUPLOT_POSTSCRIPT
> -     bool
> -     prompt "Install Postscript prolog files"
> -     help
> -       Installs the prolog files needed to generate Postscript output. If you
> -       don't need Postscript, you can turn off that setting. Requires about
> -       100 kByte of space.
> -
> -config GNUPLOT_JS
> -     bool
> -     prompt "Install JavaScript runtime files"
> -     help
> -       Installs some JavaScript files and PNG images which will be needed if
> -       HTML5 output should be generated. Requires about 300 kByte of disk 
> space.
> -
> -config GNUPLOT_X
> -     bool
> -     prompt "X support"
> -     help
> -       Enable the graphical X11 user interface of GNUplot
> -
> -config GNUPLOT_GD
> -     bool
> -     prompt "GD support"
> -     help
> -       Use the GD library.
> -       GD is an open source code library for the dynamic
> -       creation of images.
> -
> -config GNUPLOT_PDF
> -     bool
> -     prompt "PDF support"
> -     depends on BROKEN
> -     help
> -       Include support for output as PDF (Portable Document Format)
> -endif
> diff --git a/rules/gnuplot.make b/rules/gnuplot.make
> deleted file mode 100644
> index 276882f130b2..000000000000
> --- a/rules/gnuplot.make
> +++ /dev/null
> @@ -1,114 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2004 by Robert Schwebel
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
> -
> -#
> -# Paths and names
> -#
> -GNUPLOT_VERSION      := 4.6.7
> -GNUPLOT_MAJ_VER := $(basename $(GNUPLOT_VERSION))
> -GNUPLOT_MD5  := fbcb4715acf228fcd2957f9d218b9167
> -GNUPLOT              := gnuplot-$(GNUPLOT_VERSION)
> -GNUPLOT_SUFFIX       := tar.gz
> -GNUPLOT_URL  := $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX))
> -GNUPLOT_SOURCE       := $(SRCDIR)/$(GNUPLOT).$(GNUPLOT_SUFFIX)
> -GNUPLOT_DIR  := $(BUILDDIR)/$(GNUPLOT)
> -GNUPLOT_LICENSE      := gnuplot
> -GNUPLOT_LICENSE_FILES        := 
> file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f
> -
> -
> -# 
> ----------------------------------------------------------------------------
> -# Prepare
> -# 
> ----------------------------------------------------------------------------
> -
> -#
> -# autoconf
> -#
> -GNUPLOT_CONF_TOOL := autoconf
> -GNUPLOT_CONF_OPT := \
> -     $(CROSS_AUTOCONF_USR) \
> -     --disable-history-file \
> -     --$(call ptx/endis, PTXCONF_GNUPLOT_X)-mouse \
> -     --disable-x11-mbfonts \
> -     --disable-x11-external \
> -     --disable-volatile-data \
> -     --disable-raise-console \
> -     --disable-objects \
> -     --disable-macros \
> -     --disable-h3d-quadtree \
> -     --disable-h3d-gridbox \
> -     --disable-wxwidgets \
> -     --enable-backwards-compatibility \
> -     --disable-stats \
> -     --disable-qt \
> -     --without-lispdir \
> -     --without-latex \
> -     --without-kpsexpand \
> -     --$(call ptx/wwo, PTXCONF_GNUPLOT_X)-x \
> -     --without-lasergnu \
> -     --without-linux-vga \
> -     --without-ggi \
> -     --without-xmi \
> -     --with-readline=builtin \
> -     --$(call ptx/wwo, PTXCONF_GNUPLOT_GD)-gd \
> -     --$(call ptx/wwo, PTXCONF_GNUPLOT_PDF)-pdf \
> -     --without-lua \
> -     --without-cwdrc \
> -     --without-lisp-files \
> -     --without-row-help \
> -     --without-tutorial \
> -     --without-wx-config \
> -     --without-bitmap-terminals \
> -     --without-cairo
> -
> -GNUPLOT_MAKE_OPT := -C src
> -
> -# 
> ----------------------------------------------------------------------------
> -# Target-Install
> -# 
> ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/gnuplot.targetinstall:
> -     @$(call targetinfo)
> -
> -     @$(call install_init, gnuplot)
> -     @$(call install_fixup, gnuplot,PRIORITY,optional)
> -     @$(call install_fixup, gnuplot,SECTION,base)
> -     @$(call install_fixup, gnuplot,AUTHOR,"Robert Schwebel 
> <[email protected]>")
> -     @$(call install_fixup, gnuplot,DESCRIPTION,missing)
> -
> -     @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot)
> -
> -ifdef PTXCONF_GNUPLOT_HELP
> -     @$(call install_copy, gnuplot, 0, 0, 0644, -, \
> -             /usr/share/gnuplot/$(GNUPLOT_MAJ_VER)/gnuplot.gih)
> -endif
> -
> -ifdef PTXCONF_GNUPLOT_POSTSCRIPT
> -     @$(call install_tree, gnuplot, 0, 0, -, \
> -             /usr/share/gnuplot/$(GNUPLOT_MAJ_VER)/PostScript)
> -endif
> -
> -ifdef PTXCONF_GNUPLOT_JS
> -     @$(call install_tree, gnuplot, 0, 0, -, \
> -             /usr/share/gnuplot/$(GNUPLOT_MAJ_VER)/js)
> -endif
> -
> -ifdef PTXCONF_GNUPLOT_X
> -     @$(call install_copy, gnuplot, 0, 0, 0755, -, \
> -             /usr/libexec/gnuplot/$(GNUPLOT_MAJ_VER)/gnuplot_x11)
> -endif
> -
> -     @$(call install_finish, gnuplot)
> -
> -     @$(call touch)
> -
> -# vim: syntax=make

Reply via email to