3 files changed, 18 insertions, 5 deletions

diff --git a/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
new file mode 100644
index 0000000000..97a5592f94
--- /dev/null
+++ b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
@@ -0,0 +1,13 @@
+SUMMARY = "libglib-testing provides test harnesses and mock classes to complement GLib classes"
+HOMEPAGE = "https://gitlab.gnome.org/pwithnall/libglib-testing"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "git://gitlab.gnome.org/pwithnall/libglib-testing.git;protocol=https;branch=main"
+
+PV = "0.1.1"
+SRCREV = "e326f73a7139c5e54fcf926896ae6e4cc899a1a7"
+
+inherit  meson pkgconfig
+
+DEPENDS = "glib-2.0 gtk-doc-native libxslt-native docbook-xsl-stylesheets-native python3-pygments-native"
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
index f40a8144d7..48a1a2a624 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
@@ -12,9 +12,9 @@ inherit gnomebase
 
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
-SRC_URI[archive.sha256sum] = "5d2e872564996f02a06d8bbac3677e7c394af8b00dd1526aebd47af842a3ef50"
+SRC_URI[archive.sha256sum] = "539b0a29e15a96676c4f0594541250566c5ca44da5d4d87a3732fa2d07909e4a"
 
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/${BPN}/include/ ${libdir}/${BPN}/proc/ ${libdir}/giomm-2.68/include/"
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb
index c78dd55ca6..7c7a3fafb7 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb
@@ -12,7 +12,7 @@ inherit gnomebase
 
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
-SRC_URI[archive.sha256sum] = "b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d"
+SRC_URI[archive.sha256sum] = "fe02c1e5f5825940d82b56b6ec31a12c06c05c1583cfe62f934d0763e1e542b3"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
@@ -24,7 +24,7 @@ EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross -Dmaintainer-mode=fa
 do_write_config:append() {
     cat >${WORKDIR}/meson-${PN}.cross <<EOF
 [binaries]
-m4 = '${bindir}/m4'
-perl = '${bindir}/perl'
+m4 = '${bindir_native}/m4'
+perl = '${bindir_native}/perl'
 EOF
 }