diff options
author | zhengruoqin <zhengrq.fnst@cn.fujitsu.com> | 2020-04-09 22:48:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-24 14:10:08 +0100 |
commit | d06edf83286c03741ddb06401014fb9a6c58726c (patch) | |
tree | 2f44c03e797e584c1d99446c68a06ecb9ec1b16c /meta/recipes-support | |
parent | fe170b85aff0c5959a7c5a624e48208d18bf4cb6 (diff) | |
download | poky-d06edf83286c03741ddb06401014fb9a6c58726c.tar.gz |
at-spi2-atk: upgrade 2.34.1 -> 2.34.2
0001-atk_test_util.h-add-missing-sys-time.h-include.patch was removed since it was included in 2.34.2
(From OE-Core rev: a2d1a3349fe92276ba28028209858c4c34ef527a)
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch | 61 | ||||
-rw-r--r-- | meta/recipes-support/atk/at-spi2-atk_2.34.2.bb (renamed from meta/recipes-support/atk/at-spi2-atk_2.34.1.bb) | 7 |
2 files changed, 2 insertions, 66 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 deleted file mode 100644 index f64e46eccd..0000000000 --- a/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <timothy.t.orling@linux.intel.com> | ||
3 | Date: Fri, 28 Feb 2020 10:49:41 -0800 | ||
4 | Subject: [PATCH] atk_test_util.h: add missing sys/time.h include | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | On 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 | |||
35 | This is because of missing sys/time.h in tests/atk_test_util.h [2] | ||
36 | |||
37 | Thanks 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 | |||
43 | Upstream-Status: Pending | ||
44 | |||
45 | Signed-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 | |||
50 | diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h | ||
51 | index 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.34.1.bb b/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb index 6947559200..db62ae8fac 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb | |||
@@ -3,17 +3,14 @@ HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" | |||
3 | LICENSE = "LGPL-2.1+" | 3 | LICENSE = "LGPL-2.1+" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
5 | 5 | ||
6 | SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" | 6 | SRC_URI[archive.md5sum] = "58cd278574e101363b18d9a8b7053d67" |
7 | SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" | 7 | SRC_URI[archive.sha256sum] = "901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0" |
8 | 8 | ||
9 | DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" | 9 | DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" |
10 | 10 | ||
11 | GNOMEBASEBUILDCLASS = "meson" | 11 | GNOMEBASEBUILDCLASS = "meson" |
12 | inherit gnomebase features_check upstream-version-is-even | 12 | inherit 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 | ||
15 | SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch" | ||
16 | |||
17 | PACKAGES =+ "${PN}-gnome ${PN}-gtk2" | 14 | PACKAGES =+ "${PN}-gnome ${PN}-gtk2" |
18 | 15 | ||
19 | FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" | 16 | FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" |