From eb5aa5a1cd9ae59b96611b54dafee4eab7403e52 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 1 Apr 2024 22:51:17 +0800 Subject: tracker: upgrade 3.7.0 -> 3.7.1 0001-fix-reproducibility.patch refreshed for 3.7.1. Changelog: ========== * Fix possible stalls in D-Bus endpoint batch updates * Better API documentation around handling of corrupted databases * Test improvements Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../tracker/tracker/0001-fix-reproducibility.patch | 17 +++---- meta-gnome/recipes-gnome/tracker/tracker_3.7.0.bb | 59 ---------------------- meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb | 59 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 69 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/tracker/tracker_3.7.0.bb create mode 100644 meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch index 4a11f8314b..4527f9efa3 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch +++ b/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch @@ -1,4 +1,4 @@ -From e5acd475f796420b4887969f2b0057dbf67979b3 Mon Sep 17 00:00:00 2001 +From ae34fb111e1f2498f37b21c0c32ace6c9928ad66 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 18 Sep 2023 02:47:55 +0200 Subject: [PATCH] tracker: fix reproducibility issue @@ -18,10 +18,10 @@ Signed-off-by: Markus Volk 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build -index 8442a216f..82844d7fd 100644 +index bc9f93a..6c86e5a 100644 --- a/meson.build +++ b/meson.build -@@ -348,7 +348,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD') +@@ -357,7 +357,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD') conf.set('HAVE_RTLD_NOLOAD', have_rtld_noload) # Config that goes in some other generated files (.desktop, .service, etc) @@ -30,7 +30,7 @@ index 8442a216f..82844d7fd 100644 conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) configure_file(input: 'config.h.meson.in', -@@ -388,8 +388,8 @@ subdir('docs') +@@ -396,8 +396,8 @@ subdir('docs') subdir('utils') test_c_args = tracker_c_args + [ @@ -42,7 +42,7 @@ index 8442a216f..82844d7fd 100644 tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker') diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build -index 9355d1c0d..cdbc05f28 100644 +index 9355d1c..cdbc05f 100644 --- a/src/libtracker-common/meson.build +++ b/src/libtracker-common/meson.build @@ -51,10 +51,10 @@ libtracker_common = static_library('tracker-common', @@ -59,10 +59,10 @@ index 9355d1c0d..cdbc05f28 100644 include_directories: [configinc, srcinc], gnu_symbol_visibility: 'hidden', diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build -index 36288f5c3..61086a697 100644 +index 4143eac..b73f1c9 100644 --- a/src/libtracker-sparql/meson.build +++ b/src/libtracker-sparql/meson.build -@@ -96,10 +96,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private', +@@ -98,10 +98,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private', c_args: [ '-include', 'libtracker-sparql/tracker-private.h', '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir), @@ -75,6 +75,3 @@ index 36288f5c3..61086a697 100644 ] + tracker_c_args, dependencies: [libtracker_sparql_dependencies, gvdb_dep], --- -2.41.0 - diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.7.0.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.7.0.bb deleted file mode 100644 index a41da6d46e..0000000000 --- a/meta-gnome/recipes-gnome/tracker/tracker_3.7.0.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "Tracker is a file search engine" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = " \ - file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" - -DEPENDS = " \ - dbus-native \ - python3-pygobject-native \ - glib-2.0 \ - sqlite3 \ - libarchive \ - dbus \ - icu \ - json-glib \ - libsoup-3.0 \ - libstemmer \ -" - - -inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native - -SRC_URI += "file://0001-fix-reproducibility.patch" -SRC_URI[archive.sha256sum] = "46b8c16ff289d9507baa112c717845a200fe3d1ffcc2324562e02c40db9a151d" - -# 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 = 'true'" >> ${WORKDIR}/meson-tracker.cross -} - -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} \ - -Dsoup=soup3 \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=enabled', '-Dvapi=disabled', d)} \ -" - -do_install:prepend() { - sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/tracker-sparql-enum-types.c - sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/core/tracker-data-enum-types.c -} - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/tracker3 \ - ${libdir}/tracker-3.0 \ - ${systemd_user_unitdir} \ -" diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb new file mode 100644 index 0000000000..1d5c79ab4d --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb @@ -0,0 +1,59 @@ +SUMMARY = "Tracker is a file search engine" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + dbus-native \ + python3-pygobject-native \ + glib-2.0 \ + sqlite3 \ + libarchive \ + dbus \ + icu \ + json-glib \ + libsoup-3.0 \ + libstemmer \ +" + + +inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native + +SRC_URI += "file://0001-fix-reproducibility.patch" +SRC_URI[archive.sha256sum] = "cd91b885ee9839cde5387f8e05ed24a7108d1627629cb6b1b2aa51a9603e130a" + +# 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 = 'true'" >> ${WORKDIR}/meson-tracker.cross +} + +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} \ + -Dsoup=soup3 \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=enabled', '-Dvapi=disabled', d)} \ +" + +do_install:prepend() { + sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/tracker-sparql-enum-types.c + sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/core/tracker-data-enum-types.c +} + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/tracker3 \ + ${libdir}/tracker-3.0 \ + ${systemd_user_unitdir} \ +" -- cgit v1.2.3-54-g00ecf