[meta-oe][PATCH 074/109] glade: upgrade 3.36.0 -> 3.40.0
Khem Raj <[email protected]>
| Newsgroups | org.openembedded.lists.openembedded-devel |
|---|---|
| Message-ID | <[email protected]> |
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 <[email protected]>
---
.../{glade_3.36.0.bb => glade_3.40.0.bb} | 32 +++++++++++--------
1 file changed, 18 insertions(+), 14 deletions(-)
rename meta-oe/recipes-devtools/glade/{glade_3.36.0.bb => glade_3.40.0.bb} (42%)
diff --git a/meta-oe/recipes-devtools/glade/glade_3.36.0.bb b/meta-oe/recipes-devtools/glade/glade_3.40.0.bb
similarity index 42%
rename from meta-oe/recipes-devtools/glade/glade_3.36.0.bb
rename to meta-oe/recipes-devtools/glade/glade_3.40.0.bb
index 57f0fe0aa8..140b6637a6 100644
--- a/meta-oe/recipes-devtools/glade/glade_3.36.0.bb
+++ b/meta-oe/recipes-devtools/glade/glade_3.40.0.bb
@@ -8,26 +8,30 @@ 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
+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 = "${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"
-
-
-
+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 \
+"