summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/atk
diff options
context:
space:
mode:
authorTim Orling <timothy.t.orling@linux.intel.com>2020-02-28 21:03:59 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-29 13:04:49 +0000
commit070c0d27a8b8768698115d0862eb13b719add44a (patch)
treedccbee336b982fae5cb0bd3b1478be7a61cc5a3c /meta/recipes-support/atk
parent748ba1dc59d1b3d14ea8fbf8156c47a979350ec8 (diff)
downloadpoky-070c0d27a8b8768698115d0862eb13b719add44a.tar.gz
at-spi2-atk: upgrade 2.32.0 -> 2.34.1
Add patch to fix missing sys/time.h include in tests/atk_test_util.h Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ (From OE-Core rev: dd78eeef75cb94f14dda8ae50c0a0bee1fcfca07) Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/atk')
-rw-r--r--meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch61
-rw-r--r--meta/recipes-support/atk/at-spi2-atk_2.34.1.bb (renamed from meta/recipes-support/atk/at-spi2-atk_2.32.0.bb)11
2 files changed, 68 insertions, 4 deletions
diff --git a/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch
new file mode 100644
index 0000000000..f64e46eccd
--- /dev/null
+++ b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch
@@ -0,0 +1,61 @@
1From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001
2From: Tim Orling <timothy.t.orling@linux.intel.com>
3Date: Fri, 28 Feb 2020 10:49:41 -0800
4Subject: [PATCH] atk_test_util.h: add missing sys/time.h include
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9On centos-7, we see errors likei [1]:
10../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_sec’ specified in initializer
11../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default]
12../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default]
13../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_nsec’ specified in initializer
14../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default]
15../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default]
16../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ‘timeout’ isn’t known
17 struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 };
18 ^
19../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ‘nanosleep’ [-Wimplicit-function-declaration]
20 nanosleep(&timeout, NULL);
21 ^
22../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’:
23../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ‘timeout’ has initializer but incomplete type
24 struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 };
25 ^
26../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_sec’ specified in initializer
27../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default]
28../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default]
29../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_nsec’ specified in initializer
30../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default]
31../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default]
32../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ‘timeout’ isn’t known
33 struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 };
34
35This is because of missing sys/time.h in tests/atk_test_util.h [2]
36
37Thanks go to Khem Raj for pointing this out [3]
38
39[1] http://errors.yoctoproject.org/Errors/Details/392974/
40[2] https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14
41[3] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293707.html
42
43Upstream-Status: Pending
44
45Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
46---
47 tests/atk_test_util.h | 1 +
48 1 file changed, 1 insertion(+)
49
50diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h
51index d69e650..98a2c01 100644
52--- a/tests/atk_test_util.h
53+++ b/tests/atk_test_util.h
54@@ -26,6 +26,7 @@
55
56 #include <stdio.h>
57 #include <unistd.h>
58+#include <sys/time.h>
59 #include <glib.h>
60 #include <stdio.h>
61 #include <stdlib.h>
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb
index b717a9c7f7..6947559200 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb
@@ -1,16 +1,19 @@
1SUMMARY = "AT-SPI 2 Toolkit Bridge" 1SUMMARY = "AT-SPI 2 Toolkit Bridge"
2HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" 2HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
3LICENSE = "LGPLv2" 3LICENSE = "LGPL-2.1+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" 4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5 5
6SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" 6SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15"
7SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" 7SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16"
8 8
9DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" 9DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
10 10
11GNOMEBASEBUILDCLASS = "meson" 11GNOMEBASEBUILDCLASS = "meson"
12inherit gnomebase features_check upstream-version-is-even 12inherit gnomebase features_check upstream-version-is-even
13 13
14# gnomebase.bbclass sets SRC_URI = , so we need to append after, at least for -native
15SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch"
16
14PACKAGES =+ "${PN}-gnome ${PN}-gtk2" 17PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
15 18
16FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" 19FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"