diff options
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch (renamed from meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch) | 5 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch (renamed from meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch) | 20 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/localsearch_3.8.0.bb (renamed from meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb) | 6 |
3 files changed, 14 insertions, 17 deletions
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch index 36dd4a5881..606a3e9aac 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch +++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6f6d7e3995c370b8121206a7f9cc0d234553bbfe Mon Sep 17 00:00:00 2001 | 1 | From bad93f7aec96b1819f4027dbc06b337d2e2227f2 Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@fujitsu.com> | 2 | From: Lei Maohui <leimaohui@fujitsu.com> |
3 | Date: Thu, 15 Sep 2022 16:35:39 +0900 | 3 | Date: Thu, 15 Sep 2022 16:35:39 +0900 |
4 | Subject: [PATCH] Set header file to a fixed path instead of a host path. | 4 | Subject: [PATCH] Set header file to a fixed path instead of a host path. |
@@ -23,6 +23,3 @@ index 4db7ef1..7c44c13 100644 | |||
23 | /*** END file-production ***/ | 23 | /*** END file-production ***/ |
24 | 24 | ||
25 | 25 | ||
26 | -- | ||
27 | 2.34.1 | ||
28 | |||
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch index 0812e88a9e..8f9dcdc3e6 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch +++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1b7a34b7de9eb2ae776f7cf4dc6221f49b2395ee Mon Sep 17 00:00:00 2001 | 1 | From db5149a0c9297d1053c2d0c01ed116cdcf5d14f0 Mon Sep 17 00:00:00 2001 |
2 | From: Markus Volk <f_l_k@t-online.de> | 2 | From: Markus Volk <f_l_k@t-online.de> |
3 | Date: Tue, 12 Sep 2023 17:00:41 +0200 | 3 | Date: Tue, 12 Sep 2023 17:00:41 +0200 |
4 | Subject: [PATCH] meson: fix reproducibility | 4 | Subject: [PATCH] meson: fix reproducibility |
@@ -20,10 +20,10 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de> | |||
20 | 5 files changed, 10 insertions(+), 10 deletions(-) | 20 | 5 files changed, 10 insertions(+), 10 deletions(-) |
21 | 21 | ||
22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
23 | index 37f5148..18f4bfa 100644 | 23 | index 4a2994a..31b1798 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -393,7 +393,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) | 26 | @@ -371,7 +371,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) |
27 | conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) | 27 | conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) |
28 | 28 | ||
29 | # Config that goes in some other generated files (.desktop, .pc, etc) | 29 | # Config that goes in some other generated files (.desktop, .pc, etc) |
@@ -32,7 +32,7 @@ index 37f5148..18f4bfa 100644 | |||
32 | conf.set('exec_prefix', get_option('prefix')) | 32 | conf.set('exec_prefix', get_option('prefix')) |
33 | conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) | 33 | conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) |
34 | conf.set('datadir', datadir) | 34 | conf.set('datadir', datadir) |
35 | @@ -422,7 +422,7 @@ tracker_c_args = [ | 35 | @@ -400,7 +400,7 @@ tracker_c_args = [ |
36 | configinc = include_directories('./') | 36 | configinc = include_directories('./') |
37 | srcinc = include_directories('src/') | 37 | srcinc = include_directories('src/') |
38 | 38 | ||
@@ -41,7 +41,7 @@ index 37f5148..18f4bfa 100644 | |||
41 | 41 | ||
42 | # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64 | 42 | # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64 |
43 | # directory, following the existing convention in that directory. | 43 | # directory, following the existing convention in that directory. |
44 | @@ -451,8 +451,8 @@ subdir('data') | 44 | @@ -430,8 +430,8 @@ subdir('data') |
45 | subdir('docs') | 45 | subdir('docs') |
46 | 46 | ||
47 | test_c_args = tracker_c_args + [ | 47 | test_c_args = tracker_c_args + [ |
@@ -53,7 +53,7 @@ index 37f5148..18f4bfa 100644 | |||
53 | 53 | ||
54 | if get_option('tests_tap_protocol') | 54 | if get_option('tests_tap_protocol') |
55 | diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c | 55 | diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c |
56 | index 6d4510b..189d2fb 100644 | 56 | index 0aca8ed..e6c28b6 100644 |
57 | --- a/src/libtracker-miners-common/tracker-landlock.c | 57 | --- a/src/libtracker-miners-common/tracker-landlock.c |
58 | +++ b/src/libtracker-miners-common/tracker-landlock.c | 58 | +++ b/src/libtracker-miners-common/tracker-landlock.c |
59 | @@ -282,7 +282,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) | 59 | @@ -282,7 +282,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) |
@@ -75,10 +75,10 @@ index 6d4510b..189d2fb 100644 | |||
75 | #ifdef MINER_FS_CACHE_LOCATION | 75 | #ifdef MINER_FS_CACHE_LOCATION |
76 | add_rule (landlock_fd, MINER_FS_CACHE_LOCATION, | 76 | add_rule (landlock_fd, MINER_FS_CACHE_LOCATION, |
77 | diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build | 77 | diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build |
78 | index 6e58832..04750f8 100644 | 78 | index 42c4573..73577c3 100644 |
79 | --- a/src/miners/fs/meson.build | 79 | --- a/src/miners/fs/meson.build |
80 | +++ b/src/miners/fs/meson.build | 80 | +++ b/src/miners/fs/meson.build |
81 | @@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major), | 81 | @@ -68,8 +68,8 @@ executable('localsearch-@0@'.format(tracker_api_major), |
82 | dependencies: tracker_miner_fs_deps, | 82 | dependencies: tracker_miner_fs_deps, |
83 | c_args: [ | 83 | c_args: [ |
84 | tracker_c_args, | 84 | tracker_c_args, |
@@ -90,11 +90,11 @@ index 6e58832..04750f8 100644 | |||
90 | ], | 90 | ], |
91 | install: true, | 91 | install: true, |
92 | diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build | 92 | diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build |
93 | index 2e4f61d..b47581c 100644 | 93 | index 2584881..31411f2 100644 |
94 | --- a/src/tracker-extract/meson.build | 94 | --- a/src/tracker-extract/meson.build |
95 | +++ b/src/tracker-extract/meson.build | 95 | +++ b/src/tracker-extract/meson.build |
96 | @@ -158,7 +158,7 @@ endif | 96 | @@ -158,7 +158,7 @@ endif |
97 | executable('tracker-extract-@0@'.format(tracker_api_major), | 97 | executable('localsearch-extractor-@0@'.format(tracker_api_major), |
98 | tracker_extract_sources, | 98 | tracker_extract_sources, |
99 | # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387 | 99 | # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387 |
100 | - c_args: tracker_c_args + ['-I' + meson.build_root()], | 100 | - c_args: tracker_c_args + ['-I' + meson.build_root()], |
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb b/meta-gnome/recipes-gnome/tracker/localsearch_3.8.0.bb index 2b2dc7c4b6..916e489617 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb +++ b/meta-gnome/recipes-gnome/tracker/localsearch_3.8.0.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ | |||
7 | 7 | ||
8 | DEPENDS = " \ | 8 | DEPENDS = " \ |
9 | intltool-native \ | 9 | intltool-native \ |
10 | tracker \ | 10 | tinysparql \ |
11 | zlib \ | 11 | zlib \ |
12 | " | 12 | " |
13 | 13 | ||
@@ -18,7 +18,7 @@ SRC_URI:append = " \ | |||
18 | file://0001-fix-reproducibility.patch \ | 18 | file://0001-fix-reproducibility.patch \ |
19 | file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ | 19 | file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ |
20 | " | 20 | " |
21 | SRC_URI[archive.sha256sum] = "e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe" | 21 | SRC_URI[archive.sha256sum] = "e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9" |
22 | 22 | ||
23 | # gobject-introspection is mandatory and cannot be configured | 23 | # gobject-introspection is mandatory and cannot be configured |
24 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | 24 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" |
@@ -81,6 +81,6 @@ EXTRA_OEMESON += " \ | |||
81 | 81 | ||
82 | FILES:${PN} += " \ | 82 | FILES:${PN} += " \ |
83 | ${datadir} \ | 83 | ${datadir} \ |
84 | ${libdir}/tracker-miners-3.0 \ | 84 | ${libdir}/localsearch-3.0 \ |
85 | ${systemd_user_unitdir} \ | 85 | ${systemd_user_unitdir} \ |
86 | " | 86 | " |