From 19f476a6606b091a0bb1ae0f4dc18b731bae2847 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Jul 2023 13:22:43 -0700 Subject: [PATCH] graphviz: Upgrade to 8.1.0 release Do not build pdf documentation, we do not have host tools needed for this to build Signed-off-by: Khem Raj --- ...use_tcl-to-be-empty-string-if-tcl-is-disabled.patch | 10 +++++----- .../graphviz/{graphviz_2.50.0.bb => graphviz_8.1.0.bb} | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta-oe/recipes-graphics/graphviz/{graphviz_2.50.0.bb => graphviz_8.1.0.bb} (96%) diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch index 6d1d441c57..99b53e2e12 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj --- a/configure.ac +++ b/configure.ac -@@ -1540,7 +1540,7 @@ AC_ARG_ENABLE(tcl, +@@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl, [], [enable_tcl=yes]) if test "x$enable_tcl" != "xyes"; then @@ -22,12 +22,12 @@ Signed-off-by: Khem Raj if test "x$use_tcl" = "x"; then --- a/Makefile.am +++ b/Makefile.am -@@ -19,7 +19,7 @@ pkginclude_HEADERS = $(top_builddir)/gra - man_MANS = graphviz.7 +@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra + dist_man_MANS = graphviz.7 # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS --SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests -+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs rtest tests +-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests ++SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests .PHONY: doxygen doxygen: diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb similarity index 96% rename from meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb rename to meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index b63017576a..7ab15c9718 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -27,8 +27,7 @@ SRC_URI:append:class-target = "\ SRC_URI:append:class-nativesdk = "\ file://graphviz-setup.sh \ " - -SRC_URI[sha256sum] = "6b16bf990df114195be669773a1dae975dbbffada45e1de2849ddeb5851bb9a8" +SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565" CVE_CHECK_IGNORE += "\ CVE-2014-9157 \ @@ -37,7 +36,7 @@ CVE_CHECK_IGNORE += "\ PACKAGECONFIG ??= "librsvg" PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" -EXTRA_OECONF:append = " PS2PDF=/bin/echo" +EXTRA_OECONF:append = " PS2PDF=/bin/echo --disable-man-pdfs" EXTRA_OECONF:class-target = "\ --with-expatincludedir=${STAGING_INCDIR} \