From: Anuj Mittal <anuj.mittal@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 3/5] atk: upgrade 2.28.1 -> 2.30.0
Date: Thu, 20 Dec 2018 16:43:34 +0800 [thread overview]
Message-ID: <20181220084336.7294-3-anuj.mittal@intel.com> (raw)
In-Reply-To: <20181220084336.7294-1-anuj.mittal@intel.com>
* For changes, see:
https://github.com/GNOME/atk/blob/ATK_2_30_0/NEWS
* Change in doc and introspection switches and patch refresh.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...ld-enable-introspection-for-cross-compile.patch | 14 +++++++-------
.../atk/{atk_2.28.1.bb => atk_2.30.0.bb} | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
rename meta/recipes-support/atk/{atk_2.28.1.bb => atk_2.30.0.bb} (79%)
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 c604a984a4..1d814ccdb7 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 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001
+From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Fri, 6 Apr 2018 12:04:00 +0800
Subject: [PATCH] meson.build: enable introspection for cross-compile
@@ -14,15 +14,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/atk/meson.build b/atk/meson.build
-index 7b5a683..855e28f 100644
+index 616a3e6..941ded8 100644
--- a/atk/meson.build
+++ b/atk/meson.build
-@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk,
+@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
+ dependencies: gobject_dep,
+ sources: atk_enum_h)
- disable_introspection = get_option('disable_introspection')
-
--if not meson.is_cross_build() and not disable_introspection
-+if not disable_introspection
+-if not meson.is_cross_build() and get_option('introspection')
++if get_option('introspection')
gnome.generate_gir(libatk,
sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
namespace: 'Atk',
diff --git a/meta/recipes-support/atk/atk_2.28.1.bb b/meta/recipes-support/atk/atk_2.30.0.bb
similarity index 79%
rename from meta/recipes-support/atk/atk_2.28.1.bb
rename to meta/recipes-support/atk/atk_2.30.0.bb
index 26b13b69d7..c950862b6f 100644
--- a/meta/recipes-support/atk/atk_2.28.1.bb
+++ b/meta/recipes-support/atk/atk_2.30.0.bb
@@ -14,11 +14,11 @@ DEPENDS = "gettext-native glib-2.0"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
-GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
-GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
+GTKDOC_ENABLE_FLAG = "-Ddocs=true"
+GTKDOC_DISABLE_FLAG = "-Ddocs=false"
-GI_ENABLE_FLAG = "-Ddisable_introspection=false"
-GI_DISABLE_FLAG = "-Ddisable_introspection=true"
+GI_ENABLE_FLAG = "-Dintrospection=true"
+GI_DISABLE_FLAG = "-Dintrospection=false"
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
'${GI_DISABLE_FLAG}', d)} "
@@ -30,8 +30,8 @@ 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] = "dfb5e7474220afa3f4ca7e45af9f3a11"
-SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc"
+SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454"
+SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b"
BBCLASSEXTEND = "native"
--
2.17.1
next prev parent reply other threads:[~2018-12-20 8:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 8:43 [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2 Anuj Mittal
2018-12-20 8:43 ` [PATCH 2/5] libjpeg-turbo: upgrade 2.0.0 -> 2.0.1 Anuj Mittal
2018-12-20 8:43 ` Anuj Mittal [this message]
2018-12-20 8:43 ` [PATCH 4/5] at-spi2-atk: upgrade 2.26.2 -> 2.30.0 Anuj Mittal
2018-12-20 8:43 ` [PATCH 5/5] libpcap: upgrade 1.8.1 -> 1.9.0 Anuj Mittal
2018-12-20 9:28 ` [PATCH v2] " Anuj Mittal
2019-01-08 7:45 ` Mittal, Anuj
2019-01-08 10:30 ` Burton, Ross
2018-12-20 9:03 ` ✗ patchtest: failure for "libsolv: upgrade 0.7.1 -> 0.7...." and 4 more Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181220084336.7294-3-anuj.mittal@intel.com \
--to=anuj.mittal@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox