[PATCH 1/2] atk: upgrade 2.34.1 -> 2.36.0

[PATCH 1/2] atk: upgrade 2.34.1 -> 2.36.0

[Tim Orling]

Upstream release notes:

Changes in version 2.36
=========================

* New API
   * Added ATK_ROLE_MARK and ATK_ROLE_SUGGESTION
   * Add ATK_TEX_ATTR_TEXT_POSITION to the list of possible AtkText
     attributes (MR!33)

* Documentation
   * Updated documentation for atk_text_set_caret_offset (MR!18)

* Building - meson
   * Fix building atk as subproject
   * Add Meson wrap file for GLib (MR!37)

* Building - visual studio
   * Use -utf-8 if available (MR!38)

Contributors
   Luca Bacci, Joanmarie Diggs, Samuel Thibault

Translations

   Fran Dieguez (gl), Ryuta Fujii (ja), Daniel Korostil (uk), Jwtiyar
   Nariman (ckb), Umarzuki Bin Mochlis Moktar (ms)

Changes in version 2.35.1
=========================

* AtkComponent, AtkImage, AtkText: Make sure returned values are
  initialized to some known default value (MR!22, MR!24)

* AtkPlug
   * Add atk_plug_set_child (MR!27)

* AtkSocket
   * Make AtkSocket get_extents return parent extents by default (MR!23)
   * atk_socket_embed: make plug_id parameter const (MR!26)
   * Make AtkSocketClass (embed) use const for plug_id (MR!31)

* AtkText
   * Make atk_text_rectangle_union ignore undefined rectangles (MR!25)

* Documentation
   * Refine *_scroll_to_point documentation (MR!21)
   * Refine AtkScrollType documentation (MR!12)

Contributors
  Samuel Thibault

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 meta/recipes-support/atk/{atk_2.34.1.bb => atk_2.36.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/atk/{atk_2.34.1.bb => atk_2.36.0.bb} (80%)

diff --git a/meta/recipes-support/atk/atk_2.34.1.bb b/meta/recipes-support/atk/atk_2.36.0.bb
similarity index 80%
rename from meta/recipes-support/atk/atk_2.34.1.bb
rename to meta/recipes-support/atk/atk_2.36.0.bb
index 277397c6943..0786eeebe87 100644
--- a/meta/recipes-support/atk/atk_2.34.1.bb
+++ b/meta/recipes-support/atk/atk_2.36.0.bb
@@ -14,8 +14,8 @@ DEPENDS = "gettext-native glib-2.0"
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
 
-SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9"
-SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb"
+SRC_URI[archive.md5sum] = "01aa5ec5138f5f8c9b3a4e3196ed2900"
+SRC_URI[archive.sha256sum] = "fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
2.24.0

[PATCH 2/2] at-spi2-core: upgrade 2.34.0 -> 2.36.0

[Tim Orling]

Fix source reproducibility patch merged upstream.
https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/25.

Upstream release notes:
"""
What's new in at-spi2-core 2.35.92:

* bus-launcher: make session management more robust.

What's new in at-spi2-core 2.35.1:

* Fix source reproducibility (!25).

* Avoid depending on Meson 0.50 (#20).

* Add ATSPI_ROLE_MARK and ATSPI_ROLE_SUGGESTION (!27).
"""

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 .../0001-Fix-source-reproducibility.patch     | 32 -------------------
 ...-core_2.34.0.bb => at-spi2-core_2.36.0.bb} |  7 ++--
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch
 rename meta/recipes-support/atk/{at-spi2-core_2.34.0.bb => at-spi2-core_2.36.0.bb} (86%)

diff --git a/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch b/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch
deleted file mode 100644
index 7631969cd62..00000000000
--- a/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b7fa0aa00b07e03e338dd02af564431bf2f2b185 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <Joshua.Watt@garmin.com>
-Date: Wed, 20 Nov 2019 15:24:02 -0600
-Subject: [PATCH] Fix source reproducibility
-
-The generated enum type files can be included in source packages meant
-for debugging, and thus need to be reproducible. Replace the absolute
-include of the header with the basename. This is sufficient because the
-target include files are always in the include path anyway.
-
-Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/at-spi2-core/merge_requests/25]
-Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
----
- atspi/atspi-enum-types.c.template | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/atspi/atspi-enum-types.c.template b/atspi/atspi-enum-types.c.template
-index 385d0ee..92e4937 100644
---- a/atspi/atspi-enum-types.c.template
-+++ b/atspi/atspi-enum-types.c.template
-@@ -5,7 +5,7 @@
- 
- /*** BEGIN file-production ***/
- /* enumerations from "@basename@" */
--#include "@filename@"
-+#include "@basename@"
- 
- /*** END file-production ***/
- 
--- 
-2.23.0
-
diff --git a/meta/recipes-support/atk/at-spi2-core_2.34.0.bb b/meta/recipes-support/atk/at-spi2-core_2.36.0.bb
similarity index 86%
rename from meta/recipes-support/atk/at-spi2-core_2.34.0.bb
rename to meta/recipes-support/atk/at-spi2-core_2.36.0.bb
index 84e05e77fc7..c5d01c9294b 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.34.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.36.0.bb
@@ -5,11 +5,10 @@ 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 \
-           file://0001-Fix-source-reproducibility.patch"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b"
-SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6"
+SRC_URI[md5sum] = "f101d111b06293d15738afc904c1d931"
+SRC_URI[sha256sum] = "88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a"
 
 X11DEPENDS = "virtual/libx11 libxi libxtst"
 
-- 
2.24.0