summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc6
-rw-r--r--meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb5
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 \
10 10
11LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" 11LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
12 12
13inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection 13inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection
14
15# versions >= 3.90 are development versions, otherwise like upstream-version-is-even
16UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
17
14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 18ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
15 19
16# This should be in autotools.bbclass, but until something elses uses it putting 20# 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 \
20 20
21S = "${WORKDIR}/gtk+-${PV}" 21S = "${WORKDIR}/gtk+-${PV}"
22 22
23inherit pkgconfig native upstream-version-is-even 23inherit pkgconfig native
24
25# versions >= 3.90 are development versions, otherwise like upstream-version-is-even
26UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
24 27
25PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" 28PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native"
26 29