diff options
| author | Markus Volk <f_l_k@t-online.de> | 2025-05-05 08:51:51 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-05 17:22:11 +0100 |
| commit | 3e927b6953c5f55a42e0a3938ad951c63447c413 (patch) | |
| tree | 280e170c077e7811be8ab7c5c1a799ae4bae92af | |
| parent | ebf9d387cca2b2037ca65326203a10f77fbf67dc (diff) | |
| download | poky-3e927b6953c5f55a42e0a3938ad951c63447c413.tar.gz | |
glib-2.0: update 2.84.0 -> 2.84.1
- remove backport patch
Overview of changes in GLib 2.84.1, 2025-04-03
==============================================
* Fix test failure when building against gobject-introspection ≥1.83.4 (#3634,
work by Philip Withnall)
* Bugs fixed:
- #3630 2.84.0 build failure on Linux: ../gio/gnetworkmonitornetlink.c:47:10:
fatal error: netlink/netlink_route.h: No such file or directory (Philip
Withnall)
- #3634 test failure with gobject-introspection 1.83.4: warning: element
doc:format from state 3 is unknown, ignoring (Philip Withnall)
- #3636 gio/trash does not handle special characters well
- #3642 `g_cancellable_connect()` documentation incorrect (Marco Trevisan
(Treviño))
- #3643 g_cancellable_connect(): is it safe to unref cancellable from
callback? (Marco Trevisan (Treviño))
- #3649 Crash with some registry key values in GWin32AppInfo (Philip Withnall)
- !4484 Memory sanitizer fixes
- !4489 gobject: Be consistent in using atomic logic to handle the
GParamSpecPool
- !4541 gsettings: Port docs to gi-docgen format, add missing annotations and
make various improvements
- !4544 tests: Don't install runner scripts without installed_tests
- !4545 Update French translation
- !4547 Update Catalan translation
- !4548 Update Turkish translation
- !4551 Updated Danish translation
- !4552 Update Persian translation
- !4553 docs: Document GSignalFlags members added after 2.0
- !4554 Update Indonesian translation
- !4555 tests: Add a test for g_object_freeze_notify() being called too often
- !4557 gfileinfo: Slightly expand docs for
g_file_info_get_attribute_as_string()
- !4558 gi: Dynamically set doc-format
- !4561 tests: Various fixes to create temporary files in /tmp rather than the
build directory
- !4562 gdbusnameowning: Convert docs to gi-docgen linking syntax
- !4563 giounix-private: Fix macro for checking for epoll_create1()
- !4565 Fix LGPL in header
- !4567 gutils: make documentation of g_set_prgname() clearer
- !4568 docs: Add some detail
- !4569 Update Romanian translation
- !4570 gspawn-win32: Fix potential integer overflows in argv handling
- !4571 gvarianttype: Improve docs on type validation
* Translation updates:
- Catalan (Jordi Mas)
- Danish (Ask Hjorth Larsen)
- French (Vincent Chatelain)
- Indonesian (Andika Triwidada)
- Persian (Danial Behzadi)
- Romanian (Antonio Marin)
- Turkish (Sabri Ünal)
(From OE-Core rev: 676b9acbe94f055a351da3bdcfbe457411e1877c)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch | 75 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.84.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.84.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 3 |
4 files changed, 1 insertions, 77 deletions
diff --git a/meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch b/meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch deleted file mode 100644 index 28bce02dc3..0000000000 --- a/meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch +++ /dev/null | |||
| @@ -1,75 +0,0 @@ | |||
| 1 | From aee0664e6f1a29e0d5f301979f6d168b08435a61 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Philip Withnall <pwithnall@gnome.org> | ||
| 3 | Date: Mon, 10 Mar 2025 15:21:15 +0000 | ||
| 4 | Subject: [PATCH] girparser: Ignore new doc:format element in GIR files | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | As of gobject-introspection 1.83.2, a new `<doc:format name="…"/>` | ||
| 10 | element is supported (as a child of `<repository>`) in GIR files. | ||
| 11 | |||
| 12 | For the moment, this information isn’t needed in libgirepository — but | ||
| 13 | the GIR parser does have to know about the element in order to not throw | ||
| 14 | an error claiming it’s invalid. | ||
| 15 | |||
| 16 | This is a slightly tweaked version of the code added to | ||
| 17 | gobject-introspection.git in commit | ||
| 18 | 9544cd6c962fab2c3203898779948309833e2439 by Corentin Noël | ||
| 19 | <corentin.noel@collabora.com>, reformatted slightly to fit in with | ||
| 20 | GLib’s style guidelines. | ||
| 21 | |||
| 22 | This is backwards compatible and does not require a new | ||
| 23 | gobject-introspection version. | ||
| 24 | |||
| 25 | Signed-off-by: Philip Withnall <pwithnall@gnome.org> | ||
| 26 | |||
| 27 | Fixes: #3634 | ||
| 28 | |||
| 29 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch] | ||
| 30 | |||
| 31 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 32 | --- | ||
| 33 | girepository/girparser.c | 12 +++++++++++- | ||
| 34 | 1 file changed, 11 insertions(+), 1 deletion(-) | ||
| 35 | |||
| 36 | diff --git a/girepository/girparser.c b/girepository/girparser.c | ||
| 37 | index 63143718d9..be88d871a4 100644 | ||
| 38 | --- a/girepository/girparser.c | ||
| 39 | +++ b/girepository/girparser.c | ||
| 40 | @@ -107,7 +107,8 @@ typedef enum | ||
| 41 | STATE_ALIAS, | ||
| 42 | STATE_TYPE, | ||
| 43 | STATE_ATTRIBUTE, | ||
| 44 | - STATE_PASSTHROUGH | ||
| 45 | + STATE_PASSTHROUGH, | ||
| 46 | + STATE_DOC_FORMAT, /* 35 */ | ||
| 47 | } ParseState; | ||
| 48 | |||
| 49 | typedef struct _ParseContext ParseContext; | ||
| 50 | @@ -3159,6 +3160,11 @@ start_element_handler (GMarkupParseContext *context, | ||
| 51 | state_switch (ctx, STATE_PASSTHROUGH); | ||
| 52 | goto out; | ||
| 53 | } | ||
| 54 | + else if (strcmp ("doc:format", element_name) == 0) | ||
| 55 | + { | ||
| 56 | + state_switch (ctx, STATE_DOC_FORMAT); | ||
| 57 | + goto out; | ||
| 58 | + } | ||
| 59 | break; | ||
| 60 | |||
| 61 | case 'e': | ||
| 62 | @@ -3843,6 +3849,10 @@ end_element_handler (GMarkupParseContext *context, | ||
| 63 | state_switch (ctx, ctx->prev_state); | ||
| 64 | } | ||
| 65 | break; | ||
| 66 | + case STATE_DOC_FORMAT: | ||
| 67 | + if (require_end_element (context, ctx, "doc:format", element_name, error)) | ||
| 68 | + state_switch (ctx, STATE_REPOSITORY); | ||
| 69 | + break; | ||
| 70 | |||
| 71 | case STATE_PASSTHROUGH: | ||
| 72 | ctx->unknown_depth -= 1; | ||
| 73 | -- | ||
| 74 | GitLab | ||
| 75 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.0.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.1.bb index acec7e9676..acec7e9676 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.1.bb | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.84.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.84.1.bb index ef80cc47cf..ef80cc47cf 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.84.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.84.1.bb | |||
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 2cc48f0a06..d00bfe4c65 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
| @@ -229,13 +229,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
| 229 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 229 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
| 230 | file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ | 230 | file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ |
| 231 | file://skip-timeout.patch \ | 231 | file://skip-timeout.patch \ |
| 232 | file://aee0664e6f1a29e0d5f301979f6d168b08435a61.patch \ | ||
| 233 | " | 232 | " |
| 234 | SRC_URI:append:class-native = " file://relocate-modules.patch \ | 233 | SRC_URI:append:class-native = " file://relocate-modules.patch \ |
| 235 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | 234 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |
| 236 | " | 235 | " |
| 237 | 236 | ||
| 238 | SRC_URI[sha256sum] = "f8823600cb85425e2815cfad82ea20fdaa538482ab74e7293d58b3f64a5aff6a" | 237 | SRC_URI[sha256sum] = "2b4bc2ec49611a5fc35f86aca855f2ed0196e69e53092bab6bb73396bf30789a" |
| 239 | 238 | ||
| 240 | # Find any meson cross files in FILESPATH that are relevant for the current | 239 | # Find any meson cross files in FILESPATH that are relevant for the current |
| 241 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 240 | # build (using siteinfo) and add them to EXTRA_OEMESON. |
