* [OE-core] [PATCH ] adwaita-icon-theme: upgrade 41.0 -> 42.0
@ 2022-03-22 10:29 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] bluez5: upgrade 5.63 -> 5.64 Wang Mingyu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Wang Mingyu @ 2022-03-22 10:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Upgrade Helper
From: Upgrade Helper <uh@not.set>
0001-Don-t-use-AC_CANONICAL_HOST.patch
refreshed for version 42.0
0001-Run-installation-commands-as-shell-jobs.patch
removed since it's included in 42.o
---
.../0001-Don-t-use-AC_CANONICAL_HOST.patch | 6 +-
...-installation-commands-as-shell-jobs.patch | 84 -------------------
...eme_41.0.bb => adwaita-icon-theme_42.0.bb} | 7 +-
3 files changed, 5 insertions(+), 92 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_41.0.bb => adwaita-icon-theme_42.0.bb} (87%)
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
index 5afba3c644..32f98e049b 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
@@ -1,4 +1,4 @@
-From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001
+From 15ffd817b3e334dc7c0508761c7ef417d76379c5 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 30 May 2017 14:55:49 +0300
Subject: [PATCH] Don't use AC_CANONICAL_HOST
@@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index f2659a5..1e8b016 100644
+index 040975e..5f7b53a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,6 @@ AC_PREREQ(2.53)
- AC_INIT([adwaita-icon-theme], [41.0],
+ AC_INIT([adwaita-icon-theme], [42.0],
[http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
-AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
deleted file mode 100644
index a1d39cf558..0000000000
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 13 Jun 2017 18:10:06 +0300
-Subject: [PATCH] Run installation commands as shell jobs
-
-This greatly speeds up installation time on multi-core systems.
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- src/fullcolor/Makefile.am | 5 +++--
- src/spinner/Makefile.am | 7 ++++---
- src/symbolic/Makefile.am | 11 ++++++-----
- 3 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
-index d73529b..b7d0808 100644
---- a/src/fullcolor/Makefile.am
-+++ b/src/fullcolor/Makefile.am
-@@ -9,9 +9,10 @@ install-data-local:
- for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \
- context="`dirname $$file`"; \
- $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
-- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
-+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
- done; \
-- done;
-+ done; \
-+ wait
-
- ## FIXME we should add a way to remove links generated by icon mapping
- uninstall-local:
-diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
-index c14caf6..322dc0d 100644
---- a/src/spinner/Makefile.am
-+++ b/src/spinner/Makefile.am
-@@ -24,13 +24,14 @@ install-data-local:
- for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
- context="`dirname $$file`"; \
- $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
-- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
-+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
- done; \
- for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
- context="`dirname $$file`"; \
- $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
-- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
-- done
-+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \
-+ done; \
-+ wait
-
- uninstall-local:
- for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
-diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
-index 957c0ee..e1f8818 100644
---- a/src/symbolic/Makefile.am
-+++ b/src/symbolic/Makefile.am
-@@ -34,18 +34,19 @@ install-data-local:
- for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
- context="`dirname $$file`"; \
- $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
-- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
-+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
- done; \
-- done
-+ done; \
- for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
- context="`dirname $$file`"; \
- $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
-- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \
-+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \
- for size in $(symbolic_encode_sizes); do \
- $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
-- $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \
-+ $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \
- done \
-- done
-+ done; \
-+ wait
-
- uninstall-local:
- for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
similarity index 87%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
index 46f9f4772c..c4f3b1c999 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
@@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
-SRC_URI += " \
- file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
- file://0001-Run-installation-commands-as-shell-jobs.patch \
- "
+SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch"
-SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba"
+SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0"
DEPENDS += "librsvg-native"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [OE-core] [PATCH] bluez5: upgrade 5.63 -> 5.64
2022-03-22 10:29 [OE-core] [PATCH ] adwaita-icon-theme: upgrade 41.0 -> 42.0 Wang Mingyu
@ 2022-03-22 10:29 ` Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] gnutls: upgrade 3.7.3 -> 3.7.4 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] gobject-introspection: upgrade 1.70.0 -> 1.72.0 Wang Mingyu
2 siblings, 0 replies; 4+ messages in thread
From: Wang Mingyu @ 2022-03-22 10:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Upgrade Helper
From: Upgrade Helper <uh@not.set>
---
.../bluez5/{bluez5_5.63.bb => bluez5_5.64.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bluez5/{bluez5_5.63.bb => bluez5_5.64.bb} (95%)
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.63.bb b/meta/recipes-connectivity/bluez5/bluez5_5.64.bb
similarity index 95%
rename from meta/recipes-connectivity/bluez5/bluez5_5.63.bb
rename to meta/recipes-connectivity/bluez5/bluez5_5.64.bb
index a9ee29135d..4319f9aae8 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.63.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.64.bb
@@ -1,6 +1,6 @@
require bluez5.inc
-SRC_URI[sha256sum] = "9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76"
+SRC_URI[sha256sum] = "ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34"
# These issues have kernel fixes rather than bluez fixes so exclude here
CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [OE-core] [PATCH] gnutls: upgrade 3.7.3 -> 3.7.4
2022-03-22 10:29 [OE-core] [PATCH ] adwaita-icon-theme: upgrade 41.0 -> 42.0 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] bluez5: upgrade 5.63 -> 5.64 Wang Mingyu
@ 2022-03-22 10:29 ` Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] gobject-introspection: upgrade 1.70.0 -> 1.72.0 Wang Mingyu
2 siblings, 0 replies; 4+ messages in thread
From: Wang Mingyu @ 2022-03-22 10:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Upgrade Helper
From: Upgrade Helper <uh@not.set>
---
.../recipes-support/gnutls/{gnutls_3.7.3.bb => gnutls_3.7.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/gnutls/{gnutls_3.7.3.bb => gnutls_3.7.4.bb} (96%)
diff --git a/meta/recipes-support/gnutls/gnutls_3.7.3.bb b/meta/recipes-support/gnutls/gnutls_3.7.4.bb
similarity index 96%
rename from meta/recipes-support/gnutls/gnutls_3.7.3.bb
rename to meta/recipes-support/gnutls/gnutls_3.7.4.bb
index ebabac1bd0..b34eb7f5f0 100644
--- a/meta/recipes-support/gnutls/gnutls_3.7.3.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.7.4.bb
@@ -23,7 +23,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
file://arm_eabi.patch \
"
-SRC_URI[sha256sum] = "fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a"
+SRC_URI[sha256sum] = "e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f"
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [OE-core] [PATCH] gobject-introspection: upgrade 1.70.0 -> 1.72.0
2022-03-22 10:29 [OE-core] [PATCH ] adwaita-icon-theme: upgrade 41.0 -> 42.0 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] bluez5: upgrade 5.63 -> 5.64 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] gnutls: upgrade 3.7.3 -> 3.7.4 Wang Mingyu
@ 2022-03-22 10:29 ` Wang Mingyu
2 siblings, 0 replies; 4+ messages in thread
From: Wang Mingyu @ 2022-03-22 10:29 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 9394 bytes --]
0001-build-Avoid-the-doctemplates-hack.patch
removed since it's included in 1.72.0
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
...01-build-Avoid-the-doctemplates-hack.patch | 219 ------------------
...0.0.bb => gobject-introspection_1.72.0.bb} | 6 +-
2 files changed, 2 insertions(+), 223 deletions(-)
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-build-Avoid-the-doctemplates-hack.patch
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.70.0.bb => gobject-introspection_1.72.0.bb} (97%)
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-build-Avoid-the-doctemplates-hack.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-build-Avoid-the-doctemplates-hack.patch
deleted file mode 100644
index b7d31ccfb0..0000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-build-Avoid-the-doctemplates-hack.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Tue, 11 Jan 2022 15:51:10 +0000
-Subject: [PATCH] build: Avoid the doctemplates hack
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The hack that copies the doctemplates directory into the build
-directory has stopped working with newer versions of Meson; while it's
-possible to copy files, custom_target() cannot depend on a directory.
-Additionally, the dependency has always been broken.
-
-Instead, we enumerate the template files—after all, it's not like they
-change a lot—and then we list them as dependencies for the test targets.
-
-Fixes: #414
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- giscanner/doctemplates/devdocs/meson.build | 19 +++++++
- giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++
- giscanner/meson.build | 14 ++---
- tests/scanner/meson.build | 24 +++++----
- 4 files changed, 98 insertions(+), 22 deletions(-)
- create mode 100644 giscanner/doctemplates/devdocs/meson.build
- create mode 100644 giscanner/doctemplates/mallard/meson.build
-
-diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build
-new file mode 100644
-index 00000000..2037182a
---- /dev/null
-+++ b/giscanner/doctemplates/devdocs/meson.build
-@@ -0,0 +1,19 @@
-+doc_templates += files([
-+ 'Gjs/_doc.tmpl',
-+ 'Gjs/_index.tmpl',
-+ 'Gjs/_method.tmpl',
-+ 'Gjs/_methods.tmpl',
-+ 'Gjs/_properties.tmpl',
-+ 'Gjs/_signals.tmpl',
-+ 'Gjs/_staticmethods.tmpl',
-+ 'Gjs/_vfuncs.tmpl',
-+ 'Gjs/base.tmpl',
-+ 'Gjs/callback.tmpl',
-+ 'Gjs/class.tmpl',
-+ 'Gjs/default.tmpl',
-+ 'Gjs/enum.tmpl',
-+ 'Gjs/function.tmpl',
-+ 'Gjs/interface.tmpl',
-+ 'Gjs/method.tmpl',
-+ 'Gjs/namespace.tmpl',
-+])
-diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build
-new file mode 100644
-index 00000000..5fe4e2af
---- /dev/null
-+++ b/giscanner/doctemplates/mallard/meson.build
-@@ -0,0 +1,63 @@
-+base_templates = files([
-+ 'base.tmpl',
-+ 'class.tmpl',
-+ 'namespace.tmpl',
-+])
-+
-+c_templates = files([
-+ 'C/callback.tmpl',
-+ 'C/class.tmpl',
-+ 'C/constructor.tmpl',
-+ 'C/default.tmpl',
-+ 'C/enum.tmpl',
-+ 'C/field.tmpl',
-+ 'C/function.tmpl',
-+ 'C/interface.tmpl',
-+ 'C/method.tmpl',
-+ 'C/namespace.tmpl',
-+ 'C/property.tmpl',
-+ 'C/record.tmpl',
-+ 'C/signal.tmpl',
-+ 'C/vfunc.tmpl',
-+])
-+
-+gjs_templates = files([
-+ 'Gjs/callback.tmpl',
-+ 'Gjs/class.tmpl',
-+ 'Gjs/constructor.tmpl',
-+ 'Gjs/default.tmpl',
-+ 'Gjs/enum.tmpl',
-+ 'Gjs/field.tmpl',
-+ 'Gjs/function.tmpl',
-+ 'Gjs/interface.tmpl',
-+ 'Gjs/method.tmpl',
-+ 'Gjs/namespace.tmpl',
-+ 'Gjs/property.tmpl',
-+ 'Gjs/record.tmpl',
-+ 'Gjs/signal.tmpl',
-+ 'Gjs/vfunc.tmpl',
-+])
-+
-+py_templates = files([
-+ 'Python/callback.tmpl',
-+ 'Python/class.tmpl',
-+ 'Python/constructor.tmpl',
-+ 'Python/default.tmpl',
-+ 'Python/enum.tmpl',
-+ 'Python/field.tmpl',
-+ 'Python/function.tmpl',
-+ 'Python/interface.tmpl',
-+ 'Python/method.tmpl',
-+ 'Python/namespace.tmpl',
-+ 'Python/property.tmpl',
-+ 'Python/record.tmpl',
-+ 'Python/signal.tmpl',
-+ 'Python/vfunc.tmpl',
-+])
-+
-+doc_templates += [
-+ base_templates,
-+ c_templates,
-+ gjs_templates,
-+ py_templates,
-+]
-diff --git a/giscanner/meson.build b/giscanner/meson.build
-index 41edcd44..3d7dc678 100644
---- a/giscanner/meson.build
-+++ b/giscanner/meson.build
-@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c',
-
- install_subdir('doctemplates', install_dir: giscannerdir)
-
--# XXX: this doesn't track the input, but there is nothing to copy many files
--# in meson.
--doc_templates = custom_target('copy-templates',
-- input : 'doctemplates',
-- output : 'doctemplates',
-- command : [
-- python, '-c',
-- 'import sys, shutil;' +
-- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
-- 'shutil.copytree(sys.argv[1], sys.argv[2])',
-- '@INPUT@', '@OUTPUT@'])
-+doc_templates = []
-+subdir('doctemplates/devdocs')
-+subdir('doctemplates/mallard')
-
- flex = find_program('flex', 'win_flex')
- bison = find_program('bison', 'win_bison')
-diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
-index 5176b957..b81b3fd5 100644
---- a/tests/scanner/meson.build
-+++ b/tests/scanner/meson.build
-@@ -525,19 +525,26 @@ foreach gir : test_girs
- endforeach
-
- if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
-+ doctool_env = environment()
-+ doctool_env.set('srcdir', meson.current_source_dir())
-+ doctool_env.set('builddir', meson.current_build_dir())
-+
- foreach language : ['C', 'Python', 'Gjs']
- regress_docs = custom_target(
- 'generate-docs-' + language,
- input: regress_gir,
-- depends: [doc_templates],
-+ depend_files: doc_templates,
- build_by_default: not cairo_deps_found,
-+ env: doctool_env,
- output: 'Regress-1.0-' + language,
- command: [
- python, girdoctool,
- '--add-include-path=' + join_paths(build_root, 'gir'),
- '--add-include-path=' + meson.current_build_dir(),
- '--language', language,
-- '@INPUT@', '-o', '@OUTPUT@'],
-+ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
-+ '@INPUT@', '-o', '@OUTPUT@',
-+ ],
- )
-
- if cairo_deps_found
-@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
- python,
- args: [gi_tester, 'Regress-1.0-' + language],
- depends: [regress_docs],
-- env: [
-- 'srcdir=' + meson.current_source_dir(),
-- 'builddir=' + meson.current_build_dir(),
-- ],
-+ env: doctool_env,
- )
- endif
- endforeach
-@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
- regress_sections = custom_target(
- 'generate-docs-sections',
- input: regress_gir,
-- depends: [doc_templates],
-+ depend_files: [doc_templates],
- build_by_default: not cairo_deps_found,
- output: 'Regress-1.0-sections.txt',
-+ env: doctool_env,
- command: [
- python, girdoctool,
- '--add-include-path=' + join_paths(build_root, 'gir'),
-@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
- python,
- args: [gi_tester, 'Regress-1.0-sections.txt'],
- depends: [regress_sections],
-- env: [
-- 'srcdir=' + meson.current_source_dir(),
-- 'builddir=' + meson.current_build_dir(),
-- ],
-+ env: doctool_env,
- )
- endif
- endif
---
-2.20.1
-
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb
similarity index 97%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb
index fcda10bd33..39475daf2e 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb
@@ -13,11 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27 \
"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
- file://0001-build-Avoid-the-doctemplates-hack.patch \
- "
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a"
+SRC_URI[sha256sum] = "02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc"
SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-22 10:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-22 10:29 [OE-core] [PATCH ] adwaita-icon-theme: upgrade 41.0 -> 42.0 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] bluez5: upgrade 5.63 -> 5.64 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] gnutls: upgrade 3.7.3 -> 3.7.4 Wang Mingyu
2022-03-22 10:29 ` [OE-core] [PATCH] gobject-introspection: upgrade 1.70.0 -> 1.72.0 Wang Mingyu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.