]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_regex.inc: split entries with odd-even versioning into their own recipes
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>
Wed, 11 Nov 2015 14:32:16 +0000 (16:32 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 8 Dec 2015 10:20:09 +0000 (10:20 +0000)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
33 files changed:
meta/classes/upstream-version-is-even.bbclass [new file with mode: 0644]
meta/conf/distro/include/package_regex.inc
meta/recipes-core/dbus/dbus-test_1.8.20.bb
meta/recipes-core/dbus/dbus_1.8.20.bb
meta/recipes-core/glib-2.0/glib.inc
meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
meta/recipes-devtools/perl/perl.inc
meta/recipes-devtools/vala/vala.inc
meta/recipes-gnome/epiphany/epiphany_3.16.3.bb
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
meta/recipes-gnome/gnome/adwaita-icon-theme_3.18.0.bb
meta/recipes-gnome/gtk+/gtk+.inc
meta/recipes-gnome/gtk+/gtk+3.inc
meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
meta/recipes-gnome/librsvg/librsvg_2.40.11.bb
meta/recipes-graphics/clutter/clutter-1.0.inc
meta/recipes-graphics/clutter/clutter-gst-3.0.inc
meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
meta/recipes-graphics/cogl/cogl-1.0.inc
meta/recipes-graphics/pango/pango.inc
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
meta/recipes-support/atk/at-spi2-atk_2.18.1.bb
meta/recipes-support/atk/at-spi2-core_2.18.1.bb
meta/recipes-support/atk/atk_2.18.0.bb
meta/recipes-support/libsoup/libsoup-2.4_2.52.1.bb
meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
meta/recipes-support/vte/vte.inc

diff --git a/meta/classes/upstream-version-is-even.bbclass b/meta/classes/upstream-version-is-even.bbclass
new file mode 100644 (file)
index 0000000..89556ed
--- /dev/null
@@ -0,0 +1,5 @@
+# This class ensures that the upstream version check only
+# accepts even minor versions (i.e. 3.0.x, 3.2.x, 3.4.x, etc.)
+# This scheme is used by Gnome and a number of other projects
+# to signify stable releases vs development releases.
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
index e681e67afbce3e48c3ab16961290c9d9ca2a5ad9..ea628209cdafecacfbdf5110cafd063409dd6b25 100644 (file)
@@ -208,57 +208,6 @@ GITTAGREGEX_pn-xinetd = "xinetd-(?P<pver>(?!20030122).+)"
 # Blacklist debian-specific tags
 GITTAGREGEX_pn-xf86-video-omapfb = "(?P<pver>\d+(\.\d+)+)(?!-)"
 
-# GNOME related.
-#
-# GNOME2_STABLE picks stable releases in the 2.x series (so not 2.90 onwards,
-# which were GNOME 3 betas.
-#
-# GNOME_STABLE picks the latest stable release.
-
-GNOME2_STABLE = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
-GNOME_STABLE = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
-
-REGEX_pn-glib-2.0 = "${GNOME_STABLE}"
-REGEX_pn-atk = "${GNOME_STABLE}"
-REGEX_pn-at-spi2-core = "${GNOME_STABLE}"
-REGEX_pn-at-spi2-atk = "${GNOME_STABLE}"
-REGEX_pn-gdk-pixbuf = "${GNOME_STABLE}"
-REGEX_pn-pango = "${GNOME_STABLE}"
-REGEX_pn-gtk+ = "${GNOME2_STABLE}"
-REGEX_pn-gtk+3 = "${GNOME_STABLE}"
-REGEX_pn-gtk-engines = "${GNOME2_STABLE}"
-REGEX_pn-gtk-icon-utils-native = "${GNOME2_STABLE}"
-REGEX_pn-glib-networking = "${GNOME_STABLE}"
-REGEX_pn-librsvg = "${GNOME_STABLE}"
-REGEX_pn-libsoup-2.4 = "${GNOME_STABLE}"
-REGEX_pn-vala = "${GNOME_STABLE}"
-REGEX_pn-clutter-1.0 = "${GNOME_STABLE}"
-REGEX_pn-clutter-gtk-1.0 = "${GNOME_STABLE}"
-REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}"
-REGEX_pn-cogl-1.0 = "${GNOME_STABLE}"
-REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}"
-REGEX_pn-vte = "${GNOME_STABLE}"
-REGEX_pn-epiphany = "${GNOME_STABLE}"
-REGEX_pn-webkitgtk = "${GNOME_STABLE}"
-REGEX_pn-p11-kit = "${GNOME_STABLE}"
-REGEX_pn-gnome-desktop3 = "${GNOME_STABLE}"
-
-# not GNOME related but uses same even-minor-release-is-stable logic
-REGEX_pn-dbus = "${GNOME_STABLE}"
-REGEX_pn-dbus-test = "${GNOME_STABLE}"
-
-# same logic applies to gstreamer releases
-REGEX_pn-gstreamer1.0 = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-libav = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-bad = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-base = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-good = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-plugins-ugly = "${GNOME_STABLE}"
-REGEX_pn-gstreamer1.0-rtsp-server = "${GNOME_STABLE}"
-
-# and perl
-REGEX_pn-perl = "${GNOME_STABLE}"
-
 # Keep old gcc versions at their major versions
 REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar"
 REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar"
