Return-Path: Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id 16FD47E024 for ; Mon, 20 May 2019 14:11:56 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id c77so12003836wmd.1 for ; Mon, 20 May 2019 07:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tZxgKrWqRFBTcFyM9HjvR2fMMHt4IGu+Ht1SkhxFtM4=; b=A4EnVQLKK3/jZi6CtEMpxI63zGV5zkl2XIe3S/1lZZtPXhN13a//0PuTQLChWGi3dQ +/9A0iW1/SjyL1LSc0exam/NjDHkPBpQ3Q6vZcyqeKi1QS+u7hQZss//oDYpItPbStI5 kc4a1BLgA+d2P5HSAaUdXkPS2V/IVoGQlSxxIBmCveEoREIQUTsbZEy7qdpHb/CnPmOZ vLcuChBoNV3xQ7iTy+bYN6ZJtCHr4U/9rDiWJaUm23da9ascjTc6dj1Cv9fzhnRIyfJ8 VCa5WdlTFfHT9RopNajQ/emOTaHgJVjIR3/lz7dDCA9vhGd9erxzcrRVo7WFNnOxMjId iHYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tZxgKrWqRFBTcFyM9HjvR2fMMHt4IGu+Ht1SkhxFtM4=; b=e4m15WAGOf/AOY9Vv6mprKoYAq9Fp3urqvhoFVfLbpvlbVV5w44239NYxH0WuCKzOx 8VQF0r48Llj4SoPY9qfGJRCMzk+Sl5jnFKv8K/hRrDj2OGO3iijMGrXuyf/KHx+MxmlT wiwKf3ERBDlIap0mhLdxwDPYbyoIbW1fuUBIQ3MfC18DEHDGgENu2bnKvxIB5TBPg0ci ULdFr25aTFifZytwMEw/vqArXrYeouqfTkFxv83GOUJ+DmW8ZQwdAyo/iR2jTW3NjQ3E FrlttJbursch+8zLNmgZR8Qs2eDggESRqi6tMx8Gwv/ozcd7lChaTNdQzhAs4azN0AtB X80w== X-Gm-Message-State: APjAAAVFP8jtJBnlKlcGoOSQ7+k//V3K4ditCN9ulIYe0b1OYHJi2y3q p8GXIj6t+GdYmlKVo9CM467lLbSS X-Google-Smtp-Source: APXvYqzwNZgHiF+8DGp6d6WM4Z4waQkRFpDo0yOP8zS73uq/pEHkGvz0sQksrsKEvIg6V6myrwxyBQ== X-Received: by 2002:a05:600c:2116:: with SMTP id u22mr11722985wml.58.1558361516744; Mon, 20 May 2019 07:11:56 -0700 (PDT) Received: from alexander-box.luxoft.com ([62.96.135.139]) by smtp.gmail.com with ESMTPSA id v5sm36242015wra.83.2019.05.20.07.11.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 May 2019 07:11:56 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Mon, 20 May 2019 16:11:07 +0200 Message-Id: <20190520141125.10805-24-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190520141125.10805-1-alex.kanavin@gmail.com> References: <20190520141125.10805-1-alex.kanavin@gmail.com> Subject: [PATCH 24/42] at-spi2-core: upgrade 2.30.0 -> 2.32.1 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 May 2019 14:11:56 -0000 Signed-off-by: Alexander Kanavin --- .../atk/at-spi2-core/meson-0.50-fix.patch | 31 ------------------- ...-core_2.30.0.bb => at-spi2-core_2.32.1.bb} | 12 +++---- 2 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch rename meta/recipes-support/atk/{at-spi2-core_2.30.0.bb => at-spi2-core_2.32.1.bb} (79%) 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 fbdf7d0e2ea..00000000000 --- a/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001 -From: Tobias Stoeckmann -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 -Signed-off-by: Tobias Stoeckmann ---- - 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' ], 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 similarity index 79% rename from meta/recipes-support/atk/at-spi2-core_2.30.0.bb rename to meta/recipes-support/atk/at-spi2-core_2.32.1.bb index cfe0ddeef2d..0f84259d942 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" 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' -- 2.17.1