summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch31
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.32.1.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.30.0.bb)12
2 files changed, 5 insertions, 38 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch b/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch
deleted file mode 100644
index fbdf7d0e2e..0000000000
--- a/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
2From: Tobias Stoeckmann <tobias@stoeckmann.org>
3Date: Tue, 12 Mar 2019 11:46:24 +0100
4Subject: [PATCH] Fix meson.build for meson 0.50.0.
5
6Since meson 0.50.0 it is not possible anymore to specify an
7absolute directory for subdir. To keep current functionality,
8use install_dir instead.
9
10atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
11
12Upstream-Status: Backport
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
15---
16 atspi/meson.build | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/atspi/meson.build b/atspi/meson.build
20index b7a9357..2a6915d 100644
21--- a/atspi/meson.build
22+++ b/atspi/meson.build
23@@ -57,7 +57,7 @@ atspi_headers = [
24
25 atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
26
27-install_headers(atspi_headers, subdir: atspi_includedir)
28+install_headers(atspi_headers, install_dir: atspi_includedir)
29
30 atspi_enums = gnome.mkenums('atspi-enum-types',
31 sources: [ 'atspi-constants.h', 'atspi-types.h' ],
diff --git a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb b/meta/recipes-support/atk/at-spi2-core_2.32.1.bb
index cfe0ddeef2..0f84259d94 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.32.1.bb
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
5 5
6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
7 7
8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ 8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
9 file://meson-0.50-fix.patch \
10 "
11 9
12SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5" 10SRC_URI[md5sum] = "998fd9d858f8fa22c4c8c15567bf6254"
13SRC_URI[sha256sum] = "0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b" 11SRC_URI[sha256sum] = "3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53"
14 12
15X11DEPENDS = "virtual/libx11 libxi libxtst" 13X11DEPENDS = "virtual/libx11 libxi libxtst"
16 14
@@ -22,9 +20,9 @@ inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject
22EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ 20EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
23 -Ddbus_daemon=${bindir}/dbus-daemon" 21 -Ddbus_daemon=${bindir}/dbus-daemon"
24 22
25GTKDOC_MESON_OPTION = "enable_docs" 23GTKDOC_MESON_OPTION = "docs"
26 24
27GIR_MESON_OPTION = 'enable-introspection' 25GIR_MESON_OPTION = 'introspection'
28GIR_MESON_ENABLE_FLAG = 'yes' 26GIR_MESON_ENABLE_FLAG = 'yes'
29GIR_MESON_DISABLE_FLAG = 'no' 27GIR_MESON_DISABLE_FLAG = 'no'
30 28