diff options
Diffstat (limited to 'poky/meta/recipes-support/atk')
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch | 61 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb (renamed from poky/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb) | 7 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch | 32 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb (renamed from poky/meta/recipes-support/atk/at-spi2-core_2.36.0.bb) | 7 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/atk_2.34.1.bb (renamed from poky/meta/recipes-support/atk/atk_2.36.0.bb) | 4 |
5 files changed, 104 insertions, 7 deletions
diff --git a/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch b/poky/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/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch @@ -0,0 +1,61 @@ +From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001 +From: Tim Orling <timothy.t.orling@linux.intel.com> +Date: Fri, 28 Feb 2020 10:49:41 -0800 +Subject: [PATCH] atk_test_util.h: add missing sys/time.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On centos-7, we see errors likei [1]: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_sec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_nsec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ‘timeout’ isn’t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] + nanosleep(&timeout, NULL); + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ‘timeout’ has initializer but incomplete type + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_sec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_nsec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ‘timeout’ isn’t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + +This is because of missing sys/time.h in tests/atk_test_util.h [2] + +Thanks go to Khem Raj for pointing this out [3] + +[1] http://errors.yoctoproject.org/Errors/Details/392974/ +[2] https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14 +[3] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293707.html + +Upstream-Status: Pending + +Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +--- + tests/atk_test_util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h +index d69e650..98a2c01 100644 +--- a/tests/atk_test_util.h ++++ b/tests/atk_test_util.h +@@ -26,6 +26,7 @@ + + #include <stdio.h> + #include <unistd.h> ++#include <sys/time.h> + #include <glib.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/poky/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb index db62ae8fac..6947559200 100644 --- a/poky/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb +++ b/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -3,14 +3,17 @@ HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "58cd278574e101363b18d9a8b7053d67" -SRC_URI[archive.sha256sum] = "901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0" +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check upstream-version-is-even +# gnomebase.bbclass sets SRC_URI = , so we need to append after, at least for -native +SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch" + PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" diff --git a/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch b/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch new file mode 100644 index 0000000000..7631969cd6 --- /dev/null +++ b/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch @@ -0,0 +1,32 @@ +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/poky/meta/recipes-support/atk/at-spi2-core_2.36.0.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb index c5d01c9294..84e05e77fc 100644 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.36.0.bb +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb @@ -5,10 +5,11 @@ 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 = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://0001-Fix-source-reproducibility.patch" -SRC_URI[md5sum] = "f101d111b06293d15738afc904c1d931" -SRC_URI[sha256sum] = "88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a" +SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" +SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" X11DEPENDS = "virtual/libx11 libxi libxtst" diff --git a/poky/meta/recipes-support/atk/atk_2.36.0.bb b/poky/meta/recipes-support/atk/atk_2.34.1.bb index 0786eeebe8..277397c694 100644 --- a/poky/meta/recipes-support/atk/atk_2.36.0.bb +++ b/poky/meta/recipes-support/atk/atk_2.34.1.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] = "01aa5ec5138f5f8c9b3a4e3196ed2900" -SRC_URI[archive.sha256sum] = "fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788" +SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" BBCLASSEXTEND = "native nativesdk" |