[PATCH 01/20] tracker: upgrade 2.3.6 -> 3.0.4

[PATCH 01/20] tracker: upgrade 2.3.6 -> 3.0.4

[Andreas Müller]

* huge bump is required for upcoming nautilus 40.1
* PACKAGECONFIGS have no meson option anymore so remove them

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{tracker_2.3.6.bb => tracker_3.0.4.bb}    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)
 rename meta-gnome/recipes-gnome/tracker/{tracker_2.3.6.bb => tracker_3.0.4.bb} (59%)

diff --git a/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb
similarity index 59%
rename from meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb
rename to meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb
index 2c11976ca..82e3d006e 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \
 "
 
 DEPENDS = " \
-    libxml2-native \
     dbus-native \
     glib-2.0 \
     sqlite3 \
@@ -22,30 +21,32 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check
 
-SRC_URI[archive.sha256sum] = "bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2"
+SRC_URI[archive.sha256sum] = "c120d81f2df94aa794b1a7953b55cfa46de318ed68e6f3b5ad4fce0c729c2483"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
 
-PACKAGECONFIG ??= "fts"
-PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger"
-# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set
-PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false"
+# text search is not an option anymore and requires sqlite3 build with
+# PACKAGECONFIG[fts5] set (default)
 
 # set required cross property sqlite3_has_fts5
 do_write_config[vardeps] += "PACKAGECONFIG"
 do_write_config_append() {
     echo "[properties]" > ${WORKDIR}/meson-tracker.cross
-    echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross
+    echo "sqlite3_has_fts5 = 'true'" >> ${WORKDIR}/meson-tracker.cross
 }
 
-EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \
-                 -Dsystemd_user_services=${systemd_user_unitdir} \
+EXTRA_OEMESON = " \
+    --cross-file ${WORKDIR}/meson-tracker.cross \
+    -Dman=false \
+    -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
+    -Dsystemd_user_services_dir=${systemd_user_unitdir} \
 "
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-    ${libdir}/tracker-2.0 \
+    ${datadir}/tracker3 \
+    ${libdir}/tracker-3.0 \
     ${systemd_user_unitdir} \
 "
-- 
2.31.1

[PATCH 02/20] tracker-miners: upgrade 2.3.5 -> 3.0.5

[Andreas Müller]

* follow tracker upgrade
* adjust PACKAGECONFIGs to new sources

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...iners_2.3.5.bb => tracker-miners_3.0.5.bb} | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)
 rename meta-gnome/recipes-gnome/tracker/{tracker-miners_2.3.5.bb => tracker-miners_3.0.5.bb} (73%)

diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb
similarity index 73%
rename from meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb
rename to meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb
index 07fa10a0e..6672195e0 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb
@@ -13,9 +13,9 @@ DEPENDS = " \
 
 GNOMEBASEBUILDCLASS = "meson"
 
-inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check
+inherit gnomebase gsettings gobject-introspection vala bash-completion features_check
 
-SRC_URI[archive.sha256sum] = "9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa"
+SRC_URI[archive.sha256sum] = "c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b"
 SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch"
 
 # gobject-introspection is mandatory and cannot be configured
@@ -24,34 +24,33 @@ UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg", "", d)} \
-    flac \
     gexiv2 \
     gstreamer \
     icu \
     libexif \
     libgsf \
     jpeg \
+    pdf \
     png \
     tiff \
     xml \
-    pdf \
 "
 
+PACKAGECONFIG[battery]     = "-Dbattery_detection=upower,-Dbattery_detection=none,upower"
 PACKAGECONFIG[ffmpeg]     = ",,ffmpeg"
-PACKAGECONFIG[flac]       = "-Dflac=enabled,-Dflac=disabled,flac"
 PACKAGECONFIG[gexiv2]     = ",,gexiv2"
 PACKAGECONFIG[gstreamer]  = ",,gstreamer1.0 gstreamer1.0-plugins-base"
 PACKAGECONFIG[gupnp]      = ",,gupnp-dlna"
+PACKAGECONFIG[gif]        = "-Dgif=enabled,-Dgif=disabled,giflib"
 PACKAGECONFIG[icu]        = ",,icu"
+PACKAGECONFIG[jpeg]       = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
 PACKAGECONFIG[libexif]    = "-Dexif=enabled,-Dexif=disabled,libexif"
 PACKAGECONFIG[libgsf]     = "-Dgsf=enabled,-Dgsf=disabled,libgsf"
-PACKAGECONFIG[jpeg]       = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
+PACKAGECONFIG[pdf]        = "-Dpdf=enabled,-Dpdf=disabled,poppler"
 PACKAGECONFIG[png]        = "-Dpng=enabled,-Dpng=disabled,libpng"
 PACKAGECONFIG[tiff]       = "-Dtiff=enabled,-Dtiff=disabled,tiff"
 PACKAGECONFIG[xml]        = "-Dxml=enabled,-Dxml=disabled,libxml2"
-PACKAGECONFIG[vorbis]     = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis"
-PACKAGECONFIG[pdf]        = "-Dpdf=enabled,-Dpdf=disabled,poppler"
-PACKAGECONFIG[upower]     = ",,upower"
+PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger"
 
 # For security reasons it is strongly recommended to set add meta-security in
 # your layers and 'libseccomp' to PACKAGECONFIG".
@@ -60,12 +59,14 @@ PACKAGECONFIG[libseccomp] = ",,libseccomp"
 PACKAGECONFIG[rss]        = "-Dminer_rss=true,-Dminer_rss=false,libgrss"
 
 EXTRA_OEMESON += " \
-    -Dsystemd_user_services=${systemd_user_unitdir} \
+    -Dman=false \
+    -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
+    -Dsystemd_user_services_dir=${systemd_user_unitdir} \
 "
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-    ${datadir}/tracker \
-    ${libdir}/tracker-miners-2.0 \
+    ${datadir}/tracker3-miners \
+    ${libdir}/tracker-miners-3.0 \
     ${systemd_user_unitdir} \
 "
-- 
2.31.1

[PATCH 03/20] nautilus: upgrade 3.36.3 -> 40.1

[Andreas Müller]

* 3.36.3 stopped building with meson 0.58.0
* backported patch can go

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../nautilus/0001-Drop-use-of-volatile.patch  | 32 -------------------
 .../{nautilus_3.36.3.bb => nautilus_40.1.bb}  | 14 ++++++--
 2 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch
 rename meta-gnome/recipes-gnome/nautilus/{nautilus_3.36.3.bb => nautilus_40.1.bb} (77%)

diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch
deleted file mode 100644
index 46831429d..000000000
--- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9ab5acb902a38b420592931ec9e46ccd0624035a Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Wed, 13 Jan 2021 13:22:58 +0100
-Subject: [PATCH] Drop use of volatile
-
-The `fedora rawhide` CI job currently fails because of usage of the
-`volatile` qualifier. Let's drop the `volatile` qualifier as it doesn't
-help anyway. It was dropped in GLib as well, see:
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
-
-Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1741
----
-Upstream-Status: Backport [https://github.com/GNOME/nautilus/commit/9b733dd9df9d6d9805c56749d05ada15a7560ef4]
- src/nautilus-enum-types.c.template | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nautilus-enum-types.c.template b/src/nautilus-enum-types.c.template
-index 00155ca..9d8ac83 100644
---- a/src/nautilus-enum-types.c.template
-+++ b/src/nautilus-enum-types.c.template
-@@ -13,7 +13,7 @@
- GType
- @enum_name@_get_type (void)
- {
--    static volatile GType type_once = 0;
-+    static GType type_once = 0;
- 
-     if (g_once_init_enter (&type_once))
-     {
--- 
-2.30.1
-
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb
similarity index 77%
rename from meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb
rename to meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb
index cf138d973..09e075044 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb
@@ -13,16 +13,23 @@ DEPENDS = " \
     gsettings-desktop-schemas \
     gnome-autoar \
     tracker \
+    libhandy \
+    libportal \
 "
 
 inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg
 
-SRC_URI += "file://0001-Drop-use-of-volatile.patch"
-SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395"
-SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8"
+def gnome_verdir(v):
+    return oe.utils.trim_version(v, 1)
+
+SRC_URI[archive.sha256sum] = "8ecfb90174a0bd5815b1ceb9cbfcd91fec0fb5e34907a4f2df2d05e5d6c99d33"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
+EXTRA_OEMESON += " \
+    -Dtests=none \
+"
+
 PACKAGECONFIG = "extensions"
 PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base"
 
@@ -30,6 +37,7 @@ FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/metainfo \
     ${datadir}/gnome-shell \
+    ${datadir}/tracker3 \
 "
 
 # mandatory - not checked during configuration:
-- 
2.31.1

[PATCH 04/20] gnome-photos: upgrade 3.34.2 -> 40.0

[Andreas Müller]

gnome-photos' upgrade is mandatory due to tracker major version bump

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{gnome-photos_3.34.2.bb => gnome-photos_40.0.bb}       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-photos/{gnome-photos_3.34.2.bb => gnome-photos_40.0.bb} (79%)

diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
similarity index 79%
rename from meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb
rename to meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
index bb70ae7a8..d26c61083 100644
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
@@ -18,16 +18,19 @@ DEPENDS = " \
     libgdata \
     gfbgraph \
     tracker \
+    libhandy \
 "
 
 GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gettext upstream-version-is-even gnome-help features_check
 
+def gnome_verdir(v):
+    return oe.utils.trim_version(v, 1)
+
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "1dd0d477eac4707e8cfe9f35e26d1f29"
-SRC_URI[archive.sha256sum] = "3c59c76ef28618ec055a1799d1040287b90a0b021feb0a02b1eac28e9c2eb41a"
+SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-- 
2.31.1

[PATCH 05/20] file-roller: upgrade 3.36.3 -> 3.38.1

[Andreas Müller]

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

diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb
similarity index 87%
rename from meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb
rename to meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb
index 9af88f2a9..379857c94 100644
--- a/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb
+++ b/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb
@@ -13,7 +13,7 @@ DEPENDS = " \
 
 inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg
 
-SRC_URI[archive.sha256sum] = "0959e10a5d7a7442809624be9879d95db462ca76e8c66ad6299310e6acdb81b7"
+SRC_URI[archive.sha256sum] = "94a0130e12d321aa119793a14d09716523e2e4a61f29570cee53fd88dd6abc57"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}"
 
-- 
2.31.1

[PATCH 06/20] tepl: upgrade 4.4.0 -> 6.00.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../tepl/{tepl_4.4.0.bb => tepl_6.00.0.bb}      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
 rename meta-gnome/recipes-gnome/tepl/{tepl_4.4.0.bb => tepl_6.00.0.bb} (26%)

diff --git a/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb
similarity index 26%
rename from meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb
rename to meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb
index 4120c6260..dd0242f4c 100644
--- a/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb
+++ b/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Tepl library eases the development of GtkSourceView-based projects"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+LICENSE = "LGPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117"
 
 DEPENDS = " \
     glib-2.0-native \
@@ -11,7 +11,14 @@ DEPENDS = " \
     uchardet \
 "
 
-inherit gnomebase gobject-introspection gettext
+GNOMEBASEBUILDCLASS = "meson"
 
-SRC_URI[archive.md5sum] = "013ee8aae178f75cc74e05fac70786b3"
-SRC_URI[archive.sha256sum] = "e6f6673a8a27e8f280725db8fbacec79b20676ae0558755239d15a9808faa256"
+inherit gnomebase gobject-introspection gettext features_check
+
+SRC_URI[archive.sha256sum] = "a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
-- 
2.31.1

[PATCH 07/20] gedit: upgrade 3.36.2 -> 40.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../gedit/{gedit_3.36.2.bb => gedit_40.1.bb}           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gedit/{gedit_3.36.2.bb => gedit_40.1.bb} (71%)

diff --git a/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb
similarity index 71%
rename from meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb
rename to meta-gnome/recipes-gnome/gedit/gedit_40.1.bb
index b20f20449..471a7f632 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb
@@ -18,10 +18,16 @@ DEPENDS = " \
 
 inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even mime-xdg python3targetconfig
 
+def gnome_verdir(v):
+    return oe.utils.trim_version(v, 1)
+
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "438217bbbcf92a17c4f259b4a5426b03"
-SRC_URI[archive.sha256sum] = "6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197"
+SRC_URI[archive.sha256sum] = "55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 
-- 
2.31.1

[PATCH 08/20] evince: upgrade 3.38.0 -> 40.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../evince/{evince_3.38.0.bb => evince_40.1.bb}             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/evince/{evince_3.38.0.bb => evince_40.1.bb} (88%)

diff --git a/meta-gnome/recipes-gnome/evince/evince_3.38.0.bb b/meta-gnome/recipes-gnome/evince/evince_40.1.bb
similarity index 88%
rename from meta-gnome/recipes-gnome/evince/evince_3.38.0.bb
rename to meta-gnome/recipes-gnome/evince/evince_40.1.bb
index 9c1d8641e..15fac9918 100644
--- a/meta-gnome/recipes-gnome/evince/evince_3.38.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_40.1.bb
@@ -13,6 +13,7 @@ DEPENDS = " \
     gstreamer1.0-plugins-base \
     orc \
     adwaita-icon-theme \
+    libhandy \
     ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \
 "
 
@@ -20,7 +21,10 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc
 
-SRC_URI[archive.sha256sum] = "26df897a417545b476d2606b14731122e84278ae994bd64ea535449c3cf01948"
+def gnome_verdir(v):
+    return oe.utils.trim_version(v, 1)
+
+SRC_URI[archive.sha256sum] = "7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 
-- 
2.31.1

[PATCH 09/20] gnome-calculator: upgrade 3.36.0 -> 40.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...gnome-calculator_3.36.0.bb => gnome-calculator_40.1.bb} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-calculator/{gnome-calculator_3.36.0.bb => gnome-calculator_40.1.bb} (79%)

diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_40.1.bb
similarity index 79%
rename from meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb
rename to meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_40.1.bb
index c250981c4..5e6982714 100644
--- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_40.1.bb
@@ -11,6 +11,7 @@ DEPENDS = " \
     libgee \
     libmpc \
     gtksourceview4 \
+    libhandy \
 "
 
 GIR_MESON_OPTION = 'disable-introspection'
@@ -21,10 +22,12 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check upstream-version-is-even
 
+def gnome_verdir(v):
+    return oe.utils.trim_version(v, 1)
+
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "71854fb58671b4a88ac990e2f2439e4f"
-SRC_URI[archive.sha256sum] = "a2e830f9c9856fad65dad1d6c0ae6abad0f0b496c9984ac005315c5cc4220db3"
+SRC_URI[archive.sha256sum] = "7fe6c561f7b1f485ac106219772e45cc135c983bfa4278dd2d3fd83b57ff6af6"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-- 
2.31.1

[PATCH 10/20] gnome-system-monitor: upgrade 3.36.1 -> 40.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...stem-monitor_3.36.1.bb => gnome-system-monitor_40.1.bb} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-system-monitor/{gnome-system-monitor_3.36.1.bb => gnome-system-monitor_40.1.bb} (80%)

diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_40.1.bb
similarity index 80%
rename from meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb
rename to meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_40.1.bb
index ddd11201b..7b80c74a2 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_40.1.bb
@@ -10,6 +10,7 @@ DEPENDS = " \
     libgtop \
     librsvg \
     polkit \
+    libhandy \
 "
 
 GNOMEBASEBUILDCLASS = "meson"
@@ -18,8 +19,10 @@ inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check get
 
 REQUIRED_DISTRO_FEATURES = "x11 polkit"
 
-SRC_URI[archive.md5sum] = "b1443ab12c3b7bcca940d28754e5b948"
-SRC_URI[archive.sha256sum] = "866b47ab0f4c75b0ec57d6300337a7373463aaad5df95eddfe5354c22be7bca1"
+def gnome_verdir(v):
+    return oe.utils.trim_version(v, 1)
+
+SRC_URI[archive.sha256sum] = "fdb30f4367907aab86d7c2bb76a7b773ba850b765c9666a39f42abfe22691d1a"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
-- 
2.31.1

[PATCH 11/20] dconf-editor: upgrade 3.38.2 -> 3.38.3

