mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
at-spi2-core: upgrade 2.30.0 -> 2.32.1
(From OE-Core rev: a87ff44d6740990dae63d93d6500f5d616c36048) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
22ccbf7557
commit
84ef0b3033
@@ -1,31 +0,0 @@
|
||||
From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Tue, 12 Mar 2019 11:46:24 +0100
|
||||
Subject: [PATCH] Fix meson.build for meson 0.50.0.
|
||||
|
||||
Since meson 0.50.0 it is not possible anymore to specify an
|
||||
absolute directory for subdir. To keep current functionality,
|
||||
use install_dir instead.
|
||||
|
||||
atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
---
|
||||
atspi/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/atspi/meson.build b/atspi/meson.build
|
||||
index b7a9357..2a6915d 100644
|
||||
--- a/atspi/meson.build
|
||||
+++ b/atspi/meson.build
|
||||
@@ -57,7 +57,7 @@ atspi_headers = [
|
||||
|
||||
atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
|
||||
|
||||
-install_headers(atspi_headers, subdir: atspi_includedir)
|
||||
+install_headers(atspi_headers, install_dir: atspi_includedir)
|
||||
|
||||
atspi_enums = gnome.mkenums('atspi-enum-types',
|
||||
sources: [ 'atspi-constants.h', 'atspi-types.h' ],
|
||||
+5
-7
@@ -5,12 +5,10 @@ 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 \
|
||||
file://meson-0.50-fix.patch \
|
||||
"
|
||||
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
|
||||
|
||||
SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5"
|
||||
SRC_URI[sha256sum] = "0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b"
|
||||
SRC_URI[md5sum] = "998fd9d858f8fa22c4c8c15567bf6254"
|
||||
SRC_URI[sha256sum] = "3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53"
|
||||
|
||||
X11DEPENDS = "virtual/libx11 libxi libxtst"
|
||||
|
||||
@@ -22,9 +20,9 @@ inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject
|
||||
EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
|
||||
-Ddbus_daemon=${bindir}/dbus-daemon"
|
||||
|
||||
GTKDOC_MESON_OPTION = "enable_docs"
|
||||
GTKDOC_MESON_OPTION = "docs"
|
||||
|
||||
GIR_MESON_OPTION = 'enable-introspection'
|
||||
GIR_MESON_OPTION = 'introspection'
|
||||
GIR_MESON_ENABLE_FLAG = 'yes'
|
||||
GIR_MESON_DISABLE_FLAG = 'no'
|
||||
|
||||
Reference in New Issue
Block a user