[PATCH 01/28] atkmm: upgrade 2.28.0 -> 2.28.2

[PATCH 01/28] atkmm: upgrade 2.28.0 -> 2.28.2

[Andreas Müller]

atkmm 2.28.2 (stable):

Build:
* Meson build: Use relative paths to untracked/
  (Kjell Ahlstedt) Merge request gtkmm!61 (Mingli Yu)
* atkmmconfig.h.*: Don't dllimport on MinGW
  (Chun-wei Fan) Issue gtkmm#90 (Lukas K.)
* Meson build: Make it possible to use atkmm as a subproject
  (Kjell Ahlstedt)
* Meson build: No implicit_include_directories
  (Kjell Ahlstedt)

atkmm 2.28.1 (stable):

The tarball for 2.28.1 has been created with 'meson dist'.
If you build with Autotools from the tarball, please read the relevant
part of the README file.

Build:
* Improve NMake support
  (Chun-wei Fan)
* Use __declspec(dllexport) when building with Visual Studio
  (Chun-wei Fan) Merge request !3
* Add Meson support
  (Chun-wei Fan, Kjell Ahlstedt) Merge request !8
* doc/reference/: Update for Doxygen >= 1.8.16
  (Kjell Ahlstedt)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-gnome/atk/{atkmm_2.28.0.bb => atkmm_2.28.2.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-oe/recipes-gnome/atk/{atkmm_2.28.0.bb => atkmm_2.28.2.bb} (74%)

diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb b/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb
similarity index 74%
rename from meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb
rename to meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb
index 0e09c3a64..edcc4769a 100644
--- a/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb
+++ b/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb
@@ -11,8 +11,7 @@ inherit features_check gnomebase autotools pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "6194ac577f15567adfa3c923944c6651"
-SRC_URI[archive.sha256sum] = "4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a"
+SRC_URI[archive.sha256sum] = "a0bb49765ceccc293ab2c6735ba100431807d384ffa14c2ebd30e07993fd2fa4"
 
 EXTRA_OECONF = " --disable-documentation "
 
-- 
2.31.1

[PATCH 02/28] atkmm: build with meson

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb b/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb
index edcc4769a..a3e8bbf49 100644
--- a/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb
+++ b/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 DEPENDS = "atk glibmm"
 
-inherit features_check gnomebase autotools pkgconfig
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI[archive.sha256sum] = "a0bb49765ceccc293ab2c6735ba100431807d384ffa14c2ebd30e07993fd2fa4"
 
-EXTRA_OECONF = " --disable-documentation "
+EXTRA_OEMESON = "-Dbuild-documentation=false"
 
 FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
-- 
2.31.1

[PATCH 03/28] dconf: upgrade 0.38.0 -> 0.40.0

[Andreas Müller]

Changes in dconf 0.40.0
=======================

 - common: Add missing G_BEGIN/END_DECLS to allow use of headers from C++
   code (Philip Withnall, !67)

Changes in dconf 0.39.1
=======================

 - build: improve libdconf visible symbols (Inigo Martinez, Daniel Playfair
   Cal, !59)
 - engine: do not emit optimistic change notifications unless the local value
   is different (Daniel Playfair Cal, !2)
 - build: minor fixes to bash completion script (Philip Withnall, !64)
 - service: add a systemd unit for D-Bus activation (Simon McVittie, !63)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/dconf/{dconf_0.38.0.bb => dconf_0.40.0.bb}   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/dconf/{dconf_0.38.0.bb => dconf_0.40.0.bb} (83%)

diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb
similarity index 83%
rename from meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb
rename to meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb
index 162748d30..b1604e8df 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SECTION = "x11/gnome"
 
-SRC_URI[archive.sha256sum] = "45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58"
+SRC_URI[archive.sha256sum] = "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533"
 
 DEPENDS = "dbus glib-2.0 intltool-native"
 
@@ -18,6 +18,7 @@ EXTRA_OEMESON_append_class-native = " -Dbash_completion=false"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
+    ${systemd_user_unitdir} \
     ${libdir}/gio/modules/*.so \
 "
 
-- 
2.31.1

[PATCH 04/28] evolution-data-server: upgrade 3.40.1 -> 3.40.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../evolution-data-server/evolution-data-server.inc           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
index 870a9c0e9..86c7dea44 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
 
 inherit gnomebase upstream-version-is-even
 
-SRC_URI[archive.sha256sum] = "eac75f348aa5defbe9473fa30ab6084635ee64d8e3eaaec60a62c27f149c3e22"
-PV = "3.40.1"
+SRC_URI[archive.sha256sum] = "ec82951639f32a5cece80a8b0b9aa3f66b7d318e3ee2c1c35234f2e2bde8a418"
+PV = "3.40.2"
-- 
2.31.1

[PATCH 05/28] file-roller: upgrade 3.38.1 -> 3.40.0

[Andreas Müller]

version 3.40.0
--------------
 Bugs fixed:
  * Error when creating an archive with no extension (!99)
  * Fixed encrypted files emblem (!120)
  * Open destination: fixed when using junk_paths (!112)
 New or updated application translations:
  * Romanian (Florentina Mușat)
  * Ukrainian (Yuri Chornoivan)

version 3.39.1
--------------
 New features and user visibile changes:
  * Let nautilus handle properly rar files. (Simental Magana, Marcos)
    (!1813)
  * Remember If Showing Other Options. (programmer-ceds)
  * Action Enter key in password field. (programmer-ceds)
  * libarchive: multicore xz compression. (Julian Groß)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{file-roller_3.38.1.bb => file-roller_3.40.0.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/file-roller/{file-roller_3.38.1.bb => file-roller_3.40.0.bb} (76%)

diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb
similarity index 76%
rename from meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb
rename to meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb
index 379857c94..e4aeea26f 100644
--- a/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb
+++ b/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb
@@ -13,11 +13,11 @@ DEPENDS = " \
 
 inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg
 
-SRC_URI[archive.sha256sum] = "94a0130e12d321aa119793a14d09716523e2e4a61f29570cee53fd88dd6abc57"
+SRC_URI[archive.sha256sum] = "4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}"
 
-PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus"
+PACKAGECONFIG[nautilus] = "-Dnautilus-actions=enabled,-Dnautilus-actions=disabled,nautilus"
 PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false,"
 
 FILES_${PN} += " \
-- 
2.31.1

[PATCH 06/28] glibmm: upgrade 2.62.0 -> 2.66.1 / build with meson / cleanup recipe

[Andreas Müller]

2.66.1 is the version GNOME 40.2 release suggests. There are 2.68 versions but
these are for mm-bindings compatible with gtk4.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{glibmm_2.62.0.bb => glibmm_2.66.1.bb}       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
 rename meta-oe/recipes-core/glib-2.0/{glibmm_2.62.0.bb => glibmm_2.66.1.bb} (62%)

diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb
similarity index 62%
rename from meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb
rename to meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb
index 75eea4e58..a40561138 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb
@@ -6,23 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \
                     file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native"
+
+GNOMEBASEBUILDCLASS = "meson"
+
 inherit gnomebase
 
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
-SRC_URI += " \
-    file://remove-examples.patch \
-"
-SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e"
-SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe"
+SRC_URI[archive.sha256sum] = "69bd6b5327716ca2f511ab580a969fd7bf0cd2c24ce15e1d0e530592d3ff209c"
 
 do_install_append() {
-    install -d ${D}${datadir}/glibmm-2.4
-    install -d ${D}${datadir}/aclocal
-
-    install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/
-    install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true
-
     for i in generate_wrap_init.pl gmmproc; do
         sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i
     done
@@ -32,4 +25,3 @@ 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/"
 
 RDEPENDS_${PN}-dev = "perl"
-SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
-- 
2.31.1

[PATCH 07/28] gmime: upgrade 3.2.6 -> 3.2.7

[Andreas Müller]

* Added some configure logic to auto-detect the system shift-jis charset alias. (issue #81)
* Fixed tests/Makefile.am to exit with a non-negative value (issue #82)
* Fixed logic to skip expired or revoked gpg subkeys when looking for the correct subkey to
  use for signing or encrypting. (issue #88)
* Fixed a regression introduced into 3.2.6 as part of the header parsder rewrite that lost
  the ability to warn about invalid headers for non-toplevel MIME parts. (issue #89)
* Fixed S/MIME to always set GPGME_KEYLIST_MODE_VALIDATE when looking up certificates
  as this is needed in order to correctly populate the GMimeCertificates (issue #90)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h             | 1 +
 .../recipes-gnome/gmime/{gmime_3.2.6.bb => gmime_3.2.7.bb}   | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-gnome/gmime/{gmime_3.2.6.bb => gmime_3.2.7.bb} (72%)

diff --git a/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h b/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h
index 714cb5aa9..a899ce0ad 100644
--- a/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h
+++ b/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h
@@ -3,3 +3,4 @@
 #define ICONV_ISO_INT_FORMAT "iso-%u-%u"
 #define ICONV_ISO_STR_FORMAT "iso-%u-%s"
 #define ICONV_10646 "iso-10646"
+#define ICONV_SHIFT_JIS "shift-jis"
diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb
similarity index 72%
rename from meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb
rename to meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb
index 4ae13e7ef..e70b74789 100644
--- a/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb
+++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb
@@ -2,15 +2,14 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 DESCRIPTION = "Runtime libraries for parsing and creating MIME mail"
 SECTION = "libs"
+
 DEPENDS = "glib-2.0 zlib"
 
 inherit gnomebase gobject-introspection
 
 SRC_URI += "file://iconv-detect.h \
             file://nodolt.patch"
-
-SRC_URI[archive.md5sum] = "656548dc431004d1ebf95e5d0bb4b9c8"
-SRC_URI[archive.sha256sum] = "abff194c7c4802fba2e233890d09dde8bf7170c3ad5e13000601c8d5b3c44717"
+SRC_URI[archive.sha256sum] = "2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44"
 
 export ac_cv_have_iconv_detect_h="yes"
 
-- 
2.31.1

[PATCH 08/28] gnome-autoar; upgrade 0.3.2 -> 0.3.3

[Andreas Müller]

Major changes in 0.3.3:
* extractor: Fix extraction of one file archives (Ondrej Holy)
* compressor: Fix usage of uninitialized value (Ondrej Holy)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{gnome-autoar_0.3.2.bb => gnome-autoar_0.3.3.bb}           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-autoar/{gnome-autoar_0.3.2.bb => gnome-autoar_0.3.3.bb} (66%)

diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.3.bb
similarity index 66%
rename from meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb
rename to meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.3.bb
index 8eba85941..5d7a9a657 100644
--- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.3.bb
@@ -9,8 +9,7 @@ DEPENDS = " \
 
 inherit gnomebase gobject-introspection gtk-doc vala
 
-SRC_URI[archive.md5sum] = "3c8da1a8489255f2aaa5fdb690308e5d"
-SRC_URI[archive.sha256sum] = "a48c4d5ce9a9ed05ba8bc8fdeb9af2d1a7bd8091c2911d6c37223c4f488f7c72"
+SRC_URI[archive.sha256sum] = "272400f73a375a7e88fdf1e12591bfb8f3f03edf01780cadcd74f70b613e5c04"
 
 do_compile_prepend() {
     export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs"
-- 
2.31.1

[PATCH 09/28] gnome-keyring: upgrade 3.36.0 -> 40.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{gnome-keyring_3.36.0.bb => gnome-keyring_40.0.bb}       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-keyring/{gnome-keyring_3.36.0.bb => gnome-keyring_40.0.bb} (89%)

diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb
similarity index 89%
rename from meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb
rename to meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb
index 3fc16bb0a..fce28bd86 100644
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb
@@ -17,12 +17,11 @@ DEPENDS = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
 "
 
-inherit gnomebase gsettings features_check remove-libtool gettext upstream-version-is-even
+inherit gnomebase gsettings features_check remove-libtool gettext
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "38f0732845a510a8dff4f154c3406f65"
-SRC_URI[archive.sha256sum] = "a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87"
+SRC_URI[archive.sha256sum] = "a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931"
 SRC_URI += " \
     file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \
     file://musl.patch \
-- 
2.31.1

[PATCH 10/28] gnome-online-accounts: upgrade 3.36.0 -> 3.40.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...line-accounts_3.36.0.bb => gnome-online-accounts_3.40.0.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-online-accounts/{gnome-online-accounts_3.36.0.bb => gnome-online-accounts_3.40.0.bb} (88%)

diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.40.0.bb
similarity index 88%
rename from meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb
rename to meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.40.0.bb
index c3142ad9f..4b79fe2aa 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.40.0.bb
@@ -11,8 +11,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.md5sum] = "44a37e1f8d4cac1dca0c41b57b49c2d0"
-SRC_URI[archive.sha256sum] = "1c8f62990833ca41188dbb80c5e99d99b57a62608ca675bbcd37bc2244742f2e"
+SRC_URI[archive.sha256sum] = "585c4f979f6f543b77bfdb4fb01eb18ba25c2aec5b7866c676d929616fb2c3fa"
 
 # backend is required for gnome-control-center
 PACKAGECONFIG = "backend other"
-- 
2.31.1

[PATCH 11/28] gnome-terminal: upgrade 3.36.2 -> 3.40.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{gnome-terminal_3.36.2.bb => gnome-terminal_3.40.2.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-terminal/{gnome-terminal_3.36.2.bb => gnome-terminal_3.40.2.bb} (83%)

diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb
similarity index 83%
rename from meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb
rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb
index ce54faab2..62534a94a 100644
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb
@@ -11,6 +11,7 @@ DEPENDS = " \
     glib-2.0-native \
     intltool-native \
     yelp-tools-native \
+    docbook-xsl-stylesheets-native libxslt-native \
     desktop-file-utils-native \
     gtk+3 \
     gsettings-desktop-schemas \
@@ -19,8 +20,7 @@ DEPENDS = " \
     libpcre2 \
 "
 
-SRC_URI[archive.md5sum] = "08150cbf2e23dd4f60f959a6eca8ef0c"
-SRC_URI[archive.sha256sum] = "41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46"
+SRC_URI[archive.sha256sum] = "4c79af8ffe8bd3a5daca1911ea2c0acd6872860a1dd5d7eea219f4ab4ae556ac"
 SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
 
 EXTRA_OECONF += " \
-- 
2.31.1

[PATCH 12/28] gspell: upgrade 1.8.4 -> 1.9.1

[Andreas Müller]

News in 1.9.1, 2020-10-10
-------------------------
* gspell_language_get_name() is now implemented with the ICU library, not with
  the iso-codes package. As a result, gspell no longer depends on the
  iso-codes, and has the ICU as a new dependency.
* Translation updates.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/gspell/{gspell_1.8.4.bb => gspell_1.9.1.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/gspell/{gspell_1.8.4.bb => gspell_1.9.1.bb} (75%)

diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb
similarity index 75%
rename from meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb
rename to meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb
index f7f493dc3..d6de146b1 100644
--- a/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb
+++ b/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb
@@ -7,4 +7,4 @@ DEPENDS = "gtk+3 iso-codes enchant2"
 
 inherit gnomebase gettext gobject-introspection
 
-SRC_URI[archive.sha256sum] = "cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4"
+SRC_URI[archive.sha256sum] = "dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd"
-- 
2.31.1

[PATCH 13/28] gtkmm3: upgrade 3.24.3 -> 3.24.5

[Andreas Müller]

Submitted patch was applied

3.24.5 (stable):

Gtk:
* TreeValueProxy: Mark the copy assignment operator as deleted
  (Daniel Boles) Issue #94, merge request !63

Build:
* Meson build: Use relative paths to untracked/
  (Mingli Yu) Merge request !61
* [gdk|gtk]mmconfig.h.*: Don't dllimport on MinGW
  (Chun-wei Fan) Issue #90 (Lukas K.)
* Meson build: Make it possible to use gtkmm as a subproject
  (Kjell Ahlstedt) Merge request !62 (BogDan Vatra)
* Meson build: No implicit_include_directories
  (Kjell Ahlstedt)
* MSVC build: Gtk::TreeModelColumnRecord: Export class selectively
  (Chun-wei Fan)

3.24.4 (stable):

The tarball for 3.24.4 has been created with 'meson dist'.
If you build with Autotools from the tarball, please read the relevant
part of the README file.

Build on Windows:
* Gtk::TreePath: Export comparison operators
  (Chun-wei Fan) Issue #88 (Patrick Storz)
  (Chun-wei Fan) Merge request !58

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../0001-meson.build-use-relative-path.patch  | 52 -------------------
 .../{gtkmm3_3.24.3.bb => gtkmm3_3.24.5.bb}    |  5 +-
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch
 rename meta-oe/recipes-gnome/gtk+/{gtkmm3_3.24.3.bb => gtkmm3_3.24.5.bb} (77%)

diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch b/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch
deleted file mode 100644
index 46a691643..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 152d295a28567ac87b0e6db2e62c0d914b1d7ef9 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Tue, 23 Feb 2021 08:47:54 +0000
-Subject: [PATCH] meson.build: use relative path
-
-Fixes:
-Fatal error: can't create
-gdk/gdkmm/libgdkmm-3.0.so.1.1.0.p/_buildarea1_master-wr_build_Userspace_auto-usrmerge_standalone_usrmerge_next_210222_lxbuilds_Har12345_platform_up_intel-x86-64-standard-glibc-std_wrlinux_build_tmp-glibc_work_corei7-64-wrs-linux_gtkmm3_3.24.3-r0_gtkmm-3.24.3_untracked_gdk_gdkmm_timecoord.cc.o: File name too long
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtkmm/-/merge_requests/61]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- gdk/gdkmm/meson.build | 4 ++--
- gtk/gtkmm/meson.build | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build
-index afccaea..240ce4d 100644
---- a/gdk/gdkmm/meson.build
-+++ b/gdk/gdkmm/meson.build
-@@ -200,9 +200,9 @@ else # not maintainer_mode
-     gdkmm_hg_ccg_basenames,
-   )
- 
--  built_cc_files = [ src_untracked_gdkmm / 'wrap_init.cc' ]
-+  built_cc_files = [ '../..' / untracked_gdkmm / 'wrap_init.cc' ]
-   foreach file : gdkmm_used_hg_ccg_basenames
--    built_cc_files += src_untracked_gdkmm / file + '.cc'
-+    built_cc_files += '../..' / untracked_gdkmm / file + '.cc'
-   endforeach
- 
-   gdk_gen_sources = built_cc_files
-diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build
-index ab96a22..cc0c050 100644
---- a/gtk/gtkmm/meson.build
-+++ b/gtk/gtkmm/meson.build
-@@ -464,9 +464,9 @@ else # not maintainer_mode
-     gtkmm_hg_ccg_basenames,
-   )
- 
--  built_cc_files = [ src_untracked_gtkmm / 'wrap_init.cc' ]
-+  built_cc_files = [ '../..' / untracked_gtkmm / 'wrap_init.cc' ]
-   foreach file : gtkmm_used_hg_ccg_basenames
--    built_cc_files += src_untracked_gtkmm / file + '.cc'
-+    built_cc_files += '../..' / untracked_gtkmm / file + '.cc'
-   endforeach
- 
-   gtk_gen_sources = built_cc_files
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb
similarity index 77%
rename from meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb
rename to meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb
index 1648e37fa..2c5012cb2 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb
@@ -16,10 +16,7 @@ inherit gnomebase features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI += "file://0001-meson.build-use-relative-path.patch \
-"
-
-SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435"
+SRC_URI[archive.sha256sum] = "856333de86689f6a81c123f2db15d85db9addc438bc3574c36f15736aeae22e6"
 
 EXTRA_OEMESON = "-Dbuild-demos=false"
 
-- 
2.31.1

[PATCH 14/28] gtksourceview4: upgrade 4.6.1 -> 4.8.1

[Andreas Müller]

News in 4.8.1, 2021-03-02
-------------------------
* Fix highlighting in presence of byte-order-marks (BOM)
* meson.lang: Update keywords to 0.55.3 syntax
* cmake.lang: Update keywords to 3.18.2 syntax
* go.lang: make "0i" syntax highlight as integer
* Translation updates

News in 4.7.90, 2020-08-07
--------------------------
* Bump GTK requirement to 3.24 for gdk_window_move_to_rect()
* Use gdk_window_move_to_rect() to more reliably position completion windows
* erb.lang: initial support for ERB
* javascript.lang, typescript.lang: various correctness and performance
  improvements.
* Translation updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{gtksourceview4_4.6.1.bb => gtksourceview4_4.8.1.bb}     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview4_4.6.1.bb => gtksourceview4_4.8.1.bb} (72%)

diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.1.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.1.bb
similarity index 72%
rename from meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.1.bb
rename to meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.1.bb
index 5a420e615..f7d040d73 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.1.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.1.bb
@@ -16,9 +16,8 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.6/${PNAME}-${PV}.tar.xz"
-SRC_URI[md5sum] = "4d4cff3a57a371bff4793e97d50404ef"
-SRC_URI[sha256sum] = "63f487a7ab59612ffa9e7be1883dbd274ab1016afcede3239b93b0fc384df874"
+SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "d163d71b5fcafbc5b1eec6dd841edbdbcddd3a7511cd5fdcffd86b8bbfe69ac1"
 
 GIR_MESON_OPTION = 'gir'
 GTKDOC_MESON_OPTION = "gtk_doc"
-- 
2.31.1

[PATCH 15/28] gupnp: upgrade 1.2.6 -> 1.2.7

[Andreas Müller]

Hardening fix was applied

1.2.7
=====

- Fix build with -Wformat-security=error
- Bump required GLib version to 2.66
- Fix some introspection annotations
- Add missing varargs functions to vapi
- Revert fix from 1.2.5 which causes managed control points to
  live too long

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...x-build-with-hardened-security-flags.patch | 61 -------------------
 .../recipes-connectivity/gupnp/gupnp_1.2.6.bb | 10 ---
 .../recipes-connectivity/gupnp/gupnp_1.2.7.bb |  7 +++
 3 files changed, 7 insertions(+), 71 deletions(-)
 delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch
 delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb
 create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb

diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch
deleted file mode 100644
index ef0c945d0..000000000
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6eba07bd195e0a1199a0fc62d7cc31ec376bc3dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 31 May 2021 17:44:29 +0200
-Subject: [PATCH] Fix build with hardened security flags
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| ../gupnp-1.2.6/examples/get-volume.c: In function 'on_introspection':
-| ../gupnp-1.2.6/examples/get-volume.c:53:17: error: format not a string literal and no format arguments [-Werror=format-security]
-|    53 |                 g_critical (error->message);
-|       |                 ^~~~~~~~~~
-| ../gupnp-1.2.6/examples/get-volume.c:114:17: error: format not a string literal and no format arguments [-Werror=format-security]
-|   114 |                 g_critical (error->message);
-|       |                 ^~~~~~~~~~
-| ../gupnp-1.2.6/examples/get-volume.c: In function 'main':
-| ../gupnp-1.2.6/examples/get-volume.c:150:17: error: format not a string literal and no format arguments [-Werror=format-security]
-|   150 |                 g_error (error->message);
-|       |                 ^~~~~~~
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/17]
----
- examples/get-volume.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/examples/get-volume.c b/examples/get-volume.c
-index 4601014..923581c 100644
---- a/examples/get-volume.c
-+++ b/examples/get-volume.c
-@@ -50,7 +50,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data)
-                 &error);
- 
-         if (error != NULL) {
--                g_critical (error->message);
-+                g_critical ("%s", error->message);
-                 g_clear_error (&error);
-         }
- 
-@@ -111,7 +111,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data)
-         g_list_free (out_names);
- 
-         if (error != NULL) {
--                g_critical (error->message);
-+                g_critical ("%s", error->message);
-                 g_clear_error (&error);
-         } else {
-                 g_print ("Current volume: %s\n",
-@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
-         GUPnPContext *context = gupnp_context_new ("wlp3s0", 0, &error);
- 
-         if (error != NULL) {
--                g_error (error->message);
-+                g_error ("%s", error->message);
-         }
- 
-         GUPnPControlPoint *cp = gupnp_control_point_new (context, CONTENT_DIR);
--- 
-2.31.1
-
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb
deleted file mode 100644
index 294c361db..000000000
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require gupnp.inc
-
-SRC_URI = " \
-    ${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz \
-    file://0001-Fix-build-with-hardened-security-flags.patch \
-"
-SRC_URI[sha256sum] = "00b20f1e478a72deac92c34723693a2ac55789ed1e4bb4eed99eb4d62092aafd"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
-                    file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520"
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb
new file mode 100644
index 000000000..7ad594f02
--- /dev/null
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb
@@ -0,0 +1,7 @@
+require gupnp.inc
+
+SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "8441276f1afd0176e6f595026a3a507eed1809abfa04026bad3f21622b3523ec"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+                    file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520"
-- 
2.31.1

[PATCH 16/28] gvfs: upgrade 1.44.1 -> 1.48.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/gvfs/{gvfs_1.44.1.bb => gvfs_1.48.1.bb}      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.44.1.bb => gvfs_1.48.1.bb} (95%)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb
similarity index 95%
rename from meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
rename to meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb
index c8c16a3c5..39f681f4e 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb
@@ -11,8 +11,7 @@ DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \
 RDEPENDS_${PN} += "gsettings-desktop-schemas"
 
 SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
-SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974"
-SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46"
+SRC_URI[archive.sha256sum] = "b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2"
 
 # depends on gsettings-desktop-schemas->gcr->gtk+3-> x11
 REQUIRED_DISTRO_FEATURES = "x11"
-- 
2.31.1

[PATCH 17/28] libgdata: upgrade 0.17.13 -> 0.18.1

[Andreas Müller]

Overview of changes from libgdata 0.18.0 to libgdata 0.18.1
===========================================================
* Translation updates

Overview of changes from libgdata 0.17.13 to libgdata 0.18.0
============================================================
* Add support for Team Drives (work by Ondrej Holy) (#25)
* Bugs fixed:
 - #25 Team drives API support needed
* Translation updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../libgdata/{libgdata_0.17.13.bb => libgdata_0.18.1.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/libgdata/{libgdata_0.17.13.bb => libgdata_0.18.1.bb} (92%)

diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
similarity index 92%
rename from meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb
rename to meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
index de33fd829..a65ed051c 100644
--- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb
+++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
@@ -30,4 +30,4 @@ PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
 
 EXTRA_OEMESON = "-Dalways_build_tests=false"
 
-SRC_URI[archive.sha256sum] = "eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e"
+SRC_URI[archive.sha256sum] = "dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7"
-- 
2.31.1

[PATCH 18/28] libmediaart 0.7.0: remove

[Andreas Müller]

* we have libmediaart-2.0
* nothing depends on the version introduced 2014

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../packagegroups/packagegroup-meta-multimedia.bb           | 1 -
 .../recipes-support/libmediaart/libmediaart_0.7.0.bb        | 6 ------
 2 files changed, 7 deletions(-)
 delete mode 100644 meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb

diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index 73b852a4a..b9f90d2c7 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -100,7 +100,6 @@ RDEPENDS_packagegroup-meta-multimedia-mkv = "\
 RDEPENDS_packagegroup-meta-multimedia-support = "\
     crossguid \
     libmediaart-2.0 \
-    libmediaart \
     gst-instruments \
     libsrtp \
     srt \
diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb b/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb
deleted file mode 100644
index ae95d4f69..000000000
--- a/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libmediaart.inc
-
-SRC_URI[archive.md5sum] = "1a44933d4cd0064e3c76d8d0ddacddc9"
-SRC_URI[archive.sha256sum] = "3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3"
-
-EXTRA_OECONF_append = " --disable-gtk-doc"
-- 
2.31.1

[PATCH 19/28] libmediaart-2.0: upgrade 1.9.4 -> 1.9.5 / merge inc file / build with meson

[Andreas Müller]

NEW in 1.9.5 - 2021-05-22
=========================
  * libmediaart: Remove QT4 support
  * libmediaart: Mandate that input strings are UTF8
  * extract: Remove local storage
  * build: Drop autotools support
  * build: Update to recent glib API
  * build: introspection fixes
  * build: Added CI

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../libmediaart/libmediaart-2.0_1.9.4.bb      |  7 ------
 .../libmediaart/libmediaart-2.0_1.9.5.bb      | 23 +++++++++++++++++++
 .../libmediaart/libmediaart.inc               | 12 ----------
 3 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb
 create mode 100644 meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb
 delete mode 100644 meta-multimedia/recipes-support/libmediaart/libmediaart.inc

diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb b/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb
deleted file mode 100644
index 56a7873fc..000000000
--- a/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require libmediaart.inc
-
-SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz"
-SRC_URI[md5sum] = "9b960a6a764fba38135fb57219f2e6b4"
-SRC_URI[sha256sum] = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"
-
-S = "${WORKDIR}/libmediaart-${PV}"
diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb b/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb
new file mode 100644
index 000000000..31fe43bfa
--- /dev/null
+++ b/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Library tasked with managing, extracting and handling media art caches"
+
+LICENSE = "LGPLv2+ & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
+                    file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \
+                    file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e"
+
+DEPENDS = "glib-2.0 gdk-pixbuf"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gobject-introspection vala features_check
+
+SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz"
+SRC_URI[sha256sum] = "07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6"
+
+S = "${WORKDIR}/libmediaart-${PV}"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST = "introspection"
+
+EXTRA_OEMESON = "-Dimage_library=gdk-pixbuf"
diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
deleted file mode 100644
index c7b368de3..000000000
--- a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SUMMARY = "Library tasked with managing, extracting and handling media art caches"
-
-LICENSE = "LGPLv2+ & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
-                    file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \
-                    file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e"
-
-DEPENDS = "glib-2.0 gdk-pixbuf"
-
-inherit gnomebase gtk-doc gobject-introspection
-
-EXTRA_OECONF = "--disable-qt --enable-gdkpixbuf"
-- 
2.31.1

Re: [oe] [PATCH 19/28] libmediaart-2.0: upgrade 1.9.4 -> 1.9.5 / merge inc file / build with meson

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4721 bytes --]

Hi,

rygel and packagegroup-meta-multimedia.bb should be updated to respect
gobject-introspection-data restriction, now world builds are failing with:

ERROR: Nothing PROVIDES 'libmediaart-2.0' (but
meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb
DEPENDS on or otherwise requires it)
libmediaart-2.0 was skipped: missing required distro feature
'gobject-introspection-data' (not in DISTRO_FEATURES)

ERROR: Nothing RPROVIDES 'rygel' (but
meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb,
meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
RDEPENDS on or otherwise requires it)
No eligible RPROVIDERs exist for 'rygel'
NOTE: Runtime target 'rygel' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['rygel']


On Wed, Jun 9, 2021 at 8:39 AM Andreas Müller <schnitzeltony@gmail.com>
wrote:

> NEW in 1.9.5 - 2021-05-22
> =========================
>   * libmediaart: Remove QT4 support
>   * libmediaart: Mandate that input strings are UTF8
>   * extract: Remove local storage
>   * build: Drop autotools support
>   * build: Update to recent glib API
>   * build: introspection fixes
>   * build: Added CI
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  .../libmediaart/libmediaart-2.0_1.9.4.bb      |  7 ------
>  .../libmediaart/libmediaart-2.0_1.9.5.bb      | 23 +++++++++++++++++++
>  .../libmediaart/libmediaart.inc               | 12 ----------
>  3 files changed, 23 insertions(+), 19 deletions(-)
>  delete mode 100644 meta-multimedia/recipes-support/libmediaart/
> libmediaart-2.0_1.9.4.bb
>  create mode 100644 meta-multimedia/recipes-support/libmediaart/
> libmediaart-2.0_1.9.5.bb
>  delete mode 100644
> meta-multimedia/recipes-support/libmediaart/libmediaart.inc
>
> diff --git a/meta-multimedia/recipes-support/libmediaart/
> libmediaart-2.0_1.9.4.bb b/meta-multimedia/recipes-support/libmediaart/
> libmediaart-2.0_1.9.4.bb
> deleted file mode 100644
> index 56a7873fc..000000000
> --- a/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -require libmediaart.inc
> -
> -SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz"
> -SRC_URI[md5sum] = "9b960a6a764fba38135fb57219f2e6b4"
> -SRC_URI[sha256sum] =
> "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"
> -
> -S = "${WORKDIR}/libmediaart-${PV}"
> diff --git a/meta-multimedia/recipes-support/libmediaart/
> libmediaart-2.0_1.9.5.bb b/meta-multimedia/recipes-support/libmediaart/
> libmediaart-2.0_1.9.5.bb
> new file mode 100644
> index 000000000..31fe43bfa
> --- /dev/null
> +++ b/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb
> @@ -0,0 +1,23 @@
> +SUMMARY = "Library tasked with managing, extracting and handling media
> art caches"
> +
> +LICENSE = "LGPLv2+ & GPLv2+"
> +LIC_FILES_CHKSUM =
> "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> +
> file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36
> \
> +
> file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e"
> +
> +DEPENDS = "glib-2.0 gdk-pixbuf"
> +
> +GNOMEBASEBUILDCLASS = "meson"
> +
> +inherit gnomebase gobject-introspection vala features_check
> +
> +SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz"
> +SRC_URI[sha256sum] =
> "07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6"
> +
> +S = "${WORKDIR}/libmediaart-${PV}"
> +
> +# gobject-introspection is mandatory and cannot be configured
> +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
> +UNKNOWN_CONFIGURE_WHITELIST = "introspection"
> +
> +EXTRA_OEMESON = "-Dimage_library=gdk-pixbuf"
> diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
> b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
> deleted file mode 100644
> index c7b368de3..000000000
> --- a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -SUMMARY = "Library tasked with managing, extracting and handling media
> art caches"
> -
> -LICENSE = "LGPLv2+ & GPLv2+"
> -LIC_FILES_CHKSUM =
> "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> -
> file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36
> \
> -
> file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e"
> -
> -DEPENDS = "glib-2.0 gdk-pixbuf"
> -
> -inherit gnomebase gtk-doc gobject-introspection
> -
> -EXTRA_OECONF = "--disable-qt --enable-gdkpixbuf"
> --
> 2.31.1
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 6721 bytes --]

[PATCH 20/28] libsigc++-2.0: upgrade 2.10.6 -> 2.10.7

[Andreas Müller]

2.10.7 (stable)

Meson build:
* Make it possible to use sigc++ as a subproject
  (Kjell Ahlstedt)
* Fix dependency on files generated from .h.m4 files
  (Kjell Ahlstedt)
* No implicit_include_directories
  (Kjell Ahlstedt)
* Make quiet installations possible
  (Kjell Ahlstedt)
* Fix build as subproject without building documentation
  (Kjell Ahlstedt) Issue #71 (Xavier Claessens)

Documentation:
* Links to *.gnome.org refer to sigc++-2.0 and gtkmm-3.0 versions
  instead of latest versions
  (Kjell Ahlstedt)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{libsigc++-2.0_2.10.6.bb => libsigc++-2.0_2.10.7.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-core/libsigc++-2.0/{libsigc++-2.0_2.10.6.bb => libsigc++-2.0_2.10.7.bb} (84%)

diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb
similarity index 84%
rename from meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb
rename to meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb
index f4c5aa396..de1aa4ea3 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 DEPENDS = "mm-common"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz"
-SRC_URI[sha256sum] = "dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b"
+SRC_URI[sha256sum] = "d082a2ce72c750f66b1a415abe3e852df2eae1e8af53010f4ac2ea261a478832"
 
 S = "${WORKDIR}/libsigc++-${PV}"
 
-- 
2.31.1

[PATCH 21/28] nautilus: upgrade 40.1 -> 40.2

[Andreas Müller]

Major changes in 40.2
=====================
* Fix missing "Open Scripts Folder" menu item (Ondrej Holy)
* Prevent reopening of previewer on window focus (Felipe Borges)
* Keep working directory when executing scripts (António Fernandes)
* Translation updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../nautilus/{nautilus_40.1.bb => nautilus_40.2.bb}             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/nautilus/{nautilus_40.1.bb => nautilus_40.2.bb} (91%)

diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_40.2.bb
similarity index 91%
rename from meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb
rename to meta-gnome/recipes-gnome/nautilus/nautilus_40.2.bb
index 75fc03237..ee58df2b3 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_40.2.bb
@@ -22,7 +22,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI[archive.sha256sum] = "8ecfb90174a0bd5815b1ceb9cbfcd91fec0fb5e34907a4f2df2d05e5d6c99d33"
+SRC_URI[archive.sha256sum] = "b71ef2fe07e5eea89a2bb1e5bd30947bd18873bfb30f79cbf17edfbd4d20f60d"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-- 
2.31.1

[PATCH 22/28] pangomm: upgrade 2.42.1 -> 2.46.1 / build with meson

[Andreas Müller]

2.46.1 is the version GNOME 40.2 release suggests. There are 2.48 versions but
these are for mm-bindings compatible with gtk4.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../pango/{pangomm_2.42.1.bb => pangomm_2.46.1.bb}     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-graphics/pango/{pangomm_2.42.1.bb => pangomm_2.46.1.bb} (51%)

diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb b/meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb
similarity index 51%
rename from meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb
rename to meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb
index 57d9ff982..f7e126e95 100644
--- a/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb
+++ b/meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb
@@ -6,18 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
 
 DEPENDS = "mm-common cairomm glibmm pango"
 
-SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
+GNOMEBASEBUILDCLASS = "meson"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz"
-SRC_URI[md5sum] = "339c48dd92ebd3a9911b231708f7a819"
-SRC_URI[sha256sum] = "14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f"
+inherit gnomebase features_check
 
-inherit features_check autotools pkgconfig
+SRC_URI[archive.sha256sum] = "c885013fe61a4c5117fda395770d507563411c63e49f4a3aced4c9efe34d9975"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-EXTRA_OECONF = " --disable-documentation "
-
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/"
 
-- 
2.31.1

[PATCH 23/28] yelp-xsl: upgrade 3.36.0 -> 4.02

[Andreas Müller]

For a copy of highlight.js they added BSD-3-Clause license

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../yelp/{yelp-xsl_3.36.0.bb => yelp-xsl_40.2.bb}          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-gnome/recipes-gnome/yelp/{yelp-xsl_3.36.0.bb => yelp-xsl_40.2.bb} (65%)

diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_40.2.bb
similarity index 65%
rename from meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb
rename to meta-gnome/recipes-gnome/yelp/yelp-xsl_40.2.bb
index 14a885056..99b666760 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_40.2.bb
@@ -1,7 +1,7 @@
 SUMMARY = "XSL stylesheets for the yelp help browser"
-LICENSE = "LGPLv2.1 & GPLv2"
+LICENSE = "LGPLv2.1 & GPLv2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \
+    file://COPYING;md5=8ca13a5a6972ac1620a1e42a3dacd774 \
     file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
     file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 "
@@ -10,8 +10,7 @@ inherit gnomebase gettext itstool
 
 DEPENDS += "libxml2"
 
-SRC_URI[archive.md5sum] = "7d71af68fff4a92bcb2b8989f126be6c"
-SRC_URI[archive.sha256sum] = "4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3"
+SRC_URI[archive.sha256sum] = "919c552f846aaec741fe51d5af416b469bcdb25c77effc3b5a15a4b4b7ff814e"
 
 RDEPENDS_${PN}_append_class-target = " libxml2 itstool"
 
-- 
2.31.1

[PATCH 24/28] yelp-tools: upgrade 3.32.2 -> 40.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../yelp/{yelp-tools_3.32.2.bb => yelp-tools_40.0.bb}     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/yelp/{yelp-tools_3.32.2.bb => yelp-tools_40.0.bb} (65%)

diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_40.0.bb
similarity index 65%
rename from meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
rename to meta-gnome/recipes-gnome/yelp/yelp-tools_40.0.bb
index af2bab380..f58c9ee4d 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_40.0.bb
@@ -5,17 +5,19 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
 "
 
+GNOMEBASEBUILDCLASS = "meson"
+
 inherit gnomebase itstool
 
 DEPENDS += " \
     libxslt-native \
     libxml2-native \
+    python3-lxml-native \
     yelp-xsl \
 "
 
-SRC_URI[archive.md5sum] = "7856f9ad0492aaf9adf097f5058bfc2e"
-SRC_URI[archive.sha256sum] = "183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9"
+SRC_URI[archive.sha256sum] = "664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae"
 
-RDEPENDS_${PN} += "yelp-xsl"
+RDEPENDS_${PN} += "python3-core yelp-xsl"
 
 BBCLASSEXTEND = "native"
-- 
2.31.1

[PATCH 25/28] yelp: upgrade 3.36.0 -> 40.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gnome/yelp/{yelp_3.36.0.bb => yelp_40.2.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/yelp/{yelp_3.36.0.bb => yelp_40.2.bb} (80%)

diff --git a/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb b/meta-gnome/recipes-gnome/yelp/yelp_40.2.bb
similarity index 80%
rename from meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb
rename to meta-gnome/recipes-gnome/yelp/yelp_40.2.bb
index b9263f50c..f62f8b1bd 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp_40.2.bb
@@ -9,8 +9,7 @@ inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features
 # for webkitgtk
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "32f879293f79b4042edc46aa13d82c71"
-SRC_URI[archive.sha256sum] = "fd4b3e23d31ad2bebe42ac8f80242b2d9bef51418bf62b59acdf2440bd94ed24"
+SRC_URI[archive.sha256sum] = "8aaaaf753ef4d97526f6a5308f1faee4aa627c4451ec92698a12e528535b5a1c"
 
 DEPENDS += " \
     libxml2-native \
-- 
2.31.1

[PATCH 26/28] gthumb: inherit required features from colord

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb
index 94cac89a9..93b2f4768 100644
--- a/meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb
+++ b/meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb
@@ -22,7 +22,10 @@ DEPENDS = " \
     libsecret \
 "
 
-inherit gnomebase gnome-help gsettings itstool mime-xdg
+inherit gnomebase gnome-help gsettings itstool mime-xdg features_check
+
+# for colord
+REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
 
 SRC_URI[archive.sha256sum] = "dab73f77cc2963ebe90112972c301441d228af3003cfef3f8b7300a6d5d3c212"
 
-- 
2.31.1

[PATCH 27/28] modemmanager: upgrade 1.16.4 -> 1.16.6

[Andreas Müller]

Huge changelog can be found at [1]

[1] https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/blob/master/NEWS

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{modemmanager_1.16.4.bb => modemmanager_1.16.6.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.16.4.bb => modemmanager_1.16.6.bb} (95%)

diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.6.bb
similarity index 95%
rename from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb
rename to meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.6.bb
index f8e8aa1d4..b499d93ec 100644
--- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.6.bb
@@ -12,7 +12,7 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion
 DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native"
 
 SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-SRC_URI[sha256sum] = "167e60b26fa05887f87a0b3fb54143d7845e6e4d8c2f2dd93afac059f41e7edf"
+SRC_URI[sha256sum] = "2a90b6260f66d3135609d62667ada73416694d717e7fd9b73223e3703a499617"
 S = "${WORKDIR}/ModemManager-${PV}"
 
 PACKAGECONFIG ??= "mbim qmi \
-- 
2.31.1

[PATCH 28/28] xfce4-settings: 4.16.1 upgrade 4.16.2

[Andreas Müller]

Release notes for 4.16.2
========================
- keyboard: Mark system defaults switch as active (Fixes #310)
- keyboard: Correctly initialize setting (Fixes #310)
- keyboard: Fix icon name in settings dialog
- keyboard: Make buttons translatable (Fixes #306)
- xfsettingsd: Fix setting float array properties
- Translation Updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{xfce4-settings_4.16.1.bb => xfce4-settings_4.16.2.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.16.1.bb => xfce4-settings_4.16.2.bb} (93%)

diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.1.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb
similarity index 93%
rename from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.1.bb
rename to meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb
index ccd55723a..bf853bfed 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb
@@ -9,7 +9,7 @@ inherit xfce features_check mime-xdg
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch"
-SRC_URI[sha256sum] = "bb28e1be7aa34d0edb1cfbaacc509a4267db56828b36cd6be312a202973635c6"
+SRC_URI[sha256sum] = "4dd7cb420860535e687f673c0b5c0274e0d2fb67181281d4b85be9197da03d7e"
 
 EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
 
-- 
2.31.1