index 704070bf208eee9962abcef107b4192acd723716..f5400a0f26b36a354aaafe6a9716f3826726d5fa 100644 (file)
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
 
-inherit autotools pkgconfig gettext ptest
+inherit autotools pkgconfig gettext ptest upstream-version-is-even
 
 EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
 EXTRA_OECONF_X_class-native = "--without-x"
index 207a018c2505be41322d344dca31400c2b149387..c0ad48b33c143abff8822463dcf61118983eccc5 100644 (file)
@@ -22,7 +22,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
 SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
 
-inherit useradd autotools pkgconfig gettext update-rc.d
+inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
 
 INITSCRIPT_NAME = "dbus-1"
 INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
index ae0eb797279a66e8bf7a0ad50e1128b094125c09..6e3cf56666c266f87d8bfc13568d0b34b73756d0 100644 (file)
@@ -27,7 +27,7 @@ PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
 LEAD_SONAME = "libglib-2.0.*"
 FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
 
-inherit autotools gettext gtk-doc pkgconfig ptest-gnome
+inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even
 
 S = "${WORKDIR}/glib-${PV}"
 
index b56e75744bacca0299a33c820fd4a826861d81c8..c980a09ed70e5539a191e7a707756a614325bc0b 100644 (file)
@@ -22,7 +22,7 @@ PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit"
 
 EXTRA_OECONF = "--without-gnome-proxy"
 
-inherit gnomebase gettext
+inherit gnomebase gettext upstream-version-is-even
 
 FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
 FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/"
index 0d9716c23525c2ce5c32971773ea2c7ad02b9d7a..3313a9436b99d6963cca44c893020adae2be9817 100644 (file)
@@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
                    file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
 
 SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz"
+
+inherit upstream-version-is-even
index 63056fde4c26961e475ea7735a4731df7105753f..c98244b5b502510b36a852e713af138f98e65690 100644 (file)
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
-inherit autotools pkgconfig
+inherit autotools pkgconfig upstream-version-is-even
 
 FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/"
 FILES_${PN}-doc += "${datadir}/devhelp"
index c3745c0ed1aa131e3095ee0af544e143e5032c9e..3ff35fc9bcc27f0081cec65bd6b7efae28b1d1a4 100644 (file)
@@ -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"
 
index 6e3cb02b65a042c181981924d1026f346fc940a0..dc05a0344ec899b392b57d5c55d90e177a054f8a 100644 (file)
@@ -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"
 
index 3765697f2a142a3b3caab474c1a535e0052526a8..43546ceba69b34f2dfb49490490f4e982c6340e9 100644 (file)
@@ -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"
 
