mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
gnuplot: upgrade 5.2.8 -> 5.4.1
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
Khem Raj
parent
03ff456f78
commit
861a983eae
@ -21,11 +21,8 @@ index 9241ce5..b24e291 100644
|
||||
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
-SUBDIRS = config m4 term src docs man demo tutorial share
|
||||
-SUBDIRS = config m4 term src docs man demo share
|
||||
+SUBDIRS = docs
|
||||
|
||||
EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
||||
Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|
||||
--
|
||||
2.14.3
|
||||
|
||||
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
|
||||
PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|
||||
|
||||
@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 9241ce5..b24e291 100644
|
||||
index 7e2c400..a8dbf96 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,7 +1,7 @@
|
||||
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
-SUBDIRS = config m4 term src docs man demo tutorial share
|
||||
+SUBDIRS = config m4 term src docs man tutorial share
|
||||
-SUBDIRS = config m4 term src docs man demo share
|
||||
+SUBDIRS = config m4 term src docs man share
|
||||
|
||||
EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
||||
Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|
||||
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
|
||||
PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|
||||
--
|
||||
2.14.3
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -6,16 +6,22 @@ MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
|
||||
---
|
||||
docs/Makefile.am | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/docs/Makefile.am b/docs/Makefile.am
|
||||
index 3baf0c4..e82f87d 100644
|
||||
index b20918a..47406eb 100644
|
||||
--- a/docs/Makefile.am
|
||||
+++ b/docs/Makefile.am
|
||||
@@ -152,7 +152,7 @@ gnuplot-groff.ps: gnuplot.ms $(srcdir)/titlepag.ms
|
||||
@@ -156,7 +156,7 @@ gnuplot-groff.ps: gnuplot.ms $(srcdir)/titlepag.ms
|
||||
|
||||
### doc2xxx dependencies
|
||||
gnuplot.ms: doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
@ -24,7 +30,7 @@ index 3baf0c4..e82f87d 100644
|
||||
|
||||
doc2ms_SOURCES = doc2ms.c termdoc.c
|
||||
doc2ms_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
|
||||
@@ -173,10 +173,10 @@ pdf_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
|
||||
@@ -177,10 +177,10 @@ pdf_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
|
||||
$(AM_V_GEN)touch $@
|
||||
|
||||
figures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
@ -37,7 +43,7 @@ index 3baf0c4..e82f87d 100644
|
||||
|
||||
pdf: gnuplot.pdf
|
||||
pdf_nofig: nofigures.pdf
|
||||
@@ -256,7 +256,7 @@ gnuplot.ps: gnuplot.dvi
|
||||
@@ -260,7 +260,7 @@ gnuplot.ps: gnuplot.dvi
|
||||
hlp: gnuplot.hlp
|
||||
|
||||
gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
@ -46,7 +52,7 @@ index 3baf0c4..e82f87d 100644
|
||||
|
||||
doc2hlp_SOURCES = doc2hlp.c termdoc.c
|
||||
|
||||
@@ -264,14 +264,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c
|
||||
@@ -268,14 +268,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c
|
||||
gih: gnuplot.gih
|
||||
|
||||
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
@ -63,16 +69,16 @@ index 3baf0c4..e82f87d 100644
|
||||
|
||||
alldoc2gih_SOURCES = doc2gih.c termdoc.c
|
||||
alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
|
||||
@@ -286,7 +286,7 @@ $(srcdir)/windows/wgnuplot.hhk
|
||||
@@ -290,7 +290,7 @@ $(srcdir)/windows/wgnuplot.hhk
|
||||
wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk wxhelp/*.html windows/*.png
|
||||
|
||||
wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
- $(AM_V_GEN) ./doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/
|
||||
+ $(AM_V_GEN) doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/
|
||||
|
||||
#doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h
|
||||
#doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS)
|
||||
@@ -336,7 +336,7 @@ install-info: gnuplot.info
|
||||
doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h
|
||||
doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS)
|
||||
@@ -340,7 +340,7 @@ install-info: gnuplot.info
|
||||
ipf: gnuplot.ipf
|
||||
|
||||
gnuplot.ipf: doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
@ -81,7 +87,7 @@ index 3baf0c4..e82f87d 100644
|
||||
|
||||
doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
|
||||
|
||||
@@ -344,7 +344,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
|
||||
@@ -348,7 +348,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
|
||||
rtf: gnuplot.rtf
|
||||
|
||||
gnuplot.rtf: doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
@ -90,7 +96,7 @@ index 3baf0c4..e82f87d 100644
|
||||
|
||||
doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c
|
||||
|
||||
@@ -352,13 +352,13 @@ doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c
|
||||
@@ -356,13 +356,13 @@ doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c
|
||||
rnh: gnuplot.rnh
|
||||
|
||||
gnuplot.rnh: doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc
|
||||
|
||||
@ -11,7 +11,8 @@ inherit autotools features_check
|
||||
# depends on virtual/libx11
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \
|
||||
SRC_URI = " \
|
||||
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz;name=archive \
|
||||
http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
|
||||
file://gnuplot.desktop \
|
||||
file://gnuplot.png \
|
||||
@ -22,9 +23,7 @@ SRC_URI_append_class-target = " \
|
||||
file://0004-Add-configure-option-to-find-qt5-native-tools.patch \
|
||||
"
|
||||
|
||||
SRC_URI[archive.md5sum] = "2df8767c7399bee57a96296d46b4d5fb"
|
||||
SRC_URI[archive.sha256sum] = "60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37"
|
||||
SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
|
||||
SRC_URI[archive.sha256sum] = "6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e"
|
||||
SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
|
||||
|
||||
# for building docs (they deserve it) we need *doc2* tools native
|
||||
@ -45,9 +44,10 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango"
|
||||
PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
|
||||
PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase qtsvg qttools-native"
|
||||
|
||||
EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
|
||||
--without-tutorial \
|
||||
--disable-wxwidgets"
|
||||
EXTRA_OECONF = " \
|
||||
--with-readline=${STAGING_LIBDIR}/.. \
|
||||
-disable-wxwidgets \
|
||||
"
|
||||
|
||||
do_compile_prepend() {
|
||||
install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
|
||||
Loading…
x
Reference in New Issue
Block a user