diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-11-02 18:33:34 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-11-03 11:03:29 -0800 |
commit | 985be3901e79c9e45cd5d23774e3cfdaab476b44 (patch) | |
tree | b5304c78607f44645775d9db6e118e1d307d2cfb /meta-oe/recipes-graphics | |
parent | ac4ccd2fbbb599d75ca4051911fcbaca39dbe6d7 (diff) | |
download | meta-openembedded-contrib-985be3901e79c9e45cd5d23774e3cfdaab476b44.tar.gz |
graphviz: Upgrade to 2.44.1 release
- Refresh patches to apply on new sources
- Switch away from gitlab archives
- Bypass pdf documentation generation
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch | 9 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch | 5 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb (renamed from meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb) | 8 |
4 files changed, 7 insertions, 17 deletions
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 21bf1bcd5c..6d1d441c57 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 <raj.khem@gmail.com> --- a/configure.ac +++ b/configure.ac -@@ -1676,7 +1676,7 @@ AC_ARG_ENABLE(tcl, +@@ -1540,7 +1540,7 @@ AC_ARG_ENABLE(tcl, [], [enable_tcl=yes]) if test "x$enable_tcl" != "xyes"; then diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch index eb51d03d26..76ff08f63c 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch @@ -13,12 +13,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> lib/gvpr/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am -index ac3c098..4914854 100644 --- a/lib/gvpr/Makefile.am +++ b/lib/gvpr/Makefile.am -@@ -57,7 +57,7 @@ endif - mkdefs_SOURCES = mkdefs.c +@@ -59,7 +59,7 @@ mkdefs$(EXEEXT): + $(HOSTCC) $(srcdir)/mkdefs.c -o mkdefs$(EXEEXT) gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT) - ./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata @@ -26,6 +24,3 @@ index ac3c098..4914854 100644 EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcxproj* --- -2.20.1 - diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch index a9b0352435..dd79510560 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch @@ -18,8 +18,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> plugin/pango/gvtextlayout_pango.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c -index d620b29..b0da11c 100644 --- a/plugin/pango/gvtextlayout_pango.c +++ b/plugin/pango/gvtextlayout_pango.c @@ -15,6 +15,10 @@ @@ -33,6 +31,3 @@ index d620b29..b0da11c 100644 #include "gvplugin_render.h" #include "agxbuf.h" #include "utils.h" --- -2.22.0 - diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb index aa5c0c8206..bc46a11d3a 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb @@ -26,7 +26,8 @@ inherit autotools-brokensep pkgconfig gettext # get checksum errors. Fedora people seem to expect same so they use a versioned # source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec -SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \ +SRCREV = "771bc4dbff3e6f358fa75cdc7774a413ccacad51" +SRC_URI = "https://www2.graphviz.org/Packages/stable/portable_source/${BP}.tar.gz \ file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " # Use native mkdefs @@ -38,10 +39,9 @@ SRC_URI_append_class-nativesdk = "\ file://0001-Use-native-mkdefs.patch \ file://graphviz-setup.sh \ " -SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072" -SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a" +SRC_URI[sha256sum] = "8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313" -S = "${WORKDIR}/${BPN}-stable_release_${PV}" +EXTRA_OECONF_append = " PS2PDF=/bin/echo" EXTRA_OECONF_class-target = "\ --with-expatincludedir=${STAGING_INCDIR} \ |