summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-11 16:32:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:51 +0000
commit642e92f2cd67980a731ba21b570d8d1c6f4798e0 (patch)
treeccae9a0f45db187759a1fcc536ddfc20a51c2dcb /meta/recipes-gnome/gtk+
parent96eac69636d2c345cdd50b19262f157335d53380 (diff)
downloadpoky-642e92f2cd67980a731ba21b570d8d1c6f4798e0.tar.gz
package_regex.inc: split entries with odd-even versioning into their own recipes
(From OE-Core rev: 5ddaba1fb833d0408cef5f58f786513b9293c30a) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc4
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc2
-rw-r--r--meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb2
3 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index a197b9d96f..0f41306402 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -13,6 +13,10 @@ SECTION = "libs"
13inherit distro_features_check 13inherit distro_features_check
14ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" 14ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
15 15
16# This picks stable releases in the 2.x series (but not 2.90 onwards,
17# which were GNOME 3 betas).
18UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
19
16X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" 20X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
17DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ 21DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
18 cairo gdk-pixbuf" 22 cairo gdk-pixbuf"
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index cb091f4cc3..984e30551c 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -10,7 +10,7 @@ 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 pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check 13inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even
14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
15 15
16# This should be in autotools.bbclass, but until something elses uses it putting 16# 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.18.2.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
index e6c475b5c2..d5e8a1ea58 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
20 20
21S = "${WORKDIR}/gtk+-${PV}" 21S = "${WORKDIR}/gtk+-${PV}"
22 22
23inherit pkgconfig native 23inherit pkgconfig native upstream-version-is-even
24 24
25PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" 25PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native"
26 26