diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch index dd55256166..c6b07dc6c1 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch @@ -39,21 +39,6 @@ index 935584185..aa6126081 100644 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64 # directory, following the existing convention in that directory. -@@ -421,10 +421,10 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib - tracker_extract_rules_dir = join_paths(get_option('prefix'), get_option('datadir'), tracker_versioned_name, 'extract-rules') - tracker_miner_services_dir = join_paths(get_option('prefix'), get_option('datadir'), tracker_versioned_name, 'miners') - --tracker_uninstalled_cli_subcommands_dir = meson.current_build_dir() / 'src' / 'tracker' / 'subcommands' --tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract', 'uninstalled-rules') --tracker_uninstalled_writeback_modules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-writeback') --uninstalled_tracker_extract_path = join_paths(meson.current_build_dir(), 'src', 'tracker-extract', 'tracker-extract-3') -+tracker_uninstalled_cli_subcommands_dir = '/usr/src/debug/tracker/src/tracker/subcommands' -+tracker_uninstalled_extract_rules_dir = join_paths('usr', 'src', 'debug', 'tracker', 'src', 'tracker-extract', 'uninstalled-rules') -+tracker_uninstalled_writeback_modules_dir = join_paths('usr', 'src', 'debug', 'tracker', 'src', 'tracker-writeback') -+uninstalled_tracker_extract_path = join_paths('usr', 'src', 'debug', 'tracker', 'src', 'tracker-extract', 'tracker-extract-3') - - gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas') - po_dir = join_paths(meson.current_source_dir(), 'po') @@ -438,8 +438,8 @@ subdir('data') subdir('docs') @@ -65,18 +50,6 @@ index 935584185..aa6126081 100644 ] if get_option('tests_tap_protocol') -@@ -454,9 +454,9 @@ run_uninstalled_conf = configuration_data() - run_uninstalled_conf.set('tracker_sparql_uninstalled_dir', tracker_sparql_uninstalled_dir) - run_uninstalled_conf.set('tracker_uninstalled_cli_dir', tracker_uninstalled_cli_dir) - run_uninstalled_conf.set('tracker_uninstalled_cli_subcommands_dir', tracker_uninstalled_cli_subcommands_dir) --run_uninstalled_conf.set('tracker_uninstalled_domain_rule', meson.current_build_dir() / 'tests' / 'functional-tests' / 'config' / 'test-domain.rule') -+run_uninstalled_conf.set('tracker_uninstalled_domain_rule', '/usr/src/debug/tracker/tests/functional-tests/config/test-domain.rule') - run_uninstalled_conf.set('tracker_uninstalled_extract_rules_dir', tracker_uninstalled_extract_rules_dir) --run_uninstalled_conf.set('tracker_uninstalled_extractors_dir', meson.current_build_dir() / 'src' / 'tracker-extract') -+run_uninstalled_conf.set('tracker_uninstalled_extractors_dir', '/usr/src/debug/tracker/src/tracker-extract') - run_uninstalled_conf.set('tracker_uninstalled_miner_services_dir', tracker_uninstalled_miner_services_dir) - run_uninstalled_conf.set('tracker_uninstalled_testutils_dir', tracker_uninstalled_testutils_dir) - run_uninstalled_conf.set('tracker_uninstalled_writeback_modules_dir', tracker_uninstalled_writeback_modules_dir) diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build index 4aaad5c41..d17cce221 100644 --- a/src/tracker-extract/meson.build diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.0.bb similarity index 90% rename from meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb rename to meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.0.bb index 2be6beacbc..dfebd0d2e2 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.0.bb @@ -19,7 +19,7 @@ SRC_URI:append = " \ file://0001-fix-reproducibility.patch \ file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ " -SRC_URI[archive.sha256sum] = "0ad722f3d532c21d757cf488f942960679ea8f457925efa97656ed4c9e9ba4ff" +SRC_URI[archive.sha256sum] = "74e796c1625094a8a2175993c7907281e97ab6e002578e846b8f4ca44e36bf61" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" @@ -62,6 +62,7 @@ PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" PACKAGECONFIG[raw] = "-Draw=enabled,-Draw=disabled,libraw" PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanager" +PACKAGECONFIG[landlock] = "-Dlandlock=enabled,-Dlandlock=disabled" # For security reasons it is strongly recommended to set add meta-security in # your layers and 'libseccomp' to PACKAGECONFIG". @@ -75,9 +76,14 @@ EXTRA_OEMESON += " \ -Dsystemd_user_services_dir=${systemd_user_unitdir} \ " +do_install:append() { + sed -i -e 's|${B}||g' ${D}${libexecdir}/tracker-miner-fs-3 +} + FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/tracker3-miners \ + ${datadir} \ ${libdir}/tracker-miners-3.0 \ ${systemd_user_unitdir} \ " + +INSANE_SKIP:${PN} = "already-stripped"