diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-06-27 16:16:23 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:05 +0100 |
| commit | a50073d933dbadafd6eaef0c2c8ed99bd8de1502 (patch) | |
| tree | 78a29c8f8721d08f35a4d9036733330665420fc1 | |
| parent | e5f4e0df64531e2296bb1f5002eb106c3eec61e3 (diff) | |
| download | openembedded-core-a50073d933dbadafd6eaef0c2c8ed99bd8de1502.tar.gz openembedded-core-a50073d933dbadafd6eaef0c2c8ed99bd8de1502.tar.bz2 openembedded-core-a50073d933dbadafd6eaef0c2c8ed99bd8de1502.zip | |
gtk+3: Update UPSTREAM_CHECK_REGEX
Avoid versions >= 3.90 (development versions for 4.0).
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 6 | ||||
| -rw-r--r-- | 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 27da844fea..34845ae04e 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 d8a0bd04fd..2d65b96339 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" |