From 6262cfdb7959b0d13283cf00f4b3c9e196ff6655 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sat, 24 Mar 2018 13:29:11 -0400
Subject: [PATCH] Atk update for 3.28

---
 ...i2-atk_2.26.1.bb => at-spi2-atk_2.26.2.bb} |  4 +--
 .../recipes-gnome/atk/at-spi2-core_2.26.2.bb  | 29 -------------------
 .../recipes-gnome/atk/at-spi2-core_2.28.0.bb  | 24 +++++++++++++++
 .../atk/{atk_2.26.1.bb => atk_2.28.1.bb}      |  4 +--
 4 files changed, 28 insertions(+), 33 deletions(-)
 rename meta-gnome/recipes-gnome/atk/{at-spi2-atk_2.26.1.bb => at-spi2-atk_2.26.2.bb} (83%)
 delete mode 100644 meta-gnome/recipes-gnome/atk/at-spi2-core_2.26.2.bb
 create mode 100644 meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb
 rename meta-gnome/recipes-gnome/atk/{atk_2.26.1.bb => atk_2.28.1.bb} (78%)

diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.1.bb b/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.2.bb
similarity index 83%
rename from meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.1.bb
rename to meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.2.bb
index 8617bb8..d29d296 100644
--- a/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.1.bb
+++ b/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.2.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "eeec6cead3350dca48a235271c105b3e"
-SRC_URI[sha256sum] = "b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75"
+SRC_URI[md5sum] = "355c7916a69513490cb83ad34016b169"
+SRC_URI[sha256sum] = "61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e"
 
 DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core"
 
diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.26.2.bb b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.26.2.bb
deleted file mode 100644
index 1f85b63..0000000
--- a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.26.2.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-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"
-
-MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-
-FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-support/atk/at-spi2-core:"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
-           file://0001-build-Add-with-systemduserunitdir.patch \
-           "
-SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485"
-SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615"
-
-DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
-
-inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OECONF = " \
-                --with-systemduserunitdir=${systemd_user_unitdir} \
-                --with-dbus-daemondir=${bindir}"
-
-FILES_${PN} += "${datadir}/dbus-1/services/*.service \
-                ${datadir}/dbus-1/accessibility-services/*.service \
-                ${datadir}/defaults/at-spi2 \
-                ${systemd_user_unitdir}/at-spi-dbus-bus.service \
-                "
diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb
new file mode 100644
index 0000000..9ef4d1f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.28.0.bb
@@ -0,0 +1,24 @@
+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"
+
+SRC_URI[archive.md5sum] = "9c42f79636ed1c0e908b7483d789b32e"
+SRC_URI[archive.sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87"
+
+
+DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gettext systemd distro_features_check upstream-version-is-even
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+#EXTRA_OEMESON = "--buildtype=release -Denable-introspection=yes -Ddbus-daemon=${bindir}"
+EXTRA_OEMESON = "--buildtype=release -Denable-introspection=yes -Ddbus_daemon=${bindir}/dbus-daemon" 
+
+FILES_${PN} += "${datadir}/dbus-1/services/*.service \
+                ${datadir}/dbus-1/accessibility-services/*.service \
+                ${datadir}/defaults/at-spi2 \
+                ${systemd_user_unitdir}/at-spi-dbus-bus.service \
+                "
diff --git a/meta-gnome/recipes-gnome/atk/atk_2.26.1.bb b/meta-gnome/recipes-gnome/atk/atk_2.28.1.bb
similarity index 78%
rename from meta-gnome/recipes-gnome/atk/atk_2.26.1.bb
rename to meta-gnome/recipes-gnome/atk/atk_2.28.1.bb
index 685b599..32f1335 100644
--- a/meta-gnome/recipes-gnome/atk/atk_2.26.1.bb
+++ b/meta-gnome/recipes-gnome/atk/atk_2.28.1.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0"
 
 inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
 
-SRC_URI[archive.md5sum] = "7cddcc313b9a3efd19b2ddf079ba68f5"
-SRC_URI[archive.sha256sum] = "ef00ff6b83851dddc8db38b4d9faeffb99572ba150b0664ee02e46f015ea97cb"
+SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11"
+SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc"
 
 BBCLASSEXTEND = "native"