diff options
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gnome')
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch | 42 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch (renamed from meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch) | 0 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb | 4 |
5 files changed, 8 insertions, 45 deletions
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 9db111e8ec..0000000000 --- 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 d8fffbb7e9..d8fffbb7e9 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 a769dbf7da..275fbaa699 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 b40787f3c9..e2ced395c1 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 ae9077147d..b36e66b452 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 \ |