diff options
Diffstat (limited to 'meta-oe/recipes-extended/gnuplot')
5 files changed, 99 insertions, 92 deletions
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch index f8f1fd00f7..7a2ecdc101 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch @@ -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 \ diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch index 8e0b4a271d..5f96cdf699 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch @@ -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 diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch index a4039c3170..7a7e550349 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch @@ -6,16 +6,24 @@ 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> + --- +Upstream-Status: Pending + 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 +32,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 +45,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 +54,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 +71,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 +89,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 +98,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 diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb deleted file mode 100644 index 4cc289d3ab..0000000000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Gnuplot is a portable command-line driven graphing utility" -DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ -(text or binary) and function plotting utility." -HOMEPAGE = "http://www.gnuplot.info/" -SECTION = "console/scientific" -LICENSE = "gnuplot" -LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" -DEPENDS = "${BPN}-native virtual/libx11 gd readline" - -inherit autotools distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" -SRC_URI_append_class-target = " \ - file://0002-do-not-build-demos.patch \ - file://0003-Use-native-tools-to-build-docs.patch \ - file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ -" - -SRC_URI[archive.md5sum] = "60aedd08998160593199459dea8467fe" -SRC_URI[archive.sha256sum] = "a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1" -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" - -# for building docs (they deserve it) we need *doc2* tools native -BBCLASSEXTEND = "native" -DEPENDS_class-native = "readline-native" -PACKAGECONFIG_class-native = "" - -SRC_URI_append_class-native = "file://0001-reduce-build-to-conversion-tools-for-native-build.patch" - -do_install_class-native() { - install -d ${D}${bindir} - install ${B}/docs/*doc* ${D}${bindir} - rm ${D}${bindir}/*.o -} - -PACKAGECONFIG ??= "cairo" -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" - -do_compile_prepend() { - install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ -} - -do_install_append_class-target() { - install -d ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ -} - -PACKAGES =+ "${PN}-x11-dbg ${PN}-x11" -DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." -SECTION_${PN}-x11 = "x11/scientific" -FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " - -FILES_${PN} += "${datadir}/texmf" -FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb new file mode 100644 index 0000000000..a293048a21 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb @@ -0,0 +1,71 @@ +SUMMARY = "Gnuplot is a portable command-line driven graphing utility" +DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ +(text or binary) and function plotting utility." +HOMEPAGE = "http://www.gnuplot.info/" +SECTION = "console/scientific" +LICENSE = "gnuplot" +LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" +DEPENDS = "${BPN}-native virtual/libx11 gd readline" + +inherit autotools features_check pkgconfig +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +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 \ + " +SRC_URI:append:class-target = " \ + file://0002-do-not-build-demos.patch \ + file://0003-Use-native-tools-to-build-docs.patch \ + file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ +" + +SRC_URI[archive.sha256sum] = "51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" + +# for building docs (they deserve it) we need *doc2* tools native +BBCLASSEXTEND = "native" +DEPENDS:class-native = "readline-native" +PACKAGECONFIG:class-native = "" + +SRC_URI:append:class-native = " file://0001-reduce-build-to-conversion-tools-for-native-build.patch" + +do_install:class-native() { + install -d ${D}${bindir} + install ${B}/docs/*doc* ${D}${bindir} + rm ${D}${bindir}/*.o +} + +PACKAGECONFIG ??= "cairo" +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}/.. \ + --disable-wxwidgets \ + --without-libcerf \ +" + +do_compile:prepend() { + install -m 0644 ${UNPACKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ +} + +do_install:append:class-target() { + install -d ${D}${datadir}/applications/ + install -m 0644 ${UNPACKDIR}/gnuplot.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps/ + install -m 0644 ${UNPACKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ +} + +PACKAGES =+ "${PN}-x11" + +RPROVIDES:${PN}-dbg += "${PN}-x11-dbg" + +DESCRIPTION:${PN}-x11 = "X11 display terminal for Gnuplot." +SECTION:${PN}-x11 = "x11/scientific" +FILES:${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " + +FILES:${PN} += "${datadir}/texmf" |