From 51d091740e02e626750ef889548e33da4d608d5e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 7 Feb 2021 13:29:27 +0100 Subject: graphviz: use git fetcher instead of gitlab archives * fixes: graphviz-2.40.1-r0 do_package_qa: QA Issue: graphviz: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol [src-uri-bad] * it's already fixed in gatesgarth and newer with new version from: commit 985be3901e79c9e45cd5d23774e3cfdaab476b44 Author: Khem Raj Date: Mon Nov 2 18:33:34 2020 -0800 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: Martin Jansa --- meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb index 12ecb99091..d393ae2a1c 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb @@ -19,13 +19,12 @@ DEPENDS_append_class-target = " ${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 \ +# it was already moved from github.com/ellson/graphviz to https://gitlab.com/graphviz/graphviz/ +# but the later doesn't have stable_release_2.40.1 tag (anymore?), but it has corresponding commit: +# https://github.com/ellson/MOTHBALLED-graphviz/releases/tag/stable_release_2.40.1 +# https://gitlab.com/graphviz/graphviz/-/commit/67cd2e5121379a38e0801cc05cce5033f8a2a609 +SRCREV = "67cd2e5121379a38e0801cc05cce5033f8a2a609" +SRC_URI = "git://gitlab.com/${BPN}/${BPN}.git \ file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " # Use native mkdefs @@ -33,10 +32,7 @@ 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[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072" -SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a" - -S = "${WORKDIR}/${BPN}-stable_release_${PV}" +S = "${WORKDIR}/git" EXTRA_OECONF_class-target = "\ --with-expatincludedir=${STAGING_INCDIR} \ -- cgit 1.2.3-korg