From 448d57649d61ef494d140e8bbdeb5e26b4dd6330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 16 May 2021 01:38:34 +0200 Subject: [PATCH] tracker: upgrade 2.3.6 -> 3.0.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * huge bump is required for upcoming nautilus 40.1 * PACKAGECONFIGS have no meson option anymore so remove them Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../{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 2c11976ca6..82e3d006e4 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} \ "