From 985be3901e79c9e45cd5d23774e3cfdaab476b44 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Nov 2020 18:33:34 -0800 Subject: 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 --- ...tcl-to-be-empty-string-if-tcl-is-disabled.patch | 2 +- .../graphviz/graphviz/0001-Use-native-mkdefs.patch | 9 +- ...pango-Include-freetype-headers-explicitly.patch | 5 -- .../recipes-graphics/graphviz/graphviz_2.40.1.bb | 99 ---------------------- .../recipes-graphics/graphviz/graphviz_2.44.1.bb | 99 ++++++++++++++++++++++ 5 files changed, 102 insertions(+), 112 deletions(-) delete mode 100644 meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb create mode 100644 meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb 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 --- 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 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 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.40.1.bb deleted file mode 100644 index aa5c0c8206..0000000000 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ /dev/null @@ -1,99 +0,0 @@ -SUMMARY = "Graph Visualization Tools" -HOMEPAGE = "http://www.graphviz.org" -LICENSE = "EPL-1.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" - -DEPENDS = " \ - intltool-native \ - bison-native \ - groff-native \ - libtool \ - gdk-pixbuf \ - librsvg \ - cairo \ - pango \ - expat \ - freetype \ -" -DEPENDS_append_class-target = " ${BPN}-native" -DEPENDS_append_class-nativesdk = " ${BPN}-native" - -inherit autotools-brokensep pkgconfig gettext - -# The source tarball suggested at -# https://graphviz.gitlab.io/_pages/Download/Download_source.html has no -# version in its name. So once graphviz is updgraded, only first time users will -# 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 \ - file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ -" -# Use native mkdefs -SRC_URI_append_class-target = "\ - file://0001-Use-native-mkdefs.patch \ - file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \ -" -SRC_URI_append_class-nativesdk = "\ - file://0001-Use-native-mkdefs.patch \ - file://graphviz-setup.sh \ -" -SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072" -SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a" - -S = "${WORKDIR}/${BPN}-stable_release_${PV}" - -EXTRA_OECONF_class-target = "\ - --with-expatincludedir=${STAGING_INCDIR} \ - --with-expatlibdir=${STAGING_LIBDIR} \ - --without-included-ltdl \ - --disable-java \ - --disable-tcl \ - --disable-r \ - --disable-sharp \ - " -EXTRA_OECONF_class-nativesdk = "\ - --with-expatincludedir=${STAGING_INCDIR} \ - --with-expatlibdir=${STAGING_LIBDIR} \ - --without-included-ltdl \ - --disable-java \ - --disable-tcl \ - --disable-r \ - --disable-sharp \ - " -CFLAGS_append_class-target = " -D_typ_ssize_t=1 -D_long_double=1" -CFLAGS_append_class-nativesdk = " -D_typ_ssize_t=1 -D_long_double=1" -do_configure_prepend() { - cd ${S} - # create version.m4 and ignore libtoolize errors - ./autogen.sh NOCONFIG || true -} - -do_install_append_class-native() { - # install mkdefs for target build - install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir} -} - -do_install_append_class-nativesdk() { - # graphviz-setup.sh must be executed at SDK installation - install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d - install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d -} -FILES_${PN}_class-nativesdk += "${SDKPATHNATIVE}" - -PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo" - -FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/" -FILES_${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/" -FILES_${PN}-demo += "${datadir}/graphviz/demo/" - -RDEPENDS_${PN}-perl += "perl" -RDEPENDS_${PN}-python += "python3" -RDEPENDS_${PN}-demo += "python3 perl" - -INSANE_SKIP_${PN}-perl = "dev-so" -INSANE_SKIP_${PN}-python = "dev-so" - -FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb new file mode 100644 index 0000000000..bc46a11d3a --- /dev/null +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb @@ -0,0 +1,99 @@ +SUMMARY = "Graph Visualization Tools" +HOMEPAGE = "http://www.graphviz.org" +LICENSE = "EPL-1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" + +DEPENDS = " \ + intltool-native \ + bison-native \ + groff-native \ + libtool \ + gdk-pixbuf \ + librsvg \ + cairo \ + pango \ + expat \ + freetype \ +" +DEPENDS_append_class-target = " ${BPN}-native" +DEPENDS_append_class-nativesdk = " ${BPN}-native" + +inherit autotools-brokensep pkgconfig gettext + +# The source tarball suggested at +# https://graphviz.gitlab.io/_pages/Download/Download_source.html has no +# version in its name. So once graphviz is updgraded, only first time users will +# 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 + +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 +SRC_URI_append_class-target = "\ + file://0001-Use-native-mkdefs.patch \ + file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \ +" +SRC_URI_append_class-nativesdk = "\ + file://0001-Use-native-mkdefs.patch \ + file://graphviz-setup.sh \ +" +SRC_URI[sha256sum] = "8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313" + +EXTRA_OECONF_append = " PS2PDF=/bin/echo" + +EXTRA_OECONF_class-target = "\ + --with-expatincludedir=${STAGING_INCDIR} \ + --with-expatlibdir=${STAGING_LIBDIR} \ + --without-included-ltdl \ + --disable-java \ + --disable-tcl \ + --disable-r \ + --disable-sharp \ + " +EXTRA_OECONF_class-nativesdk = "\ + --with-expatincludedir=${STAGING_INCDIR} \ + --with-expatlibdir=${STAGING_LIBDIR} \ + --without-included-ltdl \ + --disable-java \ + --disable-tcl \ + --disable-r \ + --disable-sharp \ + " +CFLAGS_append_class-target = " -D_typ_ssize_t=1 -D_long_double=1" +CFLAGS_append_class-nativesdk = " -D_typ_ssize_t=1 -D_long_double=1" +do_configure_prepend() { + cd ${S} + # create version.m4 and ignore libtoolize errors + ./autogen.sh NOCONFIG || true +} + +do_install_append_class-native() { + # install mkdefs for target build + install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir} +} + +do_install_append_class-nativesdk() { + # graphviz-setup.sh must be executed at SDK installation + install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d + install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d +} +FILES_${PN}_class-nativesdk += "${SDKPATHNATIVE}" + +PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo" + +FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/" +FILES_${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/" +FILES_${PN}-demo += "${datadir}/graphviz/demo/" + +RDEPENDS_${PN}-perl += "perl" +RDEPENDS_${PN}-python += "python3" +RDEPENDS_${PN}-demo += "python3 perl" + +INSANE_SKIP_${PN}-perl = "dev-so" +INSANE_SKIP_${PN}-python = "dev-so" + +FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf