diff options
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch | 15 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch | 104 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb (renamed from meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb) | 2 |
3 files changed, 62 insertions, 59 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/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch index 7a40ae338..36dd4a588 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/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch | |||
@@ -7,21 +7,22 @@ Upstream-Status: Inappropriate [embedded specific] | |||
7 | 7 | ||
8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | 8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> |
9 | --- | 9 | --- |
10 | src/libtracker-miners-common/tracker-miner-enum-types.c.template | 1 +- | 10 | .../tracker-miners-enum-types.c.template | 2 +- |
11 | 1 files changed, 1 insertions(+), 1 deletions(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template | 13 | diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template |
14 | index c712dda..cb449e2 100644 | 14 | index 4db7ef1..7c44c13 100644 |
15 | --- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template | 15 | --- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template |
16 | +++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template | 16 | +++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template |
17 | @@ -7,7 +7,7 @@ | 17 | @@ -7,7 +7,7 @@ |
18 | 18 | ||
19 | /*** BEGIN file-production ***/ | 19 | /*** BEGIN file-production ***/ |
20 | /* enumerations from "@basename@" */ | 20 | /* enumerations from "@basename@" */ |
21 | -#include "@filename@" | 21 | -#include "@filename@" |
22 | +#include "tracker-enums.h" | 22 | +#include "tracker-enums.h" |
23 | /*** END file-production ***/ | 23 | /*** END file-production ***/ |
24 | |||
25 | |||
26 | -- | ||
27 | 2.34.1 | ||
24 | 28 | ||
25 | |||
26 | -- | ||
27 | 2.25.1 | ||
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 98618e5d3..ea239c41f 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 | |||
@@ -12,16 +12,18 @@ Upstream-Status: Inappropriate [oe-specific] | |||
12 | 12 | ||
13 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | 13 | Signed-off-by: Markus Volk <f_l_k@t-online.de> |
14 | --- | 14 | --- |
15 | meson.build | 20 ++++++++++---------- | 15 | meson.build | 8 ++++---- |
16 | src/tracker-extract/meson.build | 2 +- | 16 | src/libtracker-miners-common/tracker-landlock.c | 4 ++-- |
17 | tests/tracker-miner-fs/meson.build | 2 +- | 17 | src/miners/fs/meson.build | 4 ++-- |
18 | 3 files changed, 12 insertions(+), 12 deletions(-) | 18 | src/tracker-extract/meson.build | 2 +- |
19 | tests/tracker-miner-fs/meson.build | 2 +- | ||
20 | 5 files changed, 10 insertions(+), 10 deletions(-) | ||
19 | 21 | ||
20 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
21 | index 935584185..aa6126081 100644 | 23 | index a838344..6945f63 100644 |
22 | --- a/meson.build | 24 | --- a/meson.build |
23 | +++ b/meson.build | 25 | +++ b/meson.build |
24 | @@ -380,7 +380,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) | 26 | @@ -393,7 +393,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) |
25 | conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) | 27 | conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) |
26 | 28 | ||
27 | # Config that goes in some other generated files (.desktop, .pc, etc) | 29 | # Config that goes in some other generated files (.desktop, .pc, etc) |
@@ -30,7 +32,7 @@ index 935584185..aa6126081 100644 | |||
30 | conf.set('exec_prefix', get_option('prefix')) | 32 | conf.set('exec_prefix', get_option('prefix')) |
31 | conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) | 33 | conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) |
32 | conf.set('datadir', datadir) | 34 | conf.set('datadir', datadir) |
33 | @@ -409,7 +409,7 @@ tracker_c_args = [ | 35 | @@ -422,7 +422,7 @@ tracker_c_args = [ |
34 | configinc = include_directories('./') | 36 | configinc = include_directories('./') |
35 | srcinc = include_directories('src/') | 37 | srcinc = include_directories('src/') |
36 | 38 | ||
@@ -39,7 +41,7 @@ index 935584185..aa6126081 100644 | |||
39 | 41 | ||
40 | # 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 |
41 | # directory, following the existing convention in that directory. | 43 | # directory, following the existing convention in that directory. |
42 | @@ -438,8 +438,8 @@ subdir('data') | 44 | @@ -451,8 +451,8 @@ subdir('data') |
43 | subdir('docs') | 45 | subdir('docs') |
44 | 46 | ||
45 | test_c_args = tracker_c_args + [ | 47 | test_c_args = tracker_c_args + [ |
@@ -50,11 +52,48 @@ index 935584185..aa6126081 100644 | |||
50 | ] | 52 | ] |
51 | 53 | ||
52 | 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 | ||
56 | index 95c652e..608cee4 100644 | ||
57 | --- a/src/libtracker-miners-common/tracker-landlock.c | ||
58 | +++ b/src/libtracker-miners-common/tracker-landlock.c | ||
59 | @@ -276,7 +276,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) | ||
60 | LANDLOCK_ACCESS_FS_READ_DIR); | ||
61 | } | ||
62 | } | ||
63 | - | ||
64 | +#if 0 | ||
65 | current_dir = g_get_current_dir (); | ||
66 | |||
67 | /* Detect running in-tree */ | ||
68 | @@ -296,7 +296,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) | ||
69 | in_tree_rules[i].flags); | ||
70 | } | ||
71 | } | ||
72 | - | ||
73 | +#endif | ||
74 | /* Add user cache for readonly databases */ | ||
75 | #ifdef 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 | ||
78 | index 6e58832..04750f8 100644 | ||
79 | --- a/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), | ||
82 | dependencies: tracker_miner_fs_deps, | ||
83 | c_args: [ | ||
84 | tracker_c_args, | ||
85 | - '-DBUILDROOT="@0@"'.format(meson.global_build_root()), | ||
86 | - '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'), | ||
87 | + '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'), | ||
88 | + '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'), | ||
89 | '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')), | ||
90 | ], | ||
91 | install: true, | ||
53 | 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 |
54 | index 4aaad5c41..d17cce221 100644 | 93 | index 16ce367..bbd494d 100644 |
55 | --- a/src/tracker-extract/meson.build | 94 | --- a/src/tracker-extract/meson.build |
56 | +++ b/src/tracker-extract/meson.build | 95 | +++ b/src/tracker-extract/meson.build |
57 | @@ -159,7 +159,7 @@ endif | 96 | @@ -158,7 +158,7 @@ endif |
58 | executable('tracker-extract-@0@'.format(tracker_api_major), | 97 | executable('tracker-extract-@0@'.format(tracker_api_major), |
59 | tracker_extract_sources, | 98 | tracker_extract_sources, |
60 | # 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 |
@@ -64,10 +103,10 @@ index 4aaad5c41..d17cce221 100644 | |||
64 | dependencies: tracker_extract_dependencies, | 103 | dependencies: tracker_extract_dependencies, |
65 | install: true, | 104 | install: true, |
66 | diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build | 105 | diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build |
67 | index e131b85ad..59e509fa6 100644 | 106 | index 8c081fd..9792082 100644 |
68 | --- a/tests/tracker-miner-fs/meson.build | 107 | --- a/tests/tracker-miner-fs/meson.build |
69 | +++ b/tests/tracker-miner-fs/meson.build | 108 | +++ b/tests/tracker-miner-fs/meson.build |
70 | @@ -19,7 +19,7 @@ libtracker_miner_test_c_args = [ | 109 | @@ -18,7 +18,7 @@ libtracker_miner_test_c_args = [ |
71 | ] | 110 | ] |
72 | 111 | ||
73 | libtracker_miner_test_environment = environment() | 112 | libtracker_miner_test_environment = environment() |
@@ -76,43 +115,6 @@ index e131b85ad..59e509fa6 100644 | |||
76 | 115 | ||
77 | libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql] | 116 | libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql] |
78 | 117 | ||
79 | |||
80 | diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build | ||
81 | index 6e5883288..04750f82b 100644 | ||
82 | --- a/src/miners/fs/meson.build | ||
83 | +++ b/src/miners/fs/meson.build | ||
84 | @@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major), | ||
85 | dependencies: tracker_miner_fs_deps, | ||
86 | c_args: [ | ||
87 | tracker_c_args, | ||
88 | - '-DBUILDROOT="@0@"'.format(meson.global_build_root()), | ||
89 | - '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'), | ||
90 | + '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'), | ||
91 | + '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'), | ||
92 | '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')), | ||
93 | ], | ||
94 | install: true, | ||
95 | diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c | ||
96 | index 27e7db65b..3021343eb 100644 | ||
97 | --- a/src/libtracker-miners-common/tracker-landlock.c | ||
98 | +++ b/src/libtracker-miners-common/tracker-landlock.c | ||
99 | @@ -276,7 +276,7 @@ | ||
100 | LANDLOCK_ACCESS_FS_READ_DIR); | ||
101 | } | ||
102 | } | ||
103 | - | ||
104 | +#if 0 | ||
105 | current_dir = g_get_current_dir (); | ||
106 | |||
107 | /* Detect running in-tree */ | ||
108 | @@ -296,7 +296,7 @@ | ||
109 | in_tree_rules[i].flags); | ||
110 | } | ||
111 | } | ||
112 | - | ||
113 | +#endif | ||
114 | /* Add user cache for readonly databases */ | ||
115 | #ifdef MINER_FS_CACHE_LOCATION | ||
116 | add_rule (landlock_fd, MINER_FS_CACHE_LOCATION, | ||
117 | -- | 118 | -- |
118 | 2.41.0 | 119 | 2.34.1 |
120 | |||
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb index 7bbee2a88..a1fefe6a0 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb | |||
@@ -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] = "50a3abe40cfb0b35ced43ec716dbf1368992e444ef7a0babf202c7ac6ab2f6f4" | 21 | SRC_URI[archive.sha256sum] = "eb4f2b288a0cbe9e614871cb0048274461cfe1cb8467ac817b102d3873dbcba5" |
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" |