index 2052761714fe922c66fc914ea86083631d26005c..81c88458dc988d633228ac549641b2a2cc3aa3be 100644 (file)
@@ -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"
 
index a197b9d96f9ed32bbaa47e0dcd27f88921bce283..0f413064024b818c446cd2fc9f037dece70c5bca 100644 (file)
@@ -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 = "(?P<pver>2\.([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"
index cb091f4cc35733d62bc3c8b6284ce42ade5d97a4..984e30551cb8eacfcad4e46d680637557697f056 100644 (file)
@@ -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
index e6c475b5c2c8ffc4ded9c8de8a399766d8a2ac95..d5e8a1ea58f229469be43ad9226e430b939622f0 100644 (file)
@@ -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"
 
index 7c3a87e872753c1516332daf66afdd5b159bf05b..aaf8cab7a66ba978659b6ebebd70508f3dfeefdf 100644 (file)
@@ -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 = "(?P<pver>2\.([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")
index 8c5206bdbcdda12053ae2c2bf11634b1f441e463..3ce1e558ab0f7d009b7d9e74863baf9b2971f4de 100644 (file)
@@ -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"
 
index 5d0f55c64d500ffd96ab31a7f58c64f794f558d6..7b115aa5a7fc90cd7c1fd892a63c83ed091f81c8 100644 (file)
@@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2.1+"
 
-inherit clutter ptest-gnome distro_features_check
+inherit clutter ptest-gnome distro_features_check upstream-version-is-even
 # depends on cogl-1.0 which needs opengl
 REQUIRED_DISTRO_FEATURES ?= "opengl"
 
index 67c75902ef3251cef9e50e63a2835ac9abfa6fb3..5aeeac6920754633de7e327a45dfa18fc2b4aea3 100644 (file)
@@ -2,7 +2,7 @@ SUMMARY = "GStreamer integration library for Clutter"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2+"
 
-inherit clutter distro_features_check
+inherit clutter distro_features_check upstream-version-is-even
 # depends on clutter-1.0 which depends on cogl-1.0
 REQUIRED_DISTRO_FEATURES ?= "opengl"
 
index 688eed2d91e59295063c68b55d544081266d5101..b07d3b941dcc51d70cd5cfc96eff138fa08629e6 100644 (file)
@@ -2,7 +2,7 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2+"
 
-inherit clutter distro_features_check
+inherit clutter distro_features_check upstream-version-is-even
 # depends on clutter-1.0 which depends on cogl-1.0
 REQUIRED_DISTRO_FEATURES ?= "opengl"
 # depends on gtk+3
index 88d84ea5fee6087b7cd609de2dfb9f1455d60351..b56bfecefee961ec69c822839cdf630b62e7f5a0 100644 (file)
@@ -2,7 +2,7 @@ SUMMARY = "Modern 3D graphics API with associated utility APIs"
 HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
 LICENSE = "MIT"
 
-inherit clutter distro_features_check
+inherit clutter distro_features_check upstream-version-is-even
 # cogl-1.0 needs opengl to build
 REQUIRED_DISTRO_FEATURES ?= "opengl"
 
index 78cd560af72f29aab52a93ce4baf52bd0a91c0b5..cd9f07dc6f5687469faa8fc094e494201faad8c9 100644 (file)
@@ -18,7 +18,7 @@ PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
 BBCLASSEXTEND = "native"
 DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
 
-inherit gnomebase gtk-doc qemu ptest-gnome
+inherit gnomebase gtk-doc qemu ptest-gnome upstream-version-is-even
 
 EXTRA_AUTORECONF = ""
 
index 5d86205cf89494c8c56db739cf01d02c1d21846a..664c5d6f99080392b5bf10df330e5f99723a996b 100644 (file)
@@ -5,7 +5,7 @@ LICENSE_FLAGS = "commercial"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig upstream-version-is-even
 
 # CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time,
 # compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the
index f1783b768b9ac94e9770f705ae2c9624f70ab58b..58c0bbb3e26bbbe728863af685d942d87abdb447 100644 (file)
@@ -4,7 +4,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
 SECTION = "multimedia"
 DEPENDS = "gstreamer1.0"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig upstream-version-is-even
 
 GSTREAMER_1_0_DEBUG ?= "--disable-debug"
 GSTREAMER_1_0_GIT_BRANCH ?= "master"
index 28a9420f85a90425bf69aa854acd6a9d31b48e85..65b48766963b4a8e784b213112e806a98f8828c6 100644 (file)
@@ -10,5 +10,5 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz
 
 S = "${WORKDIR}/${PNREAL}-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig upstream-version-is-even
 
index 7f368656602d615ef98d31abfdf35e08138637b3..77e160fd64b69d746e794cec5f0f086cb7e53d7e 100644 (file)
@@ -7,7 +7,7 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2+"
 DEPENDS = "glib-2.0 libxml2 bison-native flex-native libcap"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext upstream-version-is-even
 
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[check] = "--enable-check,--disable-check"
index 68634a9bc1fb7bbfbeedcdae5074dac679302d32..221ba172c173152e00d39928bef944b418f9c2a9 100644 (file)
@@ -19,7 +19,7 @@ SRC_URI = "\
 SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae"
 SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20"
 
-inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check
+inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even
 
 # depends on libxt
 REQUIRED_DISTRO_FEATURES = "x11"
index f2e543f795714b46f39fc01cbb4ea00c3603ad2f..f348d372373b359fb117dabb6e9b0ef45f892ba3 100644 (file)
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "c4b15f9386d34d464ddad5f6cc85669742c016df87141ceee935132459
 
 DEPENDS = "dbus glib-2.0 atk at-spi2-core"
 
-inherit autotools pkgconfig distro_features_check
+inherit autotools pkgconfig distro_features_check upstream-version-is-even
 
 # The at-spi2-core requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
index 53fa1f55a94bfb592c0c52918c9cde74efe27f70..bade3c61add919c3f81e11496a292c9a452f07e9 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "57d555be4cc64905454687bf9bb7dc1e68531bee93befa77222d94ea08
 
 DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
 
-inherit autotools gtk-doc pkgconfig distro_features_check
+inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
index 83bcae0c20407fe626a165d12862b1b0a321ca1f..97e2d224731b81e9ae61a2ae55b8a5dd67f0d046 100644 (file)
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
 
 DEPENDS = "glib-2.0"
 
-inherit gnomebase gtk-doc
+inherit gnomebase gtk-doc upstream-version-is-even
 
 SRC_URI[archive.md5sum] = "fd3678f35004b4c92e3da39356996054"
 SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b"
index 55d8b9e95b77bba7d36568396f8fed1f11ac84df..5e66197821948884a651570826890e99d0e722f5 100644 (file)
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "0e19bca047ad50b28e8ed7663840f9e45a94909148822ca44dcb3e8caf
 
 S = "${WORKDIR}/libsoup-${PV}"
 
-inherit autotools gettext pkgconfig
+inherit autotools gettext pkgconfig upstream-version-is-even
 
 # glib-networking is needed for SSL, proxies, etc.
 RRECOMMENDS_${PN} = "glib-networking"
index ee77951175a2ffe839969127981b6d91728280a0..8f15894b6cc35c5b10e35ea4c74e648921e8d463 100644 (file)
@@ -2,7 +2,7 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
 
-inherit autotools gettext pkgconfig
+inherit autotools gettext pkgconfig upstream-version-is-even
 
 DEPENDS = "libtasn1 libffi"
 
index 07b9e10dce58b13a4659cd5bef90bd96bd1384e0..94f958797681a1b79948ae8e126221957e8da3b6 100644 (file)
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.0"
 DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub"
 RDEPENDS_libvte = "vte-termcap"
 
-inherit gnome gtk-doc distro_features_check
+inherit gnome gtk-doc distro_features_check upstream-version-is-even
 ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
 
 EXTRA_OECONF = "--disable-python --disable-introspection"