Return-Path: Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id 3D94F7D735 for ; Mon, 20 May 2019 14:11:41 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id d9so1838290wrx.0 for ; Mon, 20 May 2019 07:11:42 -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=c49oUUghyyBoDwXLmFTrgkR/I9A2FHCbiysqudwm/vo=; b=V+CCscPKGn/iRe3MG+/LclxoLKIhET6/WDCK2N4KIPKyuyuNSDqZT58XEKQpGty1lc xSCbr3hfpsN8yfTfVC8MSMTvKk/0J0/EDdqozwSDlsZFLo7vl3uumK2yCcrSML9TrKeq vQK7Cm4Zp6dkiUO4kYMfWOu1lGLDmEsdTZBolKks6JpRI5GSvcc/BOCdXuENq7WPVDBC KZrS0WewXk/fc6uQmBLHmSH4bC0S8SpYuK/LjZ0AirHWG6e+byIfKlFEvaaWd4sQyp5M 79+q2mVL8ZwyT9MBUiN83h2JdTIFc4lkKQmHj8IbUzvdJRgnWUuyUSw5tUB5TiiK7bD6 hlrQ== 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=c49oUUghyyBoDwXLmFTrgkR/I9A2FHCbiysqudwm/vo=; b=HzyYjm48oa3bgrEnGaCZ/cZh4Wj8Hpo+CxqAxg+rq6hcMeLAipHMBqz/W7kYxXIW06 0TXB/wmlHRjrjvbfSGKXebxOD2YpK/sn4zztYYqUdu+rSOLWghlOQ/ZnpxW35wcSv3eO mf+wYzG6ilKN1DWwDj3CvHmULKZomAK6XXD42CwmfPqZ9FFL/iJD6Q02xnBHDCwT5MJ3 owTeuxsGQoZ4jYH3vsfWH+ihcUbnuQnR8OwOImn3tmdWrrPx5TaLaaf3xb2qHS8Bz+xV oXOVSpiTtP6CTY6yisPnrBWxVqdk3eWwoj5R8rApokU4lcPfeHf6SY44P7C9Tv2cM9Wv KPtg== X-Gm-Message-State: APjAAAVpvSt8KI1cr0ygISb7aSo6ofiJgu1Y2dtSPdksEs9lhnaWHNO2 bd86m06a9ZboRxk6JB7AC3+/qSRo X-Google-Smtp-Source: APXvYqxS8O0lAaLJroixkDyE+h5gxWaVtYWQ9sDoFfyf0u1krnE/8Ztgk7jUR0dAICaE4pHl9PzJAQ== X-Received: by 2002:a5d:68c7:: with SMTP id p7mr23319453wrw.23.1558361501720; Mon, 20 May 2019 07:11:41 -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.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 May 2019 07:11:40 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Mon, 20 May 2019 16:10:52 +0200 Message-Id: <20190520141125.10805-9-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 09/42] atk: upgrade 2.30.0 -> 2.32.0 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:41 -0000 Signed-off-by: Alexander Kanavin --- ...001-Switch-from-filename-to-basename.patch | 38 ------------------- ...able-introspection-for-cross-compile.patch | 7 ++-- .../atk/{atk_2.30.0.bb => atk_2.32.0.bb} | 9 ++--- 3 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch rename meta/recipes-support/atk/{atk_2.30.0.bb => atk_2.32.0.bb} (64%) diff --git a/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch b/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch deleted file mode 100644 index 047e81fb613..00000000000 --- a/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Submitted - -From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman -Date: Thu, 14 Jun 2018 17:21:49 +0000 -Subject: [PATCH] Switch from filename to basename - -When atk-enum-types.h is installed in to a system, the user likely has -no access to the location where the headers were built, especially if -the software was built in a sysroot environment. If the headers were -built for a mulitlib environment, the build pathing may be different. -Subsequently, if two mulitlib variants of atk are installed together the -headers conflict for no other reason then they were built in two -different locations. Switching from filename to basename, still should -provide sufficient information on the providence of the enums, while not -conflicting for really no good reason. - -Signed-off-by: Jeremy Puhlman ---- - atk/atk-enum-types.h.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template -index 7b4cec4..8321c24 100644 ---- a/atk/atk-enum-types.h.template -+++ b/atk/atk-enum-types.h.template -@@ -14,7 +14,7 @@ G_BEGIN_DECLS - - /*** BEGIN file-production ***/ - --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ --- -2.14.1.459.g238e487 - diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch index 1d814ccdb74..d1b08bc04b6 100644 --- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch @@ -1,4 +1,4 @@ -From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001 +From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 6 Apr 2018 12:04:00 +0800 Subject: [PATCH] meson.build: enable introspection for cross-compile @@ -9,16 +9,17 @@ if it should be disabled or not. Upstream-Status: Pending Signed-off-by: Anuj Mittal + --- atk/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atk/meson.build b/atk/meson.build -index 616a3e6..941ded8 100644 +index 0ad67e5..1d2a49c 100644 --- a/atk/meson.build +++ b/atk/meson.build @@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: gobject_dep, + dependencies: glib_dep, sources: atk_enum_h) -if not meson.is_cross_build() and get_option('introspection') diff --git a/meta/recipes-support/atk/atk_2.30.0.bb b/meta/recipes-support/atk/atk_2.32.0.bb similarity index 64% rename from meta/recipes-support/atk/atk_2.30.0.bb rename to meta/recipes-support/atk/atk_2.32.0.bb index 4e22b3f8113..67223729e93 100644 --- a/meta/recipes-support/atk/atk_2.30.0.bb +++ b/meta/recipes-support/atk/atk_2.32.0.bb @@ -14,12 +14,9 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI_append = " \ - file://0001-meson.build-enable-introspection-for-cross-compile.patch \ - file://0001-Switch-from-filename-to-basename.patch \ - " -SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454" -SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b" +SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" +SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" +SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" BBCLASSEXTEND = "native nativesdk" -- 2.17.1