[Andreas Müller]

Backported patch can go

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...lter-or-try-to-write-GtkChild-fields.patch | 522 ------------------
 ...ditor_3.38.2.bb => dconf-editor_3.38.3.bb} |   4 +-
 2 files changed, 1 insertion(+), 525 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch
 rename meta-gnome/recipes-gnome/dconf/{dconf-editor_3.38.2.bb => dconf-editor_3.38.3.bb} (65%)

diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch b/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch
deleted file mode 100644
index 7c83ae339..000000000
--- a/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch
+++ /dev/null
@@ -1,522 +0,0 @@
-From ba4a39b74067b73c9bed64dad7be3d53e837dd8d Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 16 Jan 2021 13:26:32 +0100
-Subject: [PATCH] Don't alter or try to write GtkChild fields
-
-See https://gitlab.gnome.org/GNOME/vala/issues/1121
-
-Upstream-Status: Backport [https://github.com/GNOME/dconf-editor/commit/9272e9fb6867e71426bfd0aa5edce5ec39cf0ad4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- editor/bookmarks-headerbar.vala  |  4 +--
- editor/bookmarks-list.vala       |  4 +--
- editor/bookmarks.vala            | 12 +++----
- editor/delayed-setting-view.vala | 54 ++++++++++++++++----------------
- editor/overlayed-list.vala       | 38 +++++++++++-----------
- editor/pathentry.vala            | 24 +++++++-------
- editor/registry-list.vala        |  6 ++--
- editor/registry-search.vala      |  6 ++--
- editor/registry-view.vala        |  2 +-
- 9 files changed, 75 insertions(+), 75 deletions(-)
-
-diff --git a/editor/bookmarks-headerbar.vala b/editor/bookmarks-headerbar.vala
-index 54848a5..0522c37 100644
---- a/editor/bookmarks-headerbar.vala
-+++ b/editor/bookmarks-headerbar.vala
-@@ -24,7 +24,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget
-         install_action_entries ();
- 
-         add_bookmarks_revealer              (out bookmarks_revealer,
--                                             out bookmarks_button,              ref center_box);
-+                                             out bookmarks_button,              center_box);
-         connect_bookmarks_signals ();
-         add_bookmarks_controller            (out bookmarks_controller,          ref this);
- 
-@@ -58,7 +58,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget
-     private Bookmarks           bookmarks_button;
-     private BookmarksController bookmarks_controller;
- 
--    private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, ref Box center_box)
-+    private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, Box center_box)
-     {
-         bookmarks_revealer = new Revealer ();
-         bookmarks_revealer.transition_type = RevealerTransitionType.SLIDE_LEFT;
-diff --git a/editor/bookmarks-list.vala b/editor/bookmarks-list.vala
-index 393973b..c9280d5 100644
---- a/editor/bookmarks-list.vala
-+++ b/editor/bookmarks-list.vala
-@@ -146,10 +146,10 @@ private class BookmarksList : OverlayedList
- 
-     internal bool create_bookmark_rows (Variant bookmarks_variant)
-     {
--        _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, ref main_list_box, ref bookmarks_hashtable);
-+        _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, main_list_box, ref bookmarks_hashtable);
-         return n_items == 0;
-     }
--    private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ref ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable)
-+    private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable)
-     {
-         string saved_bookmark_name = "";
-         ListBoxRow? selected_row = main_list_box.get_selected_row ();
-diff --git a/editor/bookmarks.vala b/editor/bookmarks.vala
-index 153af10..d8cea7c 100644
---- a/editor/bookmarks.vala
-+++ b/editor/bookmarks.vala
-@@ -84,7 +84,7 @@ private class Bookmarks : MenuButton
- 
-     construct
-     {
--        update_switch_label (ViewType.SEARCH, ViewType.FOLDER, ref switch_label); // init text with "Bookmark this Location"
-+        update_switch_label (ViewType.SEARCH, ViewType.FOLDER, switch_label); // init text with "Bookmark this Location"
- 
-         install_action_entries ();
- 
-@@ -184,7 +184,7 @@ private class Bookmarks : MenuButton
- 
-     internal void set_path (ViewType type, string path)
-     {
--        update_switch_label (current_type, type, ref switch_label);
-+        update_switch_label (current_type, type, switch_label);
- 
-         current_path = path;
-         current_type = type;
-@@ -392,7 +392,7 @@ private class Bookmarks : MenuButton
-     * * Bookmarks management
-     \*/
- 
--    private static void update_switch_label (ViewType old_type, ViewType new_type, ref Label switch_label)
-+    private static void update_switch_label (ViewType old_type, ViewType new_type, Label switch_label)
-     {
-         if (new_type == ViewType.SEARCH && old_type != ViewType.SEARCH)
-             switch_label.label = bookmark_this_search_text;
-@@ -414,18 +414,18 @@ private class Bookmarks : MenuButton
-         {
-             if (bookmarks_icon.icon_name != "starred-symbolic")
-                 bookmarks_icon.icon_name = "starred-symbolic";
--            update_switch_state (true, ref bookmarked_switch);
-+            update_switch_state (true, bookmarked_switch);
-             bookmarked_switch.set_detailed_action_name ("bookmarks.unbookmark(" + variant.print (true) + ")");
-         }
-         else
-         {
-             if (bookmarks_icon.icon_name != "non-starred-symbolic")
-                 bookmarks_icon.icon_name = "non-starred-symbolic";
--            update_switch_state (false, ref bookmarked_switch);
-+            update_switch_state (false, bookmarked_switch);
-             bookmarked_switch.set_detailed_action_name ("bookmarks.bookmark(" + variant.print (true) + ")");
-         }
-     }
--    private static void update_switch_state (bool bookmarked, ref Switch bookmarked_switch)
-+    private static void update_switch_state (bool bookmarked, Switch bookmarked_switch)
-     {
-         if (bookmarked == bookmarked_switch.active)
-             return;
-diff --git a/editor/delayed-setting-view.vala b/editor/delayed-setting-view.vala
-index add6852..b1f774c 100644
---- a/editor/delayed-setting-view.vala
-+++ b/editor/delayed-setting-view.vala
-@@ -41,24 +41,24 @@ private class DelayedSettingView : OverlayedListRow
-         {
-             // at row creation, key is never ghost
-             _update_dconf_key_current_value (key_value,
--                                         ref key_value_label,
--                                         ref key_value_default);
-+                                             key_value_label,
-+                                             key_value_default);
- 
-             _update_dconf_key_planned_value (cool_planned_value,
--                                         ref planned_value_label,
--                                         ref planned_value_default);
-+                                             planned_value_label,
-+                                             planned_value_default);
-         }
-         else
-         {
-             _update_gsettings_key_current_value (key_value,
-                                                  has_schema_and_is_default,
--                                             ref key_value_label,
--                                             ref key_value_default);
-+                                                 key_value_label,
-+                                                 key_value_default);
- 
-             _update_gsettings_key_planned_value (cool_planned_value,
-                                                  (!) cool_default_value,
--                                             ref planned_value_label,
--                                             ref planned_value_default);
-+                                                 planned_value_label,
-+                                                 planned_value_default);
-         }
-     }
- 
-@@ -74,23 +74,23 @@ private class DelayedSettingView : OverlayedListRow
- 
-     private static inline void _update_gsettings_key_planned_value (string? cool_planned_value,
-                                                                     string  cool_default_value,
--                                                                ref Label   planned_value_label,
--                                                                ref Label   planned_value_default)
-+                                                                    Label   planned_value_label,
-+                                                                    Label   planned_value_default)
-     {
-         bool is_default = cool_planned_value == null;
-         planned_value_label.label = is_default ? cool_default_value : (!) cool_planned_value;
--        update_value_default_label (is_default, ref planned_value_default);
-+        update_value_default_label (is_default, planned_value_default);
-     }
- 
-     private static inline void _update_dconf_key_planned_value (string? cool_planned_value,
--                                                            ref Label   planned_value_label,
--                                                            ref Label   planned_value_default)
-+                                                                Label   planned_value_label,
-+                                                                Label   planned_value_default)
-     {
-         if (cool_planned_value == null)
--            update_labels_dconf_key_erased (ref planned_value_label, ref planned_value_default);
-+            update_labels_dconf_key_erased (planned_value_label, planned_value_default);
-         else
-             update_labels_dconf_key_values ((!) cool_planned_value,
--                                            ref planned_value_label, ref planned_value_default);
-+                                            planned_value_label, planned_value_default);
-     }
- 
-     /*\
-@@ -99,37 +99,37 @@ private class DelayedSettingView : OverlayedListRow
- 
-     internal void update_gsettings_key_current_value (Variant key_value, bool is_default)
-     {
--        _update_gsettings_key_current_value (key_value, is_default, ref key_value_label, ref key_value_default);
-+        _update_gsettings_key_current_value (key_value, is_default, key_value_label, key_value_default);
-     }
-     private static void _update_gsettings_key_current_value (Variant key_value,
-                                                              bool    is_default,
--                                                         ref Label   key_value_label,
--                                                         ref Label   key_value_default)
-+                                                             Label   key_value_label,
-+                                                             Label   key_value_default)
-     {
-         key_value_label.label = Key.cool_text_value_from_variant (key_value);
--        update_value_default_label (is_default, ref key_value_default);
-+        update_value_default_label (is_default, key_value_default);
-     }
- 
-     internal void update_dconf_key_current_value (Variant? key_value_or_null)
-     {
--        _update_dconf_key_current_value (key_value_or_null, ref key_value_label, ref key_value_default);
-+        _update_dconf_key_current_value (key_value_or_null, key_value_label, key_value_default);
-     }
-     private static void _update_dconf_key_current_value (Variant? key_value_or_null,
--                                                     ref Label    key_value_label,
--                                                     ref Label    key_value_default)
-+                                                         Label    key_value_label,
-+                                                         Label    key_value_default)
-     {
-         if (key_value_or_null == null)
--            update_labels_dconf_key_erased (ref key_value_label, ref key_value_default);
-+            update_labels_dconf_key_erased (key_value_label, key_value_default);
-         else
-             update_labels_dconf_key_values (Key.cool_text_value_from_variant ((!) key_value_or_null),
--                                            ref key_value_label, ref key_value_default);
-+                                            key_value_label, key_value_default);
-     }
- 
-     /*\
-     * * common utilities
-     \*/
- 
--    private static void update_labels_dconf_key_erased (ref Label value_label, ref Label value_default)
-+    private static void update_labels_dconf_key_erased (Label value_label, Label value_default)
-     {
-         value_label.visible = false;
-         /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for dconf keys */
-@@ -137,14 +137,14 @@ private class DelayedSettingView : OverlayedListRow
-         value_default.visible = true;
-     }
- 
--    private static void update_labels_dconf_key_values (string key_value, ref Label value_label, ref Label value_default)
-+    private static void update_labels_dconf_key_values (string key_value, Label value_label, Label value_default)
-     {
-         value_default.visible = false;
-         value_label.label = key_value;  // TODO move Key.cool_text_value_from_variant here?
-         value_label.visible = true;
-     }
- 
--    private static void update_value_default_label (bool is_default, ref Label value_default)
-+    private static void update_value_default_label (bool is_default, Label value_default)
-     {
-         if (is_default)
-             /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for gsettings keys */
-diff --git a/editor/overlayed-list.vala b/editor/overlayed-list.vala
-index 8b0ec51..bcdfc3a 100644
---- a/editor/overlayed-list.vala
-+++ b/editor/overlayed-list.vala
-@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
-     internal void set_window_size (AdaptativeWidget.WindowSize new_size)
-     {
-         if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
--            set_horizontal (ref main_context, ref edit_mode_box);
-+            set_horizontal (ref main_context, edit_mode_box);
-         else
--            set_vertical (ref main_context, ref edit_mode_box);
-+            set_vertical (ref main_context, edit_mode_box);
-     }
--    private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
-+    private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
-     {
-         main_context.remove_class ("vertical");
-         edit_mode_box.halign = Align.END;
-@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
-         edit_mode_box.width_request = 160;
-         main_context.add_class ("horizontal");
-     }
--    private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
-+    private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
-     {
-         main_context.remove_class ("horizontal");
-         edit_mode_box.halign = Align.CENTER;
-@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal bool next_match ()
-     {
--        return _next_match (ref main_list_box);
-+        return _next_match (main_list_box);
-     }
--    private static inline bool _next_match (ref ListBox main_list_box)
-+    private static inline bool _next_match (ListBox main_list_box)
-     {
-         ListBoxRow? row = main_list_box.get_selected_row ();    // TODO multiple rows and focus-only lists
-         if (row == null)
-@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-         if (row == null)
-         {
--            _scroll_bottom (ref main_list_box);
-+            _scroll_bottom (main_list_box);
-             return false;
-         }
-         main_list_box.select_row ((!) row);
-@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal bool previous_match ()
-     {
--        return _previous_match (ref main_list_box);
-+        return _previous_match (main_list_box);
-     }
--    private static inline bool _previous_match (ref ListBox main_list_box)
-+    private static inline bool _previous_match (ListBox main_list_box)
-     {
-         uint n_items = main_list_box.get_children ().length ();  // FIXME OverlayedList.n_items is unreliable
-         if (n_items == 0)
-@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     protected int [] get_selected_rows_indices ()
-     {
--        return _get_selected_rows_indices (ref main_list_box);
-+        return _get_selected_rows_indices (main_list_box);
-     }
--    private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
-+    private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
-     {
-         int [] indices = new int [0];
-         main_list_box.selected_foreach ((_list_box, selected_row) => {
-@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     protected void scroll_top ()
-     {
--        _scroll_top (ref main_list_box);
-+        _scroll_top (main_list_box);
-     }
--    private static inline void _scroll_top (ref ListBox main_list_box)
-+    private static inline void _scroll_top (ListBox main_list_box)
-     {
-         Adjustment adjustment = main_list_box.get_adjustment ();
-         adjustment.set_value (adjustment.get_lower ());
-@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     protected void scroll_bottom ()
-     {
--        _scroll_bottom (ref main_list_box);
-+        _scroll_bottom (main_list_box);
-     }
--    private static inline void _scroll_bottom (ref ListBox main_list_box)
-+    private static inline void _scroll_bottom (ListBox main_list_box)
-     {
-         Adjustment adjustment = main_list_box.get_adjustment ();
-         adjustment.set_value (adjustment.get_upper ());
-@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal bool handle_copy_text (out string copy_text)
-     {
--        return _handle_copy_text (out copy_text, ref main_list_box);
-+        return _handle_copy_text (out copy_text, main_list_box);
-     }
--    private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
-+    private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
-     {
-         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
-         OverlayedListRow row;
-@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal SelectionState get_selection_state ()
-     {
--        return _get_selection_state (ref main_list_box, ref main_list_store);
-+        return _get_selection_state (main_list_box, ref main_list_store);
-     }
--    private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
-+    private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
-     {
-         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
-         uint n_selected_rows = selected_rows.length ();
-diff --git a/editor/pathentry.vala b/editor/pathentry.vala
-index 5000b21..5c7efc5 100644
---- a/editor/pathentry.vala
-+++ b/editor/pathentry.vala
-@@ -133,9 +133,9 @@ private class PathEntry : Box, AdaptativeWidget
- 
-     internal void entry_grab_focus_without_selecting ()
-     {
--        _entry_grab_focus_without_selecting (ref search_entry);
-+        _entry_grab_focus_without_selecting (search_entry);
-     }
--    private static void _entry_grab_focus_without_selecting (ref BrowserEntry search_entry)
-+    private static void _entry_grab_focus_without_selecting (BrowserEntry search_entry)
-     {
-         if (search_entry.text_length != 0)
-         {
-@@ -172,36 +172,36 @@ private class PathEntry : Box, AdaptativeWidget
-         requires (search_changed_handler != 0)
-     {
-         SignalHandler.block (search_entry, search_changed_handler);
--        _prepare (mode, nullable_search, ref current_path, ref search_entry);
-+        _prepare (mode, nullable_search, ref current_path, search_entry);
-         SignalHandler.unblock (search_entry, search_changed_handler);
-     }
- 
-     private static inline void _prepare (SearchMode   mode,
-                                          string?      nullable_search,
-                                      ref string       current_path,
--                                     ref BrowserEntry search_entry)
-+                                         BrowserEntry search_entry)
-     {
-         string search;
-         switch (mode)
-         {
-             case SearchMode.EDIT_PATH_MOVE_END:
-                 search = nullable_search == null ? current_path : (!) nullable_search;
--                _prepare_move_end (ref search, ref search_entry);
-+                _prepare_move_end (ref search, search_entry);
-                 return;
- 
-             case SearchMode.EDIT_PATH_SELECT_ALL:
-                 search = nullable_search == null ? current_path : (!) nullable_search;
--                _prepare_search (ref search, ref search_entry);
-+                _prepare_search (ref search, search_entry);
-                 return;
- 
-             case SearchMode.EDIT_PATH_SELECT_LAST_WORD:
-                 search = current_path;
--                _prepare_select_last_word (ref search, ref search_entry);
-+                _prepare_select_last_word (ref search, search_entry);
-                 return;
- 
-             case SearchMode.SEARCH:
-                 search = "";
--                _prepare_search (ref search, ref search_entry);
-+                _prepare_search (ref search, search_entry);
-                 return;
- 
-             case SearchMode.UNCLEAR:
-@@ -210,19 +210,19 @@ private class PathEntry : Box, AdaptativeWidget
-         }
-     }
- 
--    private static inline void _prepare_move_end (ref string text, ref BrowserEntry search_entry)
-+    private static inline void _prepare_move_end (ref string text, BrowserEntry search_entry)
-     {
-         search_entry.text = text;
--        _entry_grab_focus_without_selecting (ref search_entry);
-+        _entry_grab_focus_without_selecting (search_entry);
-     }
- 
--    private static inline void _prepare_search (ref string text, ref BrowserEntry search_entry)
-+    private static inline void _prepare_search (ref string text, BrowserEntry search_entry)
-     {
-         search_entry.text = text;
-         search_entry.grab_focus ();
-     }
- 
--    private static inline void _prepare_select_last_word (ref string current_path, ref BrowserEntry search_entry)
-+    private static inline void _prepare_select_last_word (ref string current_path, BrowserEntry search_entry)
-     {
-         search_entry.move_cursor (MovementStep.DISPLAY_LINE_ENDS, -1, false);
-         search_entry.text = current_path;
-diff --git a/editor/registry-list.vala b/editor/registry-list.vala
-index 74b7f99..54aa6fa 100644
---- a/editor/registry-list.vala
-+++ b/editor/registry-list.vala
-@@ -291,9 +291,9 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget
- 
-     internal bool handle_copy_text (out string copy_text) // can compile with "private", but is public 1/2
-     {
--        return _handle_copy_text (out copy_text, ref key_list_box);
-+        return _handle_copy_text (out copy_text, key_list_box);
-     }
--    private bool _handle_copy_text (out string copy_text, ref ListBox key_list_box)
-+    private bool _handle_copy_text (out string copy_text, ListBox key_list_box)
-     {
-         ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row ();
-         if (selected_row == null)
-@@ -1138,7 +1138,7 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget
-     * * headers
-     \*/
- 
--    protected static bool is_first_row (int row_index, ref unowned ListBoxRow? before)
-+    protected static bool is_first_row (int row_index, ListBoxRow? before)
-     {
-         bool is_first_row = row_index == 0;
-         if (is_first_row != (before == null))
-diff --git a/editor/registry-search.vala b/editor/registry-search.vala
-index 220583f..eb8e6f2 100644
---- a/editor/registry-search.vala
-+++ b/editor/registry-search.vala
-@@ -48,7 +48,7 @@ private class RegistrySearch : RegistryList
- 
-     internal bool handle_alt_copy_text (out string copy_text)
-     {
--        return _handle_alt_copy_text (out copy_text, ref key_list_box);
-+        return _handle_alt_copy_text (out copy_text, key_list_box);
-     }
- 
-     internal void clean ()
-@@ -145,7 +145,7 @@ private class RegistrySearch : RegistryList
-     * * Keyboard calls
-     \*/
- 
--    private static bool _handle_alt_copy_text (out string copy_text, ref ListBox key_list_box)
-+    private static bool _handle_alt_copy_text (out string copy_text, ListBox key_list_box)
-     {
-         ListBoxRow? selected_row = key_list_box.get_selected_row ();
-         if (selected_row == null)
-@@ -521,7 +521,7 @@ private class RegistrySearch : RegistryList
-     private void update_row_header (ListBoxRow row, ListBoxRow? before)
-     {
-         int row_index = row.get_index ();
--        if (is_first_row (row_index, ref before))
-+        if (is_first_row (row_index, before))
-             return;
- 
-         if (search_is_path_search)
-diff --git a/editor/registry-view.vala b/editor/registry-view.vala
-index e0ff379..7d9eb1f 100644
---- a/editor/registry-view.vala
-+++ b/editor/registry-view.vala
-@@ -114,7 +114,7 @@ private class RegistryView : RegistryList
- 
-     private void update_row_header (ListBoxRow row, ListBoxRow? before)
-     {
--        if (is_first_row (row.get_index (), ref before))
-+        if (is_first_row (row.get_index (), before))
-             return;
-         update_row_header_with_context (row, (!) before, modifications_handler.model, /* local search header */ false);
-     }
--- 
-2.30.1
-
diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb
similarity index 65%
rename from meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb
rename to meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb
index 776558ebf..5b68467a1 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb
@@ -8,9 +8,7 @@ DEPENDS = "dconf gtk+3"
 
 inherit gnomebase vala gettext gsettings bash-completion
 
-SRC_URI += "file://0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch"
-
-SRC_URI[archive.sha256sum] = "1253dad87e6213fbf313ff9ec9dc4358aa1b10261f28072c1dc0e0997b92f835"
+SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-- 
2.31.1

[PATCH 12/20] libwnck3: upgrade 3.36.0 -> 40.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../libwnck/{libwnck3_3.36.0.bb => libwnck3_40.0.bb}        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta-gnome/recipes-gnome/libwnck/{libwnck3_3.36.0.bb => libwnck3_40.0.bb} (81%)

diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb
similarity index 81%
rename from meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb
rename to meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb
index 8bca93f6d..bfb52e5bb 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb
@@ -17,8 +17,10 @@ GIR_MESON_DISABLE_FLAG = 'disabled'
 
 inherit gnomebase gobject-introspection gtk-doc gettext features_check
 
-SRC_URI[archive.md5sum] = "00bb40dc6fab76af0da33e88a34b6378"
-SRC_URI[archive.sha256sum] = "bc508150b3ed5d22354b0e6774ad4eee465381ebc0ace45eb0e2d3a4186c925f"
+def gnome_verdir(v):
+    return oe.utils.trim_version(v, 1)
+
+SRC_URI[archive.sha256sum] = "30cb79a839f90cd66f3e202f3f98cb5166fa0cd9b92eb571ad9c470a43021d83"
 
 # libxres means x11 only
 REQUIRED_DISTRO_FEATURES = "x11"
-- 
2.31.1

[PATCH 13/20] babl: upgrade 0.1.84 -> 0.1.86

[Andreas Müller]

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

diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb
similarity index 87%
rename from meta-gnome/recipes-gimp/babl/babl_0.1.84.bb
rename to meta-gnome/recipes-gimp/babl/babl_0.1.86.bb
index b49d9d7e8..d264bf8c5 100644
--- a/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb
+++ b/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb
@@ -15,6 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore "
 CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore "
 
 SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
-SRC_URI[sha256sum] = "e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea"
+SRC_URI[sha256sum] = "0b3f595159ad1b216cd729c0504c3a5f6cf780c641f4dc63fc164f3c0382c8f0"
 
 BBCLASSEXTEND = "native"
-- 
2.31.1

[PATCH 14/20] gimp: upgrade 2.10.22 -> 2.10.24

[Andreas Müller]

Backported patch can go

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...-with-linux-input-handling-with-upco.patch | 58 -------------------
 .../gimp/{gimp_2.10.22.bb => gimp_2.10.24.bb} |  6 +-
 2 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch
 rename meta-gnome/recipes-gimp/gimp/{gimp_2.10.22.bb => gimp_2.10.24.bb} (90%)

diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch
deleted file mode 100644
index 7e12487c7..000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1b66e4cca6d95f4607599bcbdd4afeb601aee84e Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 25 Oct 2020 18:09:21 +0000
-Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming autoconf-2.70
-
-Upcoming autoconf-2.70 exposes deficiency in configure.ac:
-
-```
-$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
-./configure: line 1430: 5: Bad file descriptor
-checking whether  is declared... ./configure: line 1432: ${+y}: bad
-```
-
-It happens because macros are called with parameters using insufficient quoting.
-
-More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
-
-The fix only amends `--with-linux-input`. Other cases of underquoting
-will need to be handled separately.
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cebeb90a87105cd6e35bcb357d53cc04c828ca21]
-Fix-by: Zack Weinberg
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6e2c193..afbcdd8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2138,15 +2138,14 @@ fi
- AC_ARG_WITH(linux-input, [  --without-linux-input   don't build linux input event controller module])
- 
- have_linux_input="no (linux input support disabled)"
--if test "x$with_linux_input" != "xno"; then
--  AC_CHECK_HEADER(linux/input.h,
--	AC_CHECK_DECL(KEY_OK,
--		have_linux_input=yes,
--		have_linux_input="no (needs Linux 2.6)",
--		[#include <linux/input.h>]))
--fi
--
--AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
-+AS_IF([test "x$with_linux_input" != "xno"],
-+  [AC_CHECK_HEADER([linux/input.h],
-+    [AC_CHECK_DECL([KEY_OK],
-+                   [have_linux_input=yes],
-+                   [have_linux_input="no (needs Linux 2.6)"],
-+                   [#include <linux/input.h>])])])
-+
-+AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
- 
- 
- ###############################
--- 
-2.30.0
-
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
similarity index 90%
rename from meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
rename to meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
index 717716e1f..237d08a09 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
@@ -43,10 +43,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SHPV = "${@gnome_verdir("${PV}")}"
 
-SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \
-           file://0001-configure.ac-fix-with-linux-input-handling-with-upco.patch \
-          "
-SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb"
+SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e"
 
 EXTRA_OECONF = "--disable-python \
                 --without-webkit \
-- 
2.31.1

[PATCH 15/20] gegl: add PACKAGECONFIG libraw and enable it by default

[Andreas Müller]

Without gnome-photos fails to start and complains:
| (org.gnome.Photos:952): gnome-photos-WARNING **: 08:02:54.154: Unable to find GEGL operation gegl:raw-load: Check your GEGL install
| (org.gnome.Photos:952): gnome-photos-CRITICAL **: 08:02:54.154: photos_application_create_window: assertion 'gegl_sanity_checked' failed

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
index d08a3a3c9..06abf799e 100644
--- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
+++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
@@ -28,7 +28,7 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd"
 
-PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2"
+PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg sdl2"
 PACKAGECONFIG_class-native = "libpng librsvg"
 
 PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper"
@@ -38,6 +38,7 @@ PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg"
 PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
 PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav"
 PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng"
+PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw"
 PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg"
 PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl"
 PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2"
-- 
2.31.1

[PATCH 16/20] gegl: add poppler PCAKAGECONFIG and enable it by default

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
index 06abf799e..bb0cd1f8a 100644
--- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
+++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
@@ -28,7 +28,7 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd"
 
-PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg sdl2"
+PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg poppler sdl2"
 PACKAGECONFIG_class-native = "libpng librsvg"
 
 PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper"
@@ -40,6 +40,7 @@ PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav"
 PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng"
 PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw"
 PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg"
+PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler"
 PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl"
 PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2"
 PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff"
-- 
2.31.1

[PATCH 17/20] Revert "gimp: Disable svg icons on arm"

[Andreas Müller]

gimp builds without issues on armv7 / gcc 11.1.0

This reverts commit 57a7c1ed7d45b28cadd70d8fabda42fe906ddff7.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
index 237d08a09..e729d9deb 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
@@ -54,7 +54,7 @@ EXTRA_OECONF = "--disable-python \
 EXTRA_OECONF_append_mipsarch = " --disable-vector-icons"
 EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons"
 EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons"
-EXTRA_OECONF_append_arm = " --disable-vector-icons"
+EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons"
 
 do_configure_append() {
     find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-- 
2.31.1

[PATCH 18/20] grilo-plugins: initial add 0.3.13

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../0001-Avoid-running-trackertestutils.patch | 34 +++++++++++++++++++
 .../grilo/grilo-plugins_0.3.13.bb             | 22 ++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch
 create mode 100644 meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb

diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch
new file mode 100644
index 000000000..a07cd49fd
--- /dev/null
+++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch
@@ -0,0 +1,34 @@
+From 9deaed70221a12e26f968be26233b75fa5669476 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 15 May 2021 23:25:09 +0200
+Subject: [PATCH] Avoid running trackertestutils
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It breaks configuration:
+| ../grilo-plugins-0.3.13/tests/tracker3/meson.build:5:0: ERROR: Program '/usr/lib/tracker-3.0/trackertestutils/tracker-sandbox' not found
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6a03778..17ef1e1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -78,7 +78,7 @@ totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required:
+ totem_plparser_mini_dep = dependency('totem-plparser-mini', version: '>= 3.4.1', required: false)
+ tracker_sparql_dep = dependency('tracker-sparql-2.0', version: '>= 2.3.0', required: false)
+ tracker3_dep = dependency('tracker-sparql-3.0', required: false)
+-tracker3_testutils_dep = dependency('tracker-testutils-3.0', required: false)
++tracker3_testutils_dep = dependency('tracker-testutils-3.0-avoid-find', required: false)
+ 
+ lua_dep = dependency('lua', version: '>= 5.3.0', required: false)
+ if not lua_dep.found()
+-- 
+2.31.1
+
diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb
new file mode 100644
index 000000000..4ead998c7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Grilo is a framework forsearching media content from various sources"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+DEPENDS = " \
+    glib-2.0-native \
+    gperf-native \
+    itstool-native \
+    grilo \
+    tracker \
+    lua \
+    liboauth \
+"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gnome-help vala
+
+SRC_URI += "file://0001-Avoid-running-trackertestutils.patch"
+SRC_URI[archive.sha256sum] = "1c4305d67364a930543836cc1982f30e946973b8ff6af3efe31d87709ab520f8"
+
+FILES_${PN} += "${libdir}/grilo-0.3"
-- 
2.31.1

[PATCH 19/20] gnome-photos: rrecommend grilo-plugins

[Andreas Müller]

Fixes:
| (org.gnome.Photos:952): gnome-photos-WARNING **: 08:02:54.011: Unable to activate Grilo's Flickr plugin: Plugin “grl-flickr” not available

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
index d26c61083..628b1eeea 100644
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
@@ -37,3 +37,5 @@ FILES_${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/gnome-shell \
 "
+
+RRECOMMENDS_${PN} = "grilo-plugins"
-- 
2.31.1

[PATCH 20/20] gnome-photos: Let all desktops add gnome-photos to their start menu

[Andreas Müller]

As a XFCE user I was wondering why gnome-photos was missing

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
index 628b1eeea..8a8306952 100644
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
@@ -32,6 +32,11 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af"
 
+do_install_append() {
+    # make gnome-photos available on all desktops
+    sed -i 's:OnlyShowIn=:#OnlyShowIn=:g' ${D}${datadir}/applications/org.gnome.Photos.desktop
+}
+
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/metainfo \
-- 
2.31.1

Re: [oe] [PATCH 17/20] Revert "gimp: Disable svg icons on arm"

[Khem Raj]

On Sat, May 15, 2021 at 4:39 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> gimp builds without issues on armv7 / gcc 11.1.0
>
> This reverts commit 57a7c1ed7d45b28cadd70d8fabda42fe906ddff7.
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> index 237d08a09..e729d9deb 100644
> --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> @@ -54,7 +54,7 @@ EXTRA_OECONF = "--disable-python \
>  EXTRA_OECONF_append_mipsarch = " --disable-vector-icons"
>  EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons"
>  EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons"
> -EXTRA_OECONF_append_arm = " --disable-vector-icons"
> +EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons"

thanks. I will verify it on gcc/musl and clang/musl scenarios and
perhaps its really the musl piece which is problematic
issue is qemu segfaults :(, qemu is also upgraded in master-next so
maybe even musl will start to work.

>
>  do_configure_append() {
>      find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
> --
> 2.31.1
>
>
> 
>

Re: [oe] [PATCH 15/20] gegl: add PACKAGECONFIG libraw and enable it by default

[Khem Raj]

On 5/15/21 4:38 PM, Andreas Müller wrote:
> Without gnome-photos fails to start and complains:
> | (org.gnome.Photos:952): gnome-photos-WARNING **: 08:02:54.154: Unable to find GEGL operation gegl:raw-load: Check your GEGL install
> | (org.gnome.Photos:952): gnome-photos-CRITICAL **: 08:02:54.154: photos_application_create_window: assertion 'gegl_sanity_checked' failed
> 
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>   meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> index d08a3a3c9..06abf799e 100644
> --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> @@ -28,7 +28,7 @@ SRC_URI = " \
>   "
>   SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd"
>   
> -PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2"
> +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg sdl2"
>   PACKAGECONFIG_class-native = "libpng librsvg"
>   
>   PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper"
> @@ -38,6 +38,7 @@ PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg"
>   PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
>   PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav"
>   PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng"
> +PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw"

there is no libraw recipe in core or meta-oe or meta-gnome we only have 
libraw1394

>   PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg"
>   PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl"
>   PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2"
> 
> 
> 
> 
> 

Re: [oe] [PATCH 15/20] gegl: add PACKAGECONFIG libraw and enable it by default

[Andreas Müller]

On Sun, May 16, 2021 at 3:07 AM Khem Raj <raj.khem@gmail.com> wrote:
>
>
>
> On 5/15/21 4:38 PM, Andreas Müller wrote:
> > Without gnome-photos fails to start and complains:
> > | (org.gnome.Photos:952): gnome-photos-WARNING **: 08:02:54.154: Unable to find GEGL operation gegl:raw-load: Check your GEGL install
> > | (org.gnome.Photos:952): gnome-photos-CRITICAL **: 08:02:54.154: photos_application_create_window: assertion 'gegl_sanity_checked' failed
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> >   meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> > index d08a3a3c9..06abf799e 100644
> > --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> > +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> > @@ -28,7 +28,7 @@ SRC_URI = " \
> >   "
> >   SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd"
> >
> > -PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2"
> > +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg sdl2"
> >   PACKAGECONFIG_class-native = "libpng librsvg"
> >
> >   PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper"
> > @@ -38,6 +38,7 @@ PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg"
> >   PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
> >   PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav"
> >   PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng"
> > +PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw"
>
> there is no libraw recipe in core or meta-oe or meta-gnome we only have
> libraw1394
>
I did not check properly - it is in meta-qt5-extra. Will send V2 adding libraw

Cheers

Andreas

Re: [oe] [PATCH 15/20] gegl: add PACKAGECONFIG libraw and enable it by default

[Khem Raj]

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

On Sun, May 16, 2021 at 12:57 AM Andreas Müller <schnitzeltony@gmail.com>
wrote:

> On Sun, May 16, 2021 at 3:07 AM Khem Raj <raj.khem@gmail.com> wrote:
> >
> >
> >
> > On 5/15/21 4:38 PM, Andreas Müller wrote:
> > > Without gnome-photos fails to start and complains:
> > > | (org.gnome.Photos:952): gnome-photos-WARNING **: 08:02:54.154:
> Unable to find GEGL operation gegl:raw-load: Check your GEGL install
> > > | (org.gnome.Photos:952): gnome-photos-CRITICAL **: 08:02:54.154:
> photos_application_create_window: assertion 'gegl_sanity_checked' failed
> > >
> > > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > > ---
> > >   meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb | 3 ++-
> > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> > > index d08a3a3c9..06abf799e 100644
> > > --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> > > +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
> > > @@ -28,7 +28,7 @@ SRC_URI = " \
> > >   "
> > >   SRC_URI[sha256sum] =
> "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd"
> > >
> > > -PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2"
> > > +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg sdl2"
> > >   PACKAGECONFIG_class-native = "libpng librsvg"
> > >
> > >   PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper"
> > > @@ -38,6 +38,7 @@ PACKAGECONFIG[jpeg] =
> "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg"
> > >   PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
> > >   PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav"
> > >   PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng"
> > > +PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw"
> >
> > there is no libraw recipe in core or meta-oe or meta-gnome we only have
> > libraw1394
> >
> I did not check properly - it is in meta-qt5-extra. Will send V2 adding
> libraw
>

I already sent a patch


> Cheers
>
> Andreas
>

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

Re: [oe] [PATCH 01/20] tracker: upgrade 2.3.6 -> 3.0.4

[Alexander Kanavin]

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

Thanks, just want to note that the new gnome version scheme doesn't use the
odd-even semantics anymore, so upstream-version-is-even should be dropped
from 40.x versions.

Alex

On Sun, 16 May 2021 at 01:39, Andreas Müller <schnitzeltony@gmail.com>
wrote:

> * huge bump is required for upcoming nautilus 40.1
> * PACKAGECONFIGS have no meson option anymore so remove them
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  .../{tracker_2.3.6.bb => tracker_3.0.4.bb}    | 21 ++++++++++---------
>  1 file changed, 11 insertions(+), 10 deletions(-)
>  rename meta-gnome/recipes-gnome/tracker/{tracker_2.3.6.bb =>
> tracker_3.0.4.bb} (59%)
>
> diff --git a/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb
> b/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb
> similarity index 59%
> rename from meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb
> rename to meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb
> index 2c11976ca..82e3d006e 100644
> --- a/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb
> +++ b/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb
> @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \
>  "
>
>  DEPENDS = " \
> -    libxml2-native \
>      dbus-native \
>      glib-2.0 \
>      sqlite3 \
> @@ -22,30 +21,32 @@ GNOMEBASEBUILDCLASS = "meson"
>
>  inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages
> bash-completion features_check
>
> -SRC_URI[archive.sha256sum] =
> "bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2"
> +SRC_URI[archive.sha256sum] =
> "c120d81f2df94aa794b1a7953b55cfa46de318ed68e6f3b5ad4fce0c729c2483"
>
>  # gobject-introspection is mandatory and cannot be configured
>  REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
>  UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
>
> -PACKAGECONFIG ??= "fts"
> -PACKAGECONFIG[networkmanager] =
> "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger"
> -# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set
> -PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false"
> +# text search is not an option anymore and requires sqlite3 build with
> +# PACKAGECONFIG[fts5] set (default)
>
>  # set required cross property sqlite3_has_fts5
>  do_write_config[vardeps] += "PACKAGECONFIG"
>  do_write_config_append() {
>      echo "[properties]" > ${WORKDIR}/meson-tracker.cross
> -    echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG',
> 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross
> +    echo "sqlite3_has_fts5 = 'true'" >> ${WORKDIR}/meson-tracker.cross
>  }
>
> -EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \
> -                 -Dsystemd_user_services=${systemd_user_unitdir} \
> +EXTRA_OEMESON = " \
> +    --cross-file ${WORKDIR}/meson-tracker.cross \
> +    -Dman=false \
> +    -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES',
> 'systemd', 'true', 'false', d)} \
> +    -Dsystemd_user_services_dir=${systemd_user_unitdir} \
>  "
>
>  FILES_${PN} += " \
>      ${datadir}/dbus-1 \
> -    ${libdir}/tracker-2.0 \
> +    ${datadir}/tracker3 \
> +    ${libdir}/tracker-3.0 \
>      ${systemd_user_unitdir} \
>  "
> --
> 2.31.1
>
>
> 
>
>

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

Re: [oe] [PATCH 01/20] tracker: upgrade 2.3.6 -> 3.0.4

[Andreas Müller]

On Sun, May 16, 2021 at 10:46 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Thanks, just want to note that the new gnome version scheme doesn't use the odd-even semantics anymore, so upstream-version-is-even should be dropped from 40.x versions.

Ahh - I thought you had sent an adjustment to
upstream-version-is-even.bbclass but it seems my read was not precise
enough. Interestingly there were no faults in my builds. Anyway will
send follow ups for 40.x recipes.

Cheers

Andreas

Re: [oe] [PATCH 01/20] tracker: upgrade 2.3.6 -> 3.0.4

[Alexander Kanavin]

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

On Sun, 16 May 2021 at 11:02, Andreas Müller <schnitzeltony@gmail.com>
wrote:

> On Sun, May 16, 2021 at 10:46 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > Thanks, just want to note that the new gnome version scheme doesn't use
> the odd-even semantics anymore, so upstream-version-is-even should be
> dropped from 40.x versions.
>
> Ahh - I thought you had sent an adjustment to
> upstream-version-is-even.bbclass but it seems my read was not precise
> enough. Interestingly there were no faults in my builds. Anyway will
> send follow ups for 40.x recipes.
>

Builds won't fail, but latest version reporting will be inaccurate (thus,
'devtool upgrade' as well). Check with 'devtool latest-version recipe' or
'devtool check-upgrade-status recipe'.

Alex

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

Re: [oe] [PATCH 17/20] Revert "gimp: Disable svg icons on arm"

[Andreas Müller]

On Sun, May 16, 2021 at 2:11 AM Khem Raj <raj.khem@gmail.com> wrote:
> > diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > index 237d08a09..e729d9deb 100644
> > --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > @@ -54,7 +54,7 @@ EXTRA_OECONF = "--disable-python \
> >  EXTRA_OECONF_append_mipsarch = " --disable-vector-icons"
> >  EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons"
> >  EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons"
> > -EXTRA_OECONF_append_arm = " --disable-vector-icons"
> > +EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons"
>
> thanks. I will verify it on gcc/musl and clang/musl scenarios and
> perhaps its really the musl piece which is problematic
> issue is qemu segfaults :(, qemu is also upgraded in master-next so
> maybe even musl will start to work.
>
> >
Hi Khem,

This starts getting interesting: Currently I see build failures on
gimp. This time not on svg conversion but for png. Something like

| mkdir -p `dirname 16/gimp-dashboard.png` && GEGL_USE_OPENCL=no
GEGL_SWAP=ram /home/superandy/tmp/oe-core-musl/work/cortexa72-mortsgna-linux-musl/gimp/2.10.24-r0/recipe-sysroot-native/usr/bin/gegl
../../../gimp-2.10.24/icons/Symbolic/16/gimp-dashboard.png -o
16/gimp-dashboard.png -- cast-format input-format="R'G'B'A float"
output-format="RGBA float" brightness-contrast contrast=1.5
cast-format input-format="RGBA float" output-format="R'G'B'A float"
| Fontconfig error: Cannot load default config file
| make[3]: *** [Makefile:2409: 16/gimp-dashboard.png] Segmentation
fault (core dumped)

This looks very similar to what you reported when all these
'--disable-vector-icons' started to come in.

Looked into and am convinced that this is not a architectural/musl
problem (btw - it is native gegl that crashes) but a race. GIMP-build
intended 2 steps:

1. create png/svg in ${B}/icons
2. let gegl convert these icons to *.c / *.xml

I think step 1 is not completed before step2 starts because on each
run segfault happens at different icon.

Long talk: Am working on this...

Cheers

Andreas

Re: [oe] [PATCH 17/20] Revert "gimp: Disable svg icons on arm"

[Khem Raj]

On Wed, Jun 9, 2021 at 3:34 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Sun, May 16, 2021 at 2:11 AM Khem Raj <raj.khem@gmail.com> wrote:
> > > diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > > index 237d08a09..e729d9deb 100644
> > > --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > > +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > > @@ -54,7 +54,7 @@ EXTRA_OECONF = "--disable-python \
> > >  EXTRA_OECONF_append_mipsarch = " --disable-vector-icons"
> > >  EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons"
> > >  EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons"
> > > -EXTRA_OECONF_append_arm = " --disable-vector-icons"
> > > +EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons"
> >
> > thanks. I will verify it on gcc/musl and clang/musl scenarios and
> > perhaps its really the musl piece which is problematic
> > issue is qemu segfaults :(, qemu is also upgraded in master-next so
> > maybe even musl will start to work.
> >
> > >
> Hi Khem,
>
> This starts getting interesting: Currently I see build failures on
> gimp. This time not on svg conversion but for png. Something like
>
> | mkdir -p `dirname 16/gimp-dashboard.png` && GEGL_USE_OPENCL=no
> GEGL_SWAP=ram /home/superandy/tmp/oe-core-musl/work/cortexa72-mortsgna-linux-musl/gimp/2.10.24-r0/recipe-sysroot-native/usr/bin/gegl
> ../../../gimp-2.10.24/icons/Symbolic/16/gimp-dashboard.png -o
> 16/gimp-dashboard.png -- cast-format input-format="R'G'B'A float"
> output-format="RGBA float" brightness-contrast contrast=1.5
> cast-format input-format="RGBA float" output-format="R'G'B'A float"
> | Fontconfig error: Cannot load default config file
> | make[3]: *** [Makefile:2409: 16/gimp-dashboard.png] Segmentation
> fault (core dumped)
>
> This looks very similar to what you reported when all these
> '--disable-vector-icons' started to come in.
>
> Looked into and am convinced that this is not a architectural/musl
> problem (btw - it is native gegl that crashes) but a race. GIMP-build
> intended 2 steps:
>
> 1. create png/svg in ${B}/icons
> 2. let gegl convert these icons to *.c / *.xml
>
> I think step 1 is not completed before step2 starts because on each
> run segfault happens at different icon.
>
> Long talk: Am working on this...
>

thats cool Andreas let me know how can I help.

> Cheers
>
> Andreas

Re: [oe] [PATCH 17/20] Revert "gimp: Disable svg icons on arm"

[Andreas Müller]

On Thu, Jun 10, 2021 at 12:34 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Sun, May 16, 2021 at 2:11 AM Khem Raj <raj.khem@gmail.com> wrote:
> > > diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > > index 237d08a09..e729d9deb 100644
> > > --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > > +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb
> > > @@ -54,7 +54,7 @@ EXTRA_OECONF = "--disable-python \
> > >  EXTRA_OECONF_append_mipsarch = " --disable-vector-icons"
> > >  EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons"
> > >  EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons"
> > > -EXTRA_OECONF_append_arm = " --disable-vector-icons"
> > > +EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons"
> >
> > thanks. I will verify it on gcc/musl and clang/musl scenarios and
> > perhaps its really the musl piece which is problematic
> > issue is qemu segfaults :(, qemu is also upgraded in master-next so
> > maybe even musl will start to work.
> >
> > >
> Hi Khem,
>
> This starts getting interesting: Currently I see build failures on
> gimp. This time not on svg conversion but for png. Something like
>
> | mkdir -p `dirname 16/gimp-dashboard.png` && GEGL_USE_OPENCL=no
> GEGL_SWAP=ram /home/superandy/tmp/oe-core-musl/work/cortexa72-mortsgna-linux-musl/gimp/2.10.24-r0/recipe-sysroot-native/usr/bin/gegl
> ../../../gimp-2.10.24/icons/Symbolic/16/gimp-dashboard.png -o
> 16/gimp-dashboard.png -- cast-format input-format="R'G'B'A float"
> output-format="RGBA float" brightness-contrast contrast=1.5
> cast-format input-format="RGBA float" output-format="R'G'B'A float"
> | Fontconfig error: Cannot load default config file
> | make[3]: *** [Makefile:2409: 16/gimp-dashboard.png] Segmentation
> fault (core dumped)
>
> This looks very similar to what you reported when all these
> '--disable-vector-icons' started to come in.
>
> Looked into and am convinced that this is not a architectural/musl
> problem
* Changed state from convinced to sure: repeating 'bitbake gimp' few
times without any changes finally turns build green
* Tested: Common workaround 'PARALLEL_MAKE = ""' does not help this
time. We need a proper fix - sigh
 To be continued... time for zzz...

Andreas