From b0ae3e98f92b401db087f2468bc53b6615667fa2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Nov 2026 22:42:45 -0800 Subject: [PATCH] glade: Remove unused patches These were dropped from SRC_URI in caf1d45b40 (glade: upgrade 3.36.0 -> 3.40.0) but the files were left behind: CVE-2020-36774.patch remove-yelp-help-rules-var.patch AI-Generated: Uses Claude Code Signed-off-by: Khem Raj --- .../glade/glade/CVE-2020-36774.patch | 54 ------------------- .../glade/remove-yelp-help-rules-var.patch | 39 -------------- 2 files changed, 93 deletions(-) delete mode 100644 meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch delete mode 100644 meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch diff --git a/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch b/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch deleted file mode 100644 index ae44862ccf..0000000000 --- a/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8f1ed202ad21c787ec406f531905b4cda64fb13c Mon Sep 17 00:00:00 2001 -From: Juan Pablo Ugarte -Date: Fri, 2 Oct 2020 16:08:23 -0300 -Subject: [PATCH] GladeGtkBox: fix glade_gtk_box_post_create - -Some widgets with contruct properties like GtkMessageDialog get -rebuilt right after they are created on project loading so we need -to check glade_project_is_loading() intead of GLADE_CREATE_LOAD -and use the object ad the connect data to make sure it gets disconected -if it was the object being rebuilt - -Fix issue #479 "Glade 3.36.0 segfaults when opening a file" - -CVE: CVE-2020-36774 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glade/-/commit/7acdd3c6f6934f47b8974ebc2190a59ea5d2ed17] - -Signed-off-by: Peng Zhang ---- - plugins/gtk+/glade-gtk-box.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/plugins/gtk+/glade-gtk-box.c b/plugins/gtk+/glade-gtk-box.c -index 1153c957..c995524e 100644 ---- a/plugins/gtk+/glade-gtk-box.c -+++ b/plugins/gtk+/glade-gtk-box.c -@@ -57,9 +57,9 @@ glade_gtk_box_create_editable (GladeWidgetAdaptor *adaptor, - } - - static void --glade_gtk_box_parse_finished (GladeProject *project, GladeWidget *gbox) -+glade_gtk_box_parse_finished (GladeProject *project, GObject *box) - { -- GObject *box = glade_widget_get_object (gbox); -+ GladeWidget *gbox = glade_widget_get_from_gobject (box); - - glade_widget_property_set (gbox, "use-center-child", - gtk_box_get_center_widget (GTK_BOX (box)) != NULL); -@@ -86,11 +86,11 @@ glade_gtk_box_post_create (GladeWidgetAdaptor *adaptor, - g_signal_connect (G_OBJECT (gwidget), "configure-end", - G_CALLBACK (glade_gtk_box_configure_end), container); - -- if (reason == GLADE_CREATE_LOAD) -+ if (glade_project_is_loading (project)) - { - g_signal_connect_object (project, "parse-finished", - G_CALLBACK (glade_gtk_box_parse_finished), -- gwidget, 0); -+ container, 0); - } - } - --- -2.34.1 - diff --git a/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch b/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch deleted file mode 100644 index 78a8719f23..0000000000 --- a/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 42efc94c11d510b41d8cf3407e1c3900eb52b600 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 4 Jun 2015 16:28:02 +0800 -Subject: [PATCH] Remove unused variable (YELP_HELP_RULES) - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - help/Makefile.am | 2 -- - help/Makefile.in | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/help/Makefile.am b/help/Makefile.am -index 50c0e84..5c5d2e9 100644 ---- a/help/Makefile.am -+++ b/help/Makefile.am -@@ -1,5 +1,3 @@ --@YELP_HELP_RULES@ -- - HELP_ID = glade - - HELP_FILES = \ -diff --git a/help/Makefile.in b/help/Makefile.in -index 6978ea5..e1c7d3b 100644 ---- a/help/Makefile.in -+++ b/help/Makefile.in -@@ -521,8 +521,6 @@ uninstall-am: - - .PRECIOUS: Makefile - --@YELP_HELP_RULES@ -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: --- -1.9.1 -