diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-13 22:56:16 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-14 07:57:27 +0100 |
| commit | e63fd638d32a792eede20a8ca26cebfabb4fdd96 (patch) | |
| tree | 22f5bfabd34e492f6ca25f60fe1f48c268d729fe | |
| parent | 035f8548fe1827df6522f21584485891c133aca7 (diff) | |
| download | poky-e63fd638d32a792eede20a8ca26cebfabb4fdd96.tar.gz | |
gnome: drop upstream even condition from a few recipes
They have adopted the new gnome version scheme where the distinction
is no longer:
https://lwn.net/Articles/831746/
(From OE-Core rev: 7e36fe212eb6bc9a4dbe66007837ad87d8f00a7d)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_40.1.bb b/meta/recipes-gnome/epiphany/epiphany_40.1.bb index e1e3ad7868..2242e9d010 100644 --- a/meta/recipes-gnome/epiphany/epiphany_40.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_40.1.bb | |||
| @@ -12,7 +12,7 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr gnutls \ | |||
| 12 | libarchive" | 12 | libarchive" |
| 13 | 13 | ||
| 14 | GNOMEBASEBUILDCLASS = "meson" | 14 | GNOMEBASEBUILDCLASS = "meson" |
| 15 | inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg | 15 | inherit gnomebase gsettings features_check gettext mime-xdg |
| 16 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | 16 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
| 17 | 17 | ||
| 18 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 18 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ |
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb index 6cde6fffa3..61927c0dd1 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ | |||
| 8 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ | 8 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ |
| 9 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" | 9 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" |
| 10 | 10 | ||
| 11 | inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even | 11 | inherit allarch autotools pkgconfig gettext gtk-icon-cache |
| 12 | 12 | ||
| 13 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 13 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
| 14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ |
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb index a36a2b113c..672fbd2b07 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb | |||
| @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ | |||
| 10 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ | 10 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ |
| 11 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" | 11 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" |
| 12 | 12 | ||
| 13 | inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even | 13 | inherit allarch autotools pkgconfig gettext gtk-icon-cache |
| 14 | 14 | ||
| 15 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 15 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
| 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ |
diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb index 34681197d8..cf06af57d6 100644 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb | |||
| @@ -11,6 +11,6 @@ DEPENDS = "glib-2.0" | |||
| 11 | 11 | ||
| 12 | GNOMEBASEBUILDCLASS = "meson" | 12 | GNOMEBASEBUILDCLASS = "meson" |
| 13 | 13 | ||
| 14 | inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even | 14 | inherit gnomebase gsettings gobject-introspection gettext |
| 15 | 15 | ||
| 16 | SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67" | 16 | SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67" |
