From: Jussi Kukkonen Date: Tue, 27 Jun 2017 13:16:23 +0000 (+0300) Subject: gtk+3: Update UPSTREAM_CHECK_REGEX X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~20866 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a50073d933dbadafd6eaef0c2c8ed99bd8de1502;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gtk+3: Update UPSTREAM_CHECK_REGEX Avoid versions >= 3.90 (development versions for 4.0). Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 27da844feaf..34845ae04ec 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -10,7 +10,11 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection +inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection + +# versions >= 3.90 are development versions, otherwise like upstream-version-is-even +UPSTREAM_CHECK_REGEX = "[^\d\.](?P3\.([1-8]?[02468])+(\.\d+)+)\.tar" + ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # This should be in autotools.bbclass, but until something elses uses it putting diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb index d8a0bd04fd6..2d65b963395 100644 --- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb +++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb @@ -20,7 +20,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ S = "${WORKDIR}/gtk+-${PV}" -inherit pkgconfig native upstream-version-is-even +inherit pkgconfig native + +# versions >= 3.90 are development versions, otherwise like upstream-version-is-even +UPSTREAM_CHECK_REGEX = "[^\d\.](?P3\.([1-8]?[02468])+(\.\d+)+)\.tar" PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native"