7 files changed, 14 insertions, 49 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb
index 0cac52c05..60e4c2205 100644
--- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb
+++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb
@@ -9,8 +9,10 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "9652c2757e85d6caba657405cf794fbd"
-SRC_URI[archive.sha256sum] = "d6f98a455a271e7e169b5d35d290f4880f503cdf7593251572c9330941b5c3e5"
+SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b"
+
+# We don't not have ubuntu's appindicator (yet?)
+EXTRA_OEMESON = "-Dappindicator=no"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch
deleted file mode 100644
index 9db111e8e..000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 43c39b5685445242d071b3706af2903efa508b4a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 14 Jan 2020 12:58:27 +0100
-Subject: [PATCH] meson.build: do not hardcode 'linux' as
- host_machine().system() value
-
-In some build environmets such as OpenEmbedded this can be 'linux-gnueabi'
-or otherwise not exactly 'linux'.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- src/libsysprof/meson.build | 2 +-
- src/tools/meson.build      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build
-index 3449961..3c2d186 100644
---- a/src/libsysprof/meson.build
-+++ b/src/libsysprof/meson.build
-@@ -84,7 +84,7 @@ libsysprof_deps = [
-   librax_dep,
- ]
- 
--if host_machine.system() == 'linux'
-+if host_machine.system().contains('linux')
-   libsysprof_public_sources += [
-     'sysprof-memory-source.c',
-     'sysprof-perf-counter.c',
-diff --git a/src/tools/meson.build b/src/tools/meson.build
-index 670052a..3fb7f0c 100644
---- a/src/tools/meson.build
-+++ b/src/tools/meson.build
-@@ -2,7 +2,7 @@ tools_deps = [
-   libsysprof_capture_dep,
- ]
- 
--if get_option('libsysprof') and host_machine.system() == 'linux'
-+if get_option('libsysprof') and host_machine.system().contains('linux')
-   polkit_agent_dep = dependency('polkit-agent-1')
-   sysprof_cli = executable('sysprof-cli', 'sysprof-cli.c',
-     dependencies: tools_deps + [libsysprof_dep, polkit_dep, polkit_agent_dep],
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch
index d8fffbb7e..d8fffbb7e 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch
+++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb
index a769dbf7d..275fbaa69 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb
@@ -18,8 +18,7 @@ SRC_URI[archive.md5sum] = "3956e82b8744715006dde59e0ce8910b"
 SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108"
 SRC_URI += " \
     file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \
-    file://0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \
-    file://0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \
+    file://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \
 "
 
 PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb
index b40787f3c..e2ced395c 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb
@@ -60,6 +60,10 @@ PACKAGECONFIG[libseccomp] = ",,libseccomp"
 # not yet in meta-gnome
 PACKAGECONFIG[rss]        = "-Dminer_rss=true,-Dminer_rss=false,libgrss"
 
+EXTRA_OEMESON += " \
+    -Dsystemd_user_services=${systemd_user_unitdir} \
+"
+
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/tracker \
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb
index ae9077147..b36e66b45 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb
@@ -41,7 +41,9 @@ do_write_config_append() {
     echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross
 }
 
-EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross"
+EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \
+                 -Dsystemd_user_services=${systemd_user_unitdir} \
+"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc
index 0f4ae7d04..1bbeb2c48 100644
--- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc
+++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
 
-PV = "1.5.21"
+PV = "1.5.22"
 
 DEPENDS = "unicode-ucd"
 
@@ -13,7 +13,7 @@ SRC_URI = " \
     git://github.com/ibus/ibus.git \
     file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
 "
-SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d"
+SRCREV = "e3262f08b9e3efc57808700823b0622ec03a1b5f"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"