summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexander Dahl <post@lespocky.de>2015-07-28 23:30:29 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-07-30 18:27:55 +0200
commit38bb8daff36475a0d9230b979cb5f095ef2c4b90 (patch)
tree82e24080620e2d399789baf8b788a02f22b5e41e /patches
parentefd0e7c502101b69fd8f9d0643419416f7930165 (diff)
downloadptxdist-38bb8daff36475a0d9230b979cb5f095ef2c4b90.tar.gz
ptxdist-38bb8daff36475a0d9230b979cb5f095ef2c4b90.tar.xz
gnuplot: update to 4.6.7
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> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch31
-rw-r--r--patches/gnuplot-4.6.7/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch (renamed from patches/gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch)2
-rw-r--r--patches/gnuplot-4.6.7/series (renamed from patches/gnuplot-4.6.2/series)3
3 files changed, 2 insertions, 34 deletions
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 3291116c5..000000000
--- 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
index c3ba69151..764411d22 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
index cd19e3866..fb98f2d0f 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