From patchwork Sun Mar 16 07:26:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 59138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBC28C282DE for ; Sun, 16 Mar 2025 07:25:39 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web11.25157.1742109930647818962 for ; Sun, 16 Mar 2025 00:25:31 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd70.aul.t-online.de (fwd70.aul.t-online.de [10.223.144.96]) by mailout04.t-online.de (Postfix) with SMTP id C472D494 for ; Sun, 16 Mar 2025 08:25:28 +0100 (CET) Received: from intel-corei7-64.fritz.box ([79.219.236.70]) by fwd70.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ttiNE-3rme810; Sun, 16 Mar 2025 08:25:28 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Subject: [oe-core][PATCH 1/2] glib-2.0: fix build issue with gobject-introspection Date: Sun, 16 Mar 2025 08:26:01 +0100 Message-ID: <20250316072611.2179431-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1742109928-47FFD47B-B8C5487A/0/0 CLEAN NORMAL X-TOI-MSGID: e3d54f94-d612-4fe5-9b96-2197167cf66d List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 16 Mar 2025 07:25:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212986 - Add backport patch to fix a build issue with gobject-introspection >= 1.83.2 --- ...664e6f1a29e0d5f301979f6d168b08435a61.patch | 75 +++++++++++++++++++ meta/recipes-core/glib-2.0/glib.inc | 1 + 2 files changed, 76 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch diff --git a/meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch b/meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch new file mode 100644 index 0000000000..28bce02dc3 --- /dev/null +++ b/meta/recipes-core/glib-2.0/files/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch @@ -0,0 +1,75 @@ +From aee0664e6f1a29e0d5f301979f6d168b08435a61 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Mon, 10 Mar 2025 15:21:15 +0000 +Subject: [PATCH] girparser: Ignore new doc:format element in GIR files +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As of gobject-introspection 1.83.2, a new `` +element is supported (as a child of ``) in GIR files. + +For the moment, this information isn’t needed in libgirepository — but +the GIR parser does have to know about the element in order to not throw +an error claiming it’s invalid. + +This is a slightly tweaked version of the code added to +gobject-introspection.git in commit +9544cd6c962fab2c3203898779948309833e2439 by Corentin Noël +, reformatted slightly to fit in with +GLib’s style guidelines. + +This is backwards compatible and does not require a new +gobject-introspection version. + +Signed-off-by: Philip Withnall + +Fixes: #3634 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/aee0664e6f1a29e0d5f301979f6d168b08435a61.patch] + +Signed-off-by: Markus Volk +--- + girepository/girparser.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/girepository/girparser.c b/girepository/girparser.c +index 63143718d9..be88d871a4 100644 +--- a/girepository/girparser.c ++++ b/girepository/girparser.c +@@ -107,7 +107,8 @@ typedef enum + STATE_ALIAS, + STATE_TYPE, + STATE_ATTRIBUTE, +- STATE_PASSTHROUGH ++ STATE_PASSTHROUGH, ++ STATE_DOC_FORMAT, /* 35 */ + } ParseState; + + typedef struct _ParseContext ParseContext; +@@ -3159,6 +3160,11 @@ start_element_handler (GMarkupParseContext *context, + state_switch (ctx, STATE_PASSTHROUGH); + goto out; + } ++ else if (strcmp ("doc:format", element_name) == 0) ++ { ++ state_switch (ctx, STATE_DOC_FORMAT); ++ goto out; ++ } + break; + + case 'e': +@@ -3843,6 +3849,10 @@ end_element_handler (GMarkupParseContext *context, + state_switch (ctx, ctx->prev_state); + } + break; ++ case STATE_DOC_FORMAT: ++ if (require_end_element (context, ctx, "doc:format", element_name, error)) ++ state_switch (ctx, STATE_REPOSITORY); ++ break; + + case STATE_PASSTHROUGH: + ctx->unknown_depth -= 1; +-- +GitLab + diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index ee23c5089d..61e1a3ef17 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -229,6 +229,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ file://skip-timeout.patch \ + file://aee0664e6f1a29e0d5f301979f6d168b08435a61.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ From patchwork Sun Mar 16 07:26:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 59139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD40CC28B30 for ; Sun, 16 Mar 2025 07:25:39 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web10.25115.1742109932455737598 for ; Sun, 16 Mar 2025 00:25:32 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd70.aul.t-online.de (fwd70.aul.t-online.de [10.223.144.96]) by mailout04.t-online.de (Postfix) with SMTP id D1DC64DE for ; Sun, 16 Mar 2025 08:25:30 +0100 (CET) Received: from intel-corei7-64.fritz.box ([79.219.236.70]) by fwd70.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ttiNE-3rme820; Sun, 16 Mar 2025 08:25:28 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Subject: [oe-core][PATCH 2/2] libadwaita: update 1.6.4 -> 1.7.0 Date: Sun, 16 Mar 2025 08:26:02 +0100 Message-ID: <20250316072611.2179431-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316072611.2179431-1-f_l_k@t-online.de> References: <20250316072611.2179431-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1742109928-1A7FA47B-1C7B4CB3/0/0 CLEAN NORMAL X-TOI-MSGID: c3cc052b-dc82-42c5-90df-b909ed71dcf4 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 16 Mar 2025 07:25:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212987 - add backport patch to fix introspection ============= Version 1.7.0 ============= - Build - Specify --doc-format for GIR data - AdwDialog - Fix :current-breakpoint notifications - AdwPreferencesDialog/Window - Exclude hidden pages from search too - Fix the search filter expression - Translation updates - Belarusian - Catalan - Danish - Filipino - French - Hungarian - Nepali - Norwegian Bokmål - Spanish - Swedish ============== Version 1.7.rc ============== - Fix build failures on win32 - Bump minimum GTK and GLib versions - Adaptive preview - Fix screenshotting GtkGraphicsOffload - Add a missing translators comment - AdwAboutDialog/Window - Use system monospace font for `` in release notes - AdwDialog - Fix parent window shortcuts propagating into dialogs - AdwPreferencesDialog - Hide pages with visible=false - AdwStyleManager - Document how to handle font names - Stylesheet - Fix popovers in non-composited environments - Fix GtkPaned drag area - Translation updates - Basque - Brazilian Portuguese - Bulgarian - Catalan - Chinese (China) - Czech - Finnish - Galician - Georgian - Hebrew - Indonesian - Korean - Lithuanian - Norwegian Bokmål - Occitan - Persian - Polish - Portuguese - Turkish - Ukrainian ============== Version 1.7.rc ============== - Fix build failures on win32 - Bump minimum GTK and GLib versions - Adaptive preview - Fix screenshotting GtkGraphicsOffload - Add a missing translators comment - AdwAboutDialog/Window - Use system monospace font for `` in release notes - AdwDialog - Fix parent window shortcuts propagating into dialogs - AdwPreferencesDialog - Hide pages with visible=false - AdwStyleManager - Document how to handle font names - Stylesheet - Fix popovers in non-composited environments - Fix GtkPaned drag area - Translation updates - Basque - Brazilian Portuguese - Bulgarian - Catalan - Chinese (China) - Czech - Finnish - Galician - Georgian - Hebrew - Indonesian - Korean - Lithuanian - Norwegian Bokmål - Occitan - Persian - Polish - Portuguese - Turkish - Ukrainian ================ Version 1.7.beta ================ - AdwApplicationWindow, AdwWindow - Add a public property for toggling adaptive preview - Open adaptive preview with Ctrl+Shift+M - AdwBreakpoint - Fix to_string() with locales using comma as decimal separator - AdwComboRow - Fix very short strings not being displayed - AdwDialog - Fix ::closed emission with window-backed dialogs - Fix a focus-related crash - AdwOverlaySplitView, AdwFlap - Remove an unreachable check - AdwPreferencesDialog - Document navigation.pop action - AdwTabBox, AdwTabGrid - Fix scrolling to newly appearing tabs - Fix a copy-paste error - AdwToast - Use a lighter opaque style - Adaptive Preview - Add an outline around the device - Round bezel sizes - Fix bezels with locales using comma as decimal separator - Prevent secondary sidebar style leak into the previewed app - Demo - Allow opening adaptive preview from menu - Inherit page background color when duplicating tabs - Docs - Switch to Adwaita Sans/Mono 11pt for doc screenshots - Inspector - Provide a list of windows instead of a single button for adaptive preview - Stylesheet - Add --document-font-family/size and --monospace-font-family/size - Use --monospace-font-family/size for .monospace - Fix disabled style for raised/suggested/destructive menubuttons in toolbars - Drop GtkSourceView support for textview.inline as it didn't work anyway - Translation updates - Italian - Russian - Slovenian - Turkish ================= Version 1.7.alpha ================= - Add AdwToggleGroup and AdwInlineViewSwitcher - Add AdwWrapBox and AdwWrapLayout - Add adaptive preview in inspector - Use EASE easing for timed animations instead of EASE_OUT_CUBIC - Don't warn when setting child in bin-like widgets to itself - Fix meson syntax in readme - Add doc guidelines to HACKING - Build - Drop pre-built docs and styles - Rename -Dgtk_doc to -Ddocumentation, deprecate the old option - AdwAboutDialog - Add Other Apps section - Fix natural width - AdwAboutWindow - Fix natural width - AdwActionRow - Set accessible role to presentation for the icon - AdwAlertDialog - Fix a crash when setting content-width/height before present() - AdwAvatar - Set accessible role and label - AdwBanner - Start-align the title earlier - Tone down visuals - Add :style to allow to make button suggested - AdwBottomSheet - Add :reveal-bottom-bar - Fix natural height - Fix criticals in dispose in some cases - AdwBreakpointBin - Fix natural size - AdwButtonRow - Set accessible role to presentation for icons - AdwClamp - Fix get/set_unit() version - AdwClampLayout - Fix layout with multiple children - Fix height-for-width measuring - AdwComboRow - Fix a property noficiation - AdwDialog - Fix accessible role critical when using window-backed dialogs - Handle close() before and right after present() - Don't crash when chaining up in vfuncs - AdwEasing - Add EASE, EASE_IN, EASE_OUT and EASE_IN_OUT - AdwExpanderRow - Make suffix spacing match action rows and entry rows - AdwHeaderBar - Ignore split views outside sheets - AdwLengthUnit - Fix pt and sp unit values when gtk-xft-dpi = -1 - AdwMessageDialog - Fix a typo in adw_message_dialog_response() deprecation message - AdwNavigationSplitView - Support :sidebar-position - Stop reporting baseline - AdwNavigationView - Addw :h/vhomogeneous - Add :visible-page-tag - Don't crash when chaining up in vfuncs - AdwOverlaySplitView - Don't allow focusing hidden sidebar - AdwPreferencesPage - Add :banner - AdwStyleManager - Fix initial color scheme value on Windows - AdwTabBar - Only handle middle clicks started and ended on the same tab - Don't select tabs when clicking close or indicator buttons - AdwTabOverview - Darken background color - Only handle middle clicks started and ended on the same thumbnail - AdwToastOverlay - Add dismiss_all() - Add tooltip to the dismiss button - AdwToolbarView - Fix height-for-width measurements - AdwViewSwitcher - Have a minimum height outside header bars - Always focus active toggle when entering focus - AdwViewStack - Add an optional crossfade transition - Rework adjusting child allocation - AdwWindow, AdwApplicationWindow - Fix allocating children - Docs - Indicate and explain out of gamut colors on CSS variables page - Update deprecated meson syntax - Link clamp/layout/scrollable docs between each other - Force GTK_FONT_RENDERING_MANUAL for screenshots - Typo fixes - Stylesheet - Increase border radii of various widgets - Tint gray colors to make them colder - Add hover and active transition to switch, check, radio and slider - Increase scrollbar padding to match the new window radius - Add .dimmed and deprecate .dim-label - Make preferences group .labels style more specific - Translation updates - Belarusian - Catalan - Chinese (China) - Dutch - Hebrew - Russian - Serbian - Slovenian - Thai Signed-off-by: Markus Volk --- ...8222c184f681472d9d9ce2ae443ebd76386e.patch | 38 +++++++++++++++++++ ...ibadwaita_1.6.4.bb => libadwaita_1.7.0.bb} | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch rename meta/recipes-gnome/libadwaita/{libadwaita_1.6.4.bb => libadwaita_1.7.0.bb} (82%) diff --git a/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch b/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch new file mode 100644 index 0000000000..d3a3535013 --- /dev/null +++ b/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch @@ -0,0 +1,38 @@ +From 90d68222c184f681472d9d9ce2ae443ebd76386e Mon Sep 17 00:00:00 2001 +From: Maximiliano Sandoval +Date: Sat, 15 Mar 2025 10:47:31 +0100 +Subject: [PATCH] meson: Check g-i before using --doc-format arg + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libadwaita/-/commit/90d68222c184f681472d9d9ce2ae443ebd76386e.patch] + +Signed-off-by: Markus Volk +--- + src/meson.build | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 90cecc6a1..585fe3aad 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -450,11 +450,17 @@ meson.override_dependency(package_api_name, libadwaita_dep) + + if introspection + ++ gir_dep = dependency('gobject-introspection-1.0') + libadwaita_gir_extra_args = [ + '--quiet', +- '--doc-format=gi-docgen', + '-DADWAITA_COMPILATION', + ] ++ if gir_dep.version().version_compare('>=1.83.2') ++ libadwaita_gir_extra_args += [ ++ '--doc-format=gi-docgen', ++ ] ++ endif ++ + + libadwaita_gir = gnome.generate_gir(libadwaita, + sources: libadwaita_generated_headers + libadwaita_public_headers + libadwaita_public_sources, +-- +GitLab + diff --git a/meta/recipes-gnome/libadwaita/libadwaita_1.6.4.bb b/meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb similarity index 82% rename from meta/recipes-gnome/libadwaita/libadwaita_1.6.4.bb rename to meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb index a8cf642ff0..55985bf7cc 100644 --- a/meta/recipes-gnome/libadwaita/libadwaita_1.6.4.bb +++ b/meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb @@ -11,7 +11,8 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gi-docgen vala features_check -SRC_URI[archive.sha256sum] = "1011a5a93dc3b87e82da19910d7fab01a3b9d7fcb0b09751babb476eedb3d9a3" +SRC_URI[archive.sha256sum] = "58bf99b8a9f8b0171964de0ae741d01d5a09db3662134fa67541c99a8ed7dec0" +SRC_URI += "file://90d68222c184f681472d9d9ce2ae443ebd76386e.patch" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl"