mirrors/meta-openembedded
1
0 Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-11-14 16:07:25 +00:00
Code Issues Projects Releases Wiki Activity

gnuplot: upgrade 6.0.5 -> 6.0.6

Browse Source 
Refresh the patches. The native build applies only
0001-reduce-build-to-conversion-tools-for-native-build.patch.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj committed 2026-11-13 09:06:42 -08:00
1 parent 27ca3a3f9a
commit 649a4485c7
5 files changed
+26 -104
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch
+3 -3
View File
@@ -14,12 +14,12 @@ 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 bed885a..c852de2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
AM_DISTCHECK_DVI_TARGET =
-SUBDIRS = config m4 term src docs man demo share
+SUBDIRS = docs
meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch
+3 -6
View File
@@ -14,18 +14,15 @@ 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 7e2c400..a8dbf96 100644
index adfd135..bed885a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
AM_DISTCHECK_DVI_TARGET =
-SUBDIRS = config m4 term src docs man demo share
+SUBDIRS = config m4 term src docs man share
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
PATCHLEVEL PGPKEYS README RELEASE_NOTES \
--
2.31.1
meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch
+13 -88
View File
@@ -13,17 +13,16 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Upstream-Status: Pending
docs/Makefile.am | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
---
docs/Makefile.am | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index b20918a..47406eb 100644
index 4b1bc4f..643ee66 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -175,7 +175,7 @@
@@ -184,7 +184,7 @@ gpinsetfigure.tex: no_figures
$(AM_V_GEN) touch $@
gnuplot.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
@@ -32,8 +31,8 @@ index b20918a..47406eb 100644
pdf: pdf_figures
$(MAKE) gnuplot.pdf
@@ -255,7 +255,7 @@
@@ -264,7 +264,7 @@ allterm-ja.h: $(CORETERM) $(LUA_HELP)
gnuplot-ja.pdf: gnuplot-ja.doc title-ja.tex pdf_figures allterm-ja.h doc2tex$(EXEEXT)
iconv -f EUC-JP -t UTF-8 gnuplot-ja.doc > ja.doc
- ./doc2tex$(EXEEXT) -figures -japanese ja.doc | sed 's/titlepag.tex/title-ja.tex/' > gnuplot-ja.tex
@@ -41,8 +40,7 @@ index b20918a..47406eb 100644
lualatex gnuplot-ja
lualatex gnuplot-ja
makeindex gnuplot-ja
@@ -268,7 +268,7 @@ gnuplot.ps: gnuplot.dvi
@@ -277,7 +277,7 @@ gnuplot-ja.pdf: gnuplot-ja.doc title-ja.tex pdf_figures allterm-ja.h doc2tex$(EX
hlp: gnuplot.hlp
gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc
@@ -51,7 +49,7 @@ index b20918a..47406eb 100644
doc2hlp_SOURCES = doc2hlp.c termdoc.c
@@ -276,14 +276,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c
@@ -285,14 +285,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c
gih: gnuplot.gih
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
@@ -68,7 +66,7 @@ index b20918a..47406eb 100644
alldoc2gih_SOURCES = doc2gih.c termdoc.c
alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
@@ -298,7 +298,7 @@ $(srcdir)/windows/wgnuplot.hhk
@@ -307,7 +307,7 @@ $(srcdir)/windows/wgnuplot.hhk
wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk wxhelp/*.html windows/*.png
wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc
@@ -77,80 +75,7 @@ index b20918a..47406eb 100644
doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h
doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS)
@@ -318,7 +318,7 @@
$(AM_V_at) [ -d html ] || mkdir -p html
$(AM_V_at) rm -f html/Overview.html html/Plotting_Styles.html html/Commands.html html/Terminals.html
$(AM_V_at) rm -f html/NewFeatures.html
- $(AM_V_GEN)./doc2web$(EXEEXT) $(srcdir)/gnuplot.doc html
+ $(AM_V_GEN) doc2web$(EXEEXT) $(srcdir)/gnuplot.doc html
$(AM_V_GEN) sort -k 3 html/index.hhk > html/index.html
svg_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
@@ -372,7 +372,7 @@ install-info: gnuplot.info
ipf: gnuplot.ipf
gnuplot.ipf: doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN) ./doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf
+ $(AM_V_GEN) doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf
doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
@@ -380,7 +380,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
rtf: gnuplot.rtf
gnuplot.rtf: doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN) ./doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf
+ $(AM_V_GEN) doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf
doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c
@@ -386,7 +386,7 @@
# this is how to check the gnuplot.doc file
check-local: checkdoc$(EXEEXT)
- $(AM_V_at)./checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \
+ $(AM_V_at)checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \
if test $$? -eq 0; then \
echo "PASS: gnuplot.doc"; \
else \
--- ./docs/Makefile.am.orig 2025-10-06 20:44:25.315270887 +0200
+++ ./docs/Makefile.am 2025-10-06 21:22:31.287527296 +0200
@@ -268,7 +268,7 @@
hlp: gnuplot.hlp
gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN)./doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp
+ $(AM_V_GEN)doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp
doc2hlp_SOURCES = doc2hlp.c termdoc.c
@@ -276,14 +276,14 @@
gih: gnuplot.gih
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+ $(AM_V_GEN)doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
doc2gih_SOURCES = doc2gih.c termdoc.c
# To include all terminals in the .gih file
allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
@echo "generate gnuplot.gih with all terminals"
- $(AM_V_at)./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+ $(AM_V_at)alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
alldoc2gih_SOURCES = doc2gih.c termdoc.c
alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
@@ -298,7 +298,7 @@
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)
@@ -318,7 +318,7 @@
@@ -327,7 +327,7 @@ html: allterm.h doc2web$(EXEEXT) $(srcdir)/gnuplot.doc svg_figures webp_figures
$(AM_V_at) [ -d html ] || mkdir -p html
$(AM_V_at) rm -f html/Overview.html html/Plotting_Styles.html html/Commands.html html/Terminals.html
$(AM_V_at) rm -f html/NewFeatures.html
@@ -159,7 +84,7 @@ index b20918a..47406eb 100644
$(AM_V_GEN) sort -k 3 html/index.hhk > html/index.html
svg_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
@@ -372,7 +372,7 @@
@@ -381,7 +381,7 @@ install-info: gnuplot.info
ipf: gnuplot.ipf
gnuplot.ipf: doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc
@@ -168,7 +93,7 @@ index b20918a..47406eb 100644
doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
@@ -380,13 +380,13 @@
@@ -389,13 +389,13 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
rtf: gnuplot.rtf
gnuplot.rtf: doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc
meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-and-qt6-native-tools.patch
+6 -6
View File
@@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
configure.ac | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index cdd831a..fdd192b 100644
index a474af0..b88e525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1061,11 +1061,15 @@
@@ -1070,11 +1070,15 @@ if test "${enable_qt}" = yes ; then
if test "x${with_qt}" != "xqt4"; then
pkg_failed="not_tried"
if test "x${with_qt}" != "xqt5"; then
@@ -37,7 +37,7 @@ index cdd831a..fdd192b 100644
if test "x${QT6LOC}" != "x"; then
UIC=${QT6LOC}/uic
MOC=${QT6LOC}/moc
@@ -1075,7 +1079,7 @@
@@ -1084,7 +1088,7 @@ if test "${enable_qt}" = yes ; then
MOC=moc-qt6
RCC=rcc-qt6
fi
@@ -46,7 +46,7 @@ index cdd831a..fdd192b 100644
if test "x${QT6BIN}" != "x"; then
LRELEASE=${QT6BIN}/lrelease
elif test "x${LRELEASE}" = "x"; then
@@ -1086,10 +1090,14 @@
@@ -1095,10 +1099,14 @@ if test "${enable_qt}" = yes ; then
AC_MSG_RESULT([The Qt terminal will use Qt6.])
QTVER="6"
else
meta-oe/recipes-extended/gnuplot/gnuplot_6.0.5.bb → meta-oe/recipes-extended/gnuplot/gnuplot_6.0.6.bb
+1 -1
View File
@@ -21,7 +21,7 @@ SRC_URI:append:class-target = " \
file://0004-Add-configure-option-to-find-qt5-and-qt6-native-tools.patch \
"
SRC_URI[archive.sha256sum] = "73237f37f03306d68bfae133a9a50d5e9341384e198d5ab37eeca9ab534deed8"
SRC_URI[archive.sha256sum] = "9d39d8499c9533550144092375aac45ba8bf0c18c9cee50897fe411b6d93004e"
SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
# Tarballs live in per-version subdirectories, the listing above them has no filenames