diff options
| author | Tim Orling <timothy.t.orling@linux.intel.com> | 2020-05-01 13:05:16 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-03 15:41:39 +0100 |
| commit | 946dd23c26e2fcfc515d0fa240a14b3637ee808a (patch) | |
| tree | 8cfe971ea679855379e5369ad934e9491929a346 | |
| parent | 1644b5822bc04d50729f26cac152c0a4bacd5063 (diff) | |
| download | poky-946dd23c26e2fcfc515d0fa240a14b3637ee808a.tar.gz | |
at-spi2-core: upgrade 2.34.0 -> 2.36.0
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).
"""
(From OE-Core rev: dc0d7ddb395548992f87f0804e1736c7c28179d9)
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.36.0.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.34.0.bb) | 7 |
2 files changed, 3 insertions, 36 deletions
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 7631969cd6..0000000000 --- a/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From b7fa0aa00b07e03e338dd02af564431bf2f2b185 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Joshua Watt <Joshua.Watt@garmin.com> | ||
| 3 | Date: Wed, 20 Nov 2019 15:24:02 -0600 | ||
| 4 | Subject: [PATCH] Fix source reproducibility | ||
| 5 | |||
| 6 | The generated enum type files can be included in source packages meant | ||
| 7 | for debugging, and thus need to be reproducible. Replace the absolute | ||
| 8 | include of the header with the basename. This is sufficient because the | ||
| 9 | target include files are always in the include path anyway. | ||
| 10 | |||
| 11 | Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/at-spi2-core/merge_requests/25] | ||
| 12 | Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com> | ||
| 13 | --- | ||
| 14 | atspi/atspi-enum-types.c.template | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/atspi/atspi-enum-types.c.template b/atspi/atspi-enum-types.c.template | ||
| 18 | index 385d0ee..92e4937 100644 | ||
| 19 | --- a/atspi/atspi-enum-types.c.template | ||
| 20 | +++ b/atspi/atspi-enum-types.c.template | ||
| 21 | @@ -5,7 +5,7 @@ | ||
| 22 | |||
| 23 | /*** BEGIN file-production ***/ | ||
| 24 | /* enumerations from "@basename@" */ | ||
| 25 | -#include "@filename@" | ||
| 26 | +#include "@basename@" | ||
| 27 | |||
| 28 | /*** END file-production ***/ | ||
| 29 | |||
| 30 | -- | ||
| 31 | 2.23.0 | ||
| 32 | |||
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 index 84e05e77fc..c5d01c9294 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" | |||
| 5 | 5 | ||
| 6 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 6 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
| 7 | 7 | ||
| 8 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 8 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" |
| 9 | file://0001-Fix-source-reproducibility.patch" | ||
| 10 | 9 | ||
| 11 | SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" | 10 | SRC_URI[md5sum] = "f101d111b06293d15738afc904c1d931" |
| 12 | SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" | 11 | SRC_URI[sha256sum] = "88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a" |
| 13 | 12 | ||
| 14 | X11DEPENDS = "virtual/libx11 libxi libxtst" | 13 | X11DEPENDS = "virtual/libx11 libxi libxtst" |
| 15 | 14 | ||
