[ptxdist] [PATCH 2/2] gnuplot: update to 4.6.7

[Alexander Dahl <post@lespocky.de>]

The patch for not building/installing the info pages was removed.
According to comment in Makefile upstream does not build/install this by
default anymore since 4.6.4.

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 .../0002-Don-t-build-and-install-info-pages.patch  | 31 ----------------------
 ...DFLAGS-when-building-the-documentation-ge.patch |  2 +-
 patches/{gnuplot-4.6.2 => gnuplot-4.6.7}/series    |  3 +--
 rules/gnuplot.make                                 |  5 ++--
 4 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch
 rename patches/{gnuplot-4.6.2 => gnuplot-4.6.7}/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch (95%)
 rename patches/{gnuplot-4.6.2 => gnuplot-4.6.7}/series (53%)

diff --git a/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch b/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch
deleted file mode 100644
index 3291116..0000000
--- a/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernhard Walle <bernhard@bwalle.de>
-Date: Sat, 23 Mar 2013 18:50:38 +0100
-Subject: [PATCH] Don't build and install info pages
-
-With GNU texinfo 5.1 I get following error:
-
-  ./gnuplot.texi:9205: warning: @ref should not appear in @uref
-  ./gnuplot.texi:17653: raising the section level of @subsubsection which is too low
-
-Since the texinfo file is generated by some Emacs Lisp script (and my
-keyboard doesn't have enough brackets to program Lisp) and since the
-texinfo file is not needed on the target, just disable its build.
-
-Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
----
- docs/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 628c006..dc731d6 100644
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
-@@ -449,7 +449,7 @@ checkdoc.o: checkdoc.c $(BUILT_SOURCES)
- 	$(COMPILE) -DALL_TERM_DOC -c $(srcdir)/checkdoc.c
- 
- # install section
--install: install-gih install-info install-pdf
-+install: install-gih
- 
- install-gih: gnuplot.gih
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
diff --git a/patches/gnuplot-4.6.2/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
similarity index 95%
rename from patches/gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
rename to patches/gnuplot-4.6.7/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
index c3ba691..764411d 100644
--- a/patches/gnuplot-4.6.2/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
@@ -16,7 +16,7 @@ Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 0560553..628c006 100644
+index 1552a3b76da1..d48dac68c590 100644
 --- a/docs/Makefile.in
 +++ b/docs/Makefile.in
 @@ -85,7 +85,7 @@ LIBS = @LIBS@
diff --git a/patches/gnuplot-4.6.2/series b/patches/gnuplot-4.6.7/series
similarity index 53%
rename from patches/gnuplot-4.6.2/series
rename to patches/gnuplot-4.6.7/series
index cd19e38..fb98f2d 100644
--- a/patches/gnuplot-4.6.2/series
+++ b/patches/gnuplot-4.6.7/series
@@ -1,5 +1,4 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
-0002-Don-t-build-and-install-info-pages.patch
-# 1692ae53011b545d0969e00025d9b2b4  - git-ptx-patches magic
+# e1be0237a784ae87b7f45927269e59ad  - git-ptx-patches magic
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 984eb2a..d47c3d9 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
 #
 # Paths and names
 #
-GNUPLOT_VERSION	:= 4.6.2
+GNUPLOT_VERSION	:= 4.6.7
 GNUPLOT_MAJ_VER := $(basename $(GNUPLOT_VERSION))
-GNUPLOT_MD5	:= 060e0a77cabb6d6055c5917b0f0b5769
+GNUPLOT_MD5	:= fbcb4715acf228fcd2957f9d218b9167
 GNUPLOT		:= gnuplot-$(GNUPLOT_VERSION)
 GNUPLOT_SUFFIX	:= tar.gz
 GNUPLOT_URL	:= $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX))
@@ -42,7 +42,6 @@ GNUPLOT_AUTOCONF = \
 	--$(call ptx/endis, PTXCONF_GNUPLOT_X)-mouse \
 	--disable-x11-mbfonts \
 	--disable-x11-external \
-	--disable-thin-splines \
 	--disable-volatile-data \
 	--disable-raise-console \
 	--disable-objects \
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de