diff options
author | Markus Volk <f_l_k@t-online.de> | 2023-01-07 04:50:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-12 23:08:58 +0000 |
commit | d2410b591f3feb5264747b25ef0793516161d087 (patch) | |
tree | 390d0c174010a7a28514e90beaafccbfe7439223 /meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | |
parent | 755ee95a45a4a5e3f880b6143e755ec699194416 (diff) | |
download | poky-d2410b591f3feb5264747b25ef0793516161d087.tar.gz |
gcr3: update 3.40.0 -> 3.41.1
- remove unneded backport patches
- partly import the patch to fix ssh_agent option from gcr4 recipe
- convert from gtk-doc to gi-docgen
gcr 3.41.1:
- meson: Fix unknown kw argument in gnome.generate_gir [GNOME/gcr!68]
- gcr: Add G_SPAWN_CLOEXEC_PIPES flag to all the g_spawn commands
- docs: Port from gtk-doc to gi-docgen [GNOME/gcr!76]
- Unbreak build without systemd [GNOME/gcr!75]
- Several CI fixes
- Updated translations
gcr 3.41.0:
- Port ssh-agent from gnome-keyring [GNOME/gcr!67]
- build: Fix parallel build failure due to missing marshal dependency [GNOME/gcr!68]
- Fix warnings by dropping `volatile` for g_once_init_inter locations [GNOME/gcr!69]
- tests: More robust against GTask unref race condition [GNOME/gcr!72,GNOME/gcr#84]
- Updated translations
(From OE-Core rev: 9d66a3e9b9908592050ad706a950d76b6499a49e)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch')
-rw-r--r-- | meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch deleted file mode 100644 index ae4e2ac1eb..0000000000 --- a/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jakub Jirutka <jakub@jirutka.cz> | ||
3 | Date: Wed, 12 Jan 2022 00:24:20 +0100 | ||
4 | Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir | ||
5 | |||
6 | This argument has been removed in Meson 0.61.0: | ||
7 | |||
8 | gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" | ||
9 | |||
10 | https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: | ||
11 | |||
12 | > The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. | ||
13 | |||
14 | Fixes #89 | ||
15 | Upstream-Status: Backport | ||
16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
17 | --- | ||
18 | gck/meson.build | 1 - | ||
19 | gcr/meson.build | 1 - | ||
20 | ui/meson.build | 1 - | ||
21 | 3 files changed, 3 deletions(-) | ||
22 | |||
23 | diff --git a/gck/meson.build b/gck/meson.build | ||
24 | index 756b486..a21a1e9 100644 | ||
25 | --- a/gck/meson.build | ||
26 | +++ b/gck/meson.build | ||
27 | @@ -131,7 +131,6 @@ if get_option('introspection') | ||
28 | sources: gck_gir_sources, | ||
29 | namespace: 'Gck', | ||
30 | nsversion: '@0@'.format(gck_major_version), | ||
31 | - packages: gck_deps, | ||
32 | export_packages: 'gck-@0@'.format(gck_major_version), | ||
33 | includes: [ 'GObject-2.0', 'Gio-2.0' ], | ||
34 | header: 'gck/gck.h', | ||
35 | diff --git a/gcr/meson.build b/gcr/meson.build | ||
36 | index 2233a44..c83641b 100644 | ||
37 | --- a/gcr/meson.build | ||
38 | +++ b/gcr/meson.build | ||
39 | @@ -190,7 +190,6 @@ if get_option('introspection') | ||
40 | sources: [ gcr_base_public_sources, gcr_base_headers ], | ||
41 | namespace: 'Gcr', | ||
42 | nsversion: '@0@'.format(gcr_major_version), | ||
43 | - packages: gcr_base_deps, | ||
44 | export_packages: 'gcr-base-@0@'.format(gcr_major_version), | ||
45 | includes: [ | ||
46 | 'GObject-2.0', | ||
47 | diff --git a/ui/meson.build b/ui/meson.build | ||
48 | index e656ea2..32ee057 100644 | ||
49 | --- a/ui/meson.build | ||
50 | +++ b/ui/meson.build | ||
51 | @@ -152,7 +152,6 @@ if get_option('introspection') | ||
52 | export_packages: 'gcr-ui-@0@'.format(gcr_major_version), | ||
53 | identifier_prefix: 'Gcr', | ||
54 | symbol_prefix: 'gcr', | ||
55 | - packages: gcr_ui_deps, | ||
56 | includes: [ | ||
57 | 'GObject-2.0', | ||
58 | 'Gio-2.0', | ||
59 | -- | ||
60 | GitLab | ||
61 | |||