From 5ddaba1fb833d0408cef5f58f786513b9293c30a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 11 Nov 2015 16:32:16 +0200 Subject: package_regex.inc: split entries with odd-even versioning into their own recipes Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-gnome/epiphany/epiphany_3.16.3.bb | 2 +- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb | 2 +- meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb | 2 +- meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb | 2 +- meta/recipes-gnome/gtk+/gtk+.inc | 4 ++++ meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb | 2 +- meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 4 ++++ meta/recipes-gnome/librsvg/librsvg_2.40.11.bb | 2 +- 9 files changed, 15 insertions(+), 7 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb index c3745c0ed1..3ff35fc9bc 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.16.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr libwnck3 \ gsettings-desktop-schemas gnome-desktop3" -inherit gnomebase gsettings distro_features_check +inherit gnomebase gsettings distro_features_check upstream-version-is-even # libwnck3 is x11 only REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb index 6e3cb02b65..dc05a0344e 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb @@ -22,7 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c" SRC_URI[sha256sum] = "4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc" -inherit autotools pkgconfig gettext pixbufcache ptest-gnome +inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even LIBV = "2.10.0" diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb index 3765697f2a..43546ceba6 100644 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ BPN = "gnome-desktop" -inherit gnome pkgconfig +inherit gnome pkgconfig upstream-version-is-even SRC_URI[archive.md5sum] = "ab5bf4cc94ad63639f42adcc1542b1f0" SRC_URI[archive.sha256sum] = "3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0" diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb index 2052761714..81c88458dc 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb @@ -6,7 +6,7 @@ SECTION = "x11/gnome" LICENSE = "LGPL-3.0 | CC-BY-SA-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c" -inherit allarch autotools pkgconfig gettext gtk-icon-cache +inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even DEPENDS += "intltool-native" 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" inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" +# This picks stable releases in the 2.x series (but not 2.90 onwards, +# which were GNOME 3 betas). +UPSTREAM_CHECK_REGEX = "(?P2\.([0-8]*[02468])+(\.\d+)+)" + X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ 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 \ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check +inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even 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.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 \ S = "${WORKDIR}/gtk+-${PV}" -inherit pkgconfig native +inherit pkgconfig native upstream-version-is-even PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index 7c3a87e872..aaf8cab7a6 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -37,6 +37,10 @@ GNOME_COMPRESS_TYPE="bz2" inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" +# This picks stable releases in the 2.x series (but not 2.90 onwards, +# which were GNOME 3 betas). +UPSTREAM_CHECK_REGEX = "(?P2\.([0-8]*[02468])+(\.\d+)+)" + python populate_packages_prepend() { engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") themes_root = os.path.join(d.getVar('datadir', True), "themes") diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb index 8c5206bdbc..3ce1e558ab 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb @@ -10,7 +10,7 @@ SECTION = "x11/utils" DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" BBCLASSEXTEND = "native" -inherit autotools pkgconfig gnomebase gtk-doc pixbufcache +inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-even SRC_URI += "file://gtk-option.patch" -- cgit 1.2.3-korg