* [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61
@ 2022-01-13 9:46 Adrian Perez de Castro
2022-01-13 17:48 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Perez de Castro @ 2022-01-13 9:46 UTC (permalink / raw)
To: buildroot
Import an upstream patch which removes usage of an invalid keyword that
was being passed to Meson's gnome.generate_gir() function.
This fixes the following autobuilder issues:
http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b
http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
...wn-kw-argument-in-gnome.generate_gir.patch | 62 +++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch
diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch
new file mode 100644
index 0000000000..e672b5e2ac
--- /dev/null
+++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch
@@ -0,0 +1,62 @@
+From 145bea264bed98cd435d8babfdee702c06c0afaa Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH 1/1] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+ gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+Upstream-Status: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b486..a21a1e9 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+ sources: gck_gir_sources,
+ namespace: 'Gck',
+ nsversion: '@0@'.format(gck_major_version),
+- packages: gck_deps,
+ export_packages: 'gck-@0@'.format(gck_major_version),
+ includes: [ 'GObject-2.0', 'Gio-2.0' ],
+ header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 06c3a63..f998336 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -189,7 +189,6 @@ if get_option('introspection')
+ sources: [ gcr_base_public_sources, gcr_base_headers ],
+ namespace: 'Gcr',
+ nsversion: '@0@'.format(gcr_major_version),
+- packages: gcr_base_deps,
+ export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+ includes: [
+ 'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea2..32ee057 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+ export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+ identifier_prefix: 'Gcr',
+ symbol_prefix: 'gcr',
+- packages: gcr_ui_deps,
+ includes: [
+ 'GObject-2.0',
+ 'Gio-2.0',
+--
+2.34.1
+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61
2022-01-13 9:46 [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61 Adrian Perez de Castro
@ 2022-01-13 17:48 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-01-13 17:48 UTC (permalink / raw)
To: Adrian Perez de Castro; +Cc: buildroot
Adrian, All,
On 2022-01-13 11:46 +0200, Adrian Perez de Castro spake thusly:
> Import an upstream patch which removes usage of an invalid keyword that
> was being passed to Meson's gnome.generate_gir() function.
>
> This fixes the following autobuilder issues:
>
> http://autobuild.buildroot.net/results/cdd5c721544d6f07c51be536e414fa474f4b907b
> http://autobuild.buildroot.net/results/8cecd33d7772b19d60f70a097dcb1623bb3ee7de
>
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> ...wn-kw-argument-in-gnome.generate_gir.patch | 62 +++++++++++++++++++
> 1 file changed, 62 insertions(+)
> create mode 100644 package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch
>
> diff --git a/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch
> new file mode 100644
> index 0000000000..e672b5e2ac
> --- /dev/null
> +++ b/package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch
> @@ -0,0 +1,62 @@
> +From 145bea264bed98cd435d8babfdee702c06c0afaa Mon Sep 17 00:00:00 2001
> +From: Jakub Jirutka <jakub@jirutka.cz>
> +Date: Wed, 12 Jan 2022 00:24:20 +0100
> +Subject: [PATCH 1/1] meson: Fix unknown kw argument in gnome.generate_gir
$ make check-package
package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch:4: generate your patches with 'git format-patch -N'
So I've done that, and done a proper backport.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> +This argument has been removed in Meson 0.61.0:
> +
> + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
> +
> +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
> +
> +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
> +
> +Fixes #89
> +
> +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> +Upstream-Status: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
> +---
> + gck/meson.build | 1 -
> + gcr/meson.build | 1 -
> + ui/meson.build | 1 -
> + 3 files changed, 3 deletions(-)
> +
> +diff --git a/gck/meson.build b/gck/meson.build
> +index 756b486..a21a1e9 100644
> +--- a/gck/meson.build
> ++++ b/gck/meson.build
> +@@ -131,7 +131,6 @@ if get_option('introspection')
> + sources: gck_gir_sources,
> + namespace: 'Gck',
> + nsversion: '@0@'.format(gck_major_version),
> +- packages: gck_deps,
> + export_packages: 'gck-@0@'.format(gck_major_version),
> + includes: [ 'GObject-2.0', 'Gio-2.0' ],
> + header: 'gck/gck.h',
> +diff --git a/gcr/meson.build b/gcr/meson.build
> +index 06c3a63..f998336 100644
> +--- a/gcr/meson.build
> ++++ b/gcr/meson.build
> +@@ -189,7 +189,6 @@ if get_option('introspection')
> + sources: [ gcr_base_public_sources, gcr_base_headers ],
> + namespace: 'Gcr',
> + nsversion: '@0@'.format(gcr_major_version),
> +- packages: gcr_base_deps,
> + export_packages: 'gcr-base-@0@'.format(gcr_major_version),
> + includes: [
> + 'GObject-2.0',
> +diff --git a/ui/meson.build b/ui/meson.build
> +index e656ea2..32ee057 100644
> +--- a/ui/meson.build
> ++++ b/ui/meson.build
> +@@ -152,7 +152,6 @@ if get_option('introspection')
> + export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
> + identifier_prefix: 'Gcr',
> + symbol_prefix: 'gcr',
> +- packages: gcr_ui_deps,
> + includes: [
> + 'GObject-2.0',
> + 'Gio-2.0',
> +--
> +2.34.1
> +
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-13 17:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-13 9:46 [Buildroot] [PATCH 1/1] package/gcr: add upstream patch to fix build with meson 0.61 Adrian Perez de Castro
2022-01-13 17:48 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox