[oe-commits] [openembedded-core] 05/47: gtk+3: Update UPSTREAM_CHECK_REGEX

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit a50073d933dbadafd6eaef0c2c8ed99bd8de1502
Author: Jussi Kukkonen <jussi.kukkonen at intel.com>
AuthorDate: Tue Jun 27 16:16:23 2017 +0300

    gtk+3: Update UPSTREAM_CHECK_REGEX
    
    Avoid versions >= 3.90 (development versions for 4.0).
    
    Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-gnome/gtk+/gtk+3.inc                        | 6 +++++-
 meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 27da844..34845ae 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\.](?P<pver>3\.([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 d8a0bd0..2d65b96 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\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
 
 PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.