diff options
Diffstat (limited to 'poky/meta/recipes-support/atk')
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb (renamed from poky/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb) | 10 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-core_2.36.0.bb (renamed from poky/meta/recipes-support/atk/at-spi2-core_2.32.1.bb) | 8 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch | 29 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/atk_2.36.0.bb (renamed from poky/meta/recipes-support/atk/atk_2.32.0.bb) | 5 |
4 files changed, 11 insertions, 41 deletions
diff --git a/poky/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb index d3a9de1e4..02a4d4712 100644 --- a/poky/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/poky/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb @@ -1,15 +1,15 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" -SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" +SRC_URI[archive.md5sum] = "58cd278574e101363b18d9a8b7053d67" +SRC_URI[archive.sha256sum] = "901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase features_check upstream-version-is-even +inherit gnomebase upstream-version-is-even PACKAGES =+ "${PN}-gnome ${PN}-gtk2" diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.32.1.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.36.0.bb index 11052a8ec..c5d01c929 100644 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.32.1.bb +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.36.0.bb @@ -1,14 +1,14 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "998fd9d858f8fa22c4c8c15567bf6254" -SRC_URI[sha256sum] = "3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53" +SRC_URI[md5sum] = "f101d111b06293d15738afc904c1d931" +SRC_URI[sha256sum] = "88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a" X11DEPENDS = "virtual/libx11 libxi libxtst" diff --git a/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index d1b08bc04..000000000 --- a/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Fri, 6 Apr 2018 12:04:00 +0800 -Subject: [PATCH] meson.build: enable introspection for cross-compile - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> - ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 0ad67e5..1d2a49c 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: glib_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/poky/meta/recipes-support/atk/atk_2.32.0.bb b/poky/meta/recipes-support/atk/atk_2.36.0.bb index 67223729e..0786eeebe 100644 --- a/poky/meta/recipes-support/atk/atk_2.32.0.bb +++ b/poky/meta/recipes-support/atk/atk_2.36.0.bb @@ -14,9 +14,8 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" -SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" -SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" +SRC_URI[archive.md5sum] = "01aa5ec5138f5f8c9b3a4e3196ed2900" +SRC_URI[archive.sha256sum] = "fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788" BBCLASSEXTEND = "native nativesdk" |