From 4da46a6f43af1a02dcd8204d61016f2d20022a6f Mon Sep 17 00:00:00 2001
From: Khem Raj <khem.raj@oss.qualcomm.com>
Date: Wed, 5 Aug 2026 01:17:01 +0000
Subject: [PATCH] glade: upgrade 3.36.0 -> 3.40.0

Minor release. Two recipe-side fixes needed for the new meson.build:
3.40.0 renamed the "docs" option to "gtk_doc" and dropped "introspection"
entirely (introspection is no longer optional), so gtk-doc.bbclass and
gobject-introspection.bbclass are repointed via GTKDOC_MESON_OPTION and
GIR_MESON_OPTION rather than guessing at PACKAGECONFIG. 3.40.0 also ships
new /usr/share/help (translated user docs) and /usr/share/gettext/its
(catalog ITS rules) content that the old FILES:${PN} didn't claim, added.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../recipes-devtools/glade/glade_3.36.0.bb    | 33 -----------------
 .../recipes-devtools/glade/glade_3.40.0.bb    | 37 +++++++++++++++++++
 2 files changed, 37 insertions(+), 33 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/glade/glade_3.36.0.bb
 create mode 100644 meta-oe/recipes-devtools/glade/glade_3.40.0.bb

diff --git a/meta-oe/recipes-devtools/glade/glade_3.36.0.bb b/meta-oe/recipes-devtools/glade/glade_3.36.0.bb
deleted file mode 100644
index 57f0fe0aa8..0000000000
--- a/meta-oe/recipes-devtools/glade/glade_3.36.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Glade - A User Interface Designer"
-HOMEPAGE = "https://glade.gnome.org"
-LICENSE = "GPL-2.0-only AND LGPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
-                    file://COPYING.GPL;md5=4641e94ec96f98fabc56ff9cc48be14b \
-                    file://COPYING.LGPL;md5=81227099add6b483afd7b1d4fc4e93b7"
-DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native itstool-native \
-           gnome-common-native \
-           autoconf-archive-native \
-"
-GNOMEBASEBUILDCLASS = "autotools"
-inherit features_check autotools gettext pkgconfig gnomebase gobject-introspection mime-xdg gtk-doc
-
-# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
-# cairo would at least needed to be built with xlib.
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-
-SRC_URI = "${GNOME_MIRROR}/glade/3.36/glade-${PV}.tar.xz \
-           file://remove-yelp-help-rules-var.patch \
-           file://CVE-2020-36774.patch \
-          "
-SRC_URI[sha256sum] = "19b546b527cc46213ccfc8022d49ec57e618fe2caa9aa51db2d2862233ea6f08"
-
-EXTRA_OECONF += "--disable-man-pages"
-
-FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so"
-
-
-
-
-
-
-
diff --git a/meta-oe/recipes-devtools/glade/glade_3.40.0.bb b/meta-oe/recipes-devtools/glade/glade_3.40.0.bb
new file mode 100644
index 0000000000..140b6637a6
--- /dev/null
+++ b/meta-oe/recipes-devtools/glade/glade_3.40.0.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Glade - A User Interface Designer"
+HOMEPAGE = "https://glade.gnome.org"
+LICENSE = "GPL-2.0-only AND LGPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
+                    file://COPYING.GPL;md5=4641e94ec96f98fabc56ff9cc48be14b \
+                    file://COPYING.LGPL;md5=81227099add6b483afd7b1d4fc4e93b7"
+DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native itstool-native \
+           gnome-common-native \
+           autoconf-archive-native \
+"
+inherit features_check gettext pkgconfig gnomebase gobject-introspection mime-xdg gtk-doc
+
+# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
+# cairo would at least needed to be built with xlib.
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+SRC_URI[archive.sha256sum] = "31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c"
+
+# Man pages are generated with xsltproc pulling the docbook stylesheets over
+# the network, so keep them disabled like the autotools build did.
+EXTRA_OEMESON += "-Dman=false"
+
+# 3.40.0 renamed the docs meson option to "gtk_doc" and dropped the
+# "introspection" option entirely (introspection is no longer optional), so
+# repoint gtk-doc.bbclass at the new name and tell gobject-introspection.bbclass
+# not to inject a -Dintrospection flag that no longer exists.
+GTKDOC_MESON_OPTION = "gtk_doc"
+GIR_MESON_OPTION = ""
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gjs] = "-Dgjs=enabled,-Dgjs=disabled,gjs"
+PACKAGECONFIG[python] = "-Dpython=enabled,-Dpython=disabled,python3-pygobject"
+PACKAGECONFIG[webkit] = "-Dwebkit2gtk=enabled,-Dwebkit2gtk=disabled,webkitgtk3"
+
+FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so \
+                ${datadir}/gettext ${datadir}/help \
+"