1 |
commit: 25033f03396aaf5eb5cac6d9212ac24857dc44d8 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 27 13:20:33 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 13:21:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25033f03 |
7 |
|
8 |
app-misc/tracker-miners: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
app-misc/tracker-miners/Manifest | 1 - |
14 |
.../files/2.1.5-libav-build-fix.patch | 29 -- |
15 |
.../tracker-miners/files/2.1.5-meson-fixes.patch | 322 --------------------- |
16 |
.../files/2.1.5-rss-symlink-fix1.patch | 42 --- |
17 |
.../files/2.1.5-rss-symlink-fix2.patch | 39 --- |
18 |
app-misc/tracker-miners/files/2.1.5-seccomp.patch | 42 --- |
19 |
app-misc/tracker-miners/files/2.1.5-test-fix.patch | 50 ---- |
20 |
.../tracker-miners/tracker-miners-2.1.5.ebuild | 142 --------- |
21 |
8 files changed, 667 deletions(-) |
22 |
|
23 |
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest |
24 |
index b60566f68f5..481551a583d 100644 |
25 |
--- a/app-misc/tracker-miners/Manifest |
26 |
+++ b/app-misc/tracker-miners/Manifest |
27 |
@@ -1,2 +1 @@ |
28 |
-DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605 |
29 |
DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2 |
30 |
|
31 |
diff --git a/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch b/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch |
32 |
deleted file mode 100644 |
33 |
index 580ecb34ba2..00000000000 |
34 |
--- a/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch |
35 |
+++ /dev/null |
36 |
@@ -1,29 +0,0 @@ |
37 |
-From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001 |
38 |
-From: Carlos Garnacho <carlosg@×××××.org> |
39 |
-Date: Mon, 10 Sep 2018 16:19:20 +0200 |
40 |
-Subject: [PATCH] build: Fix build with libav |
41 |
- |
42 |
-The extractor rules defined an array inside an array, which configure_file() |
43 |
-wouldn't accept. |
44 |
- |
45 |
-(cherry picked from commit fff231c16b2ad9a2824f09c5b81f31ee220fba6f) |
46 |
---- |
47 |
- src/tracker-extract/meson.build | 2 +- |
48 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
49 |
- |
50 |
-diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build |
51 |
-index 9834dc422..bf19f8bac 100644 |
52 |
---- a/src/tracker-extract/meson.build |
53 |
-+++ b/src/tracker-extract/meson.build |
54 |
-@@ -60,7 +60,7 @@ if libjpeg.found() |
55 |
- endif |
56 |
- |
57 |
- if generic_media_handler_name == 'libav' |
58 |
-- rules = ['90-libav-audio-generic.rule', ['90-libav-video-generic.rule']] |
59 |
-+ rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule'] |
60 |
- dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep] |
61 |
- modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]] |
62 |
- endif |
63 |
--- |
64 |
-2.17.0 |
65 |
- |
66 |
|
67 |
diff --git a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch |
68 |
deleted file mode 100644 |
69 |
index c8a3e6358df..00000000000 |
70 |
--- a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch |
71 |
+++ /dev/null |
72 |
@@ -1,322 +0,0 @@ |
73 |
-From 5bb0709044fabe496601277ab5ba11a03500babe Mon Sep 17 00:00:00 2001 |
74 |
-From: Mart Raudsepp <leio@g.o> |
75 |
-Date: Fri, 15 Feb 2019 00:15:08 +0200 |
76 |
-Subject: [PATCH 1/5] build: Add feature options for all external deps |
77 |
- |
78 |
-Automagic dependencies are bad for distributions. Add feature options |
79 |
-for all of them that didn't have it before. If no options are specified, |
80 |
-the behavior matches with before, but now it's possible to specify |
81 |
-exactly what is linked to and what isn't. |
82 |
- |
83 |
-Fixes: #39 |
84 |
---- |
85 |
- meson.build | 40 +++++++++++++++++++++------------------- |
86 |
- meson_options.txt | 37 +++++++++++++++++++++++++++++++++++++ |
87 |
- 2 files changed, 58 insertions(+), 19 deletions(-) |
88 |
- |
89 |
-diff --git a/meson.build b/meson.build |
90 |
-index fd536f2e6..4f0e9a968 100644 |
91 |
---- a/meson.build |
92 |
-+++ b/meson.build |
93 |
-@@ -1,4 +1,6 @@ |
94 |
--project('tracker-miners', 'c', 'vala', version: '2.1.5') |
95 |
-+project('tracker-miners', 'c', 'vala', |
96 |
-+ version: '2.1.5', |
97 |
-+ meson_version: '>=0.47') |
98 |
- |
99 |
- gnome = import('gnome') |
100 |
- i18n = import('i18n') |
101 |
-@@ -57,9 +59,9 @@ avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) |
102 |
- avformat = dependency('libavformat', version: '>= 0.8.4', required: false) |
103 |
- avutil = dependency('libavutil', version: '>= 0.8.4', required: false) |
104 |
- dbus = dependency('dbus-1', version: '> 1.3.1') |
105 |
--exempi = dependency('exempi-2.0', version: '> 2.1.0', required: false) |
106 |
--flac = dependency('flac', version: '> 1.2.1', required: false) |
107 |
--gexiv2 = dependency('gexiv2', required: false) |
108 |
-+exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp')) |
109 |
-+flac = dependency('flac', version: '> 1.2.1', required: get_option('flac')) |
110 |
-+gexiv2 = dependency('gexiv2', required: get_option('raw')) |
111 |
- gio = dependency('gio-2.0', version: '>' + glib_required) |
112 |
- gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required) |
113 |
- glib = dependency('glib-2.0', version: '>' + glib_required) |
114 |
-@@ -72,25 +74,25 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false) |
115 |
- gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false) |
116 |
- icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false) |
117 |
- icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false) |
118 |
--libcue = dependency('libcue', required: false) |
119 |
--libexif = dependency('libexif', version: '> 0.6', required: false) |
120 |
--libgsf = dependency('libgsf-1', version: '> 1.14.24', required: false) |
121 |
--libgxps = dependency('libgxps', required: false) |
122 |
--libiptcdata = dependency('libiptcdata', required: false) |
123 |
--libjpeg = dependency('libjpeg', required: false) |
124 |
--libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: false) |
125 |
--libpng = dependency('libpng', version: '> 0.89', required: false) |
126 |
-+libcue = dependency('libcue', required: get_option('cue')) |
127 |
-+libexif = dependency('libexif', version: '> 0.6', required: get_option('exif')) |
128 |
-+libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf')) |
129 |
-+libgxps = dependency('libgxps', required: get_option('xps')) |
130 |
-+libiptcdata = dependency('libiptcdata', required: get_option('iptc')) |
131 |
-+libjpeg = dependency('libjpeg', required: get_option('jpeg')) |
132 |
-+libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso')) |
133 |
-+libpng = dependency('libpng', version: '> 0.89', required: get_option('png')) |
134 |
- libseccomp = dependency('libseccomp', version: '>= 2.0', required: false) |
135 |
--libtiff = dependency('libtiff-4', required: false) |
136 |
--libxml2 = dependency('libxml-2.0', version: '> 2.6') |
137 |
--libvorbis = dependency('vorbisfile', version: '> 0.22') |
138 |
--poppler = dependency('poppler-glib', version: '> 0.16.0', required: false) |
139 |
--taglib = dependency('taglib_c', version: '> 1.6', required: false) |
140 |
--totem_plparser = dependency('totem-plparser', required: false) |
141 |
-+libtiff = dependency('libtiff-4', required: get_option('tiff')) |
142 |
-+libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml')) |
143 |
-+libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis')) |
144 |
-+poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf')) |
145 |
-+taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib')) |
146 |
-+totem_plparser = dependency('totem-plparser', required: get_option('playlist')) |
147 |
- upower = dependency('upower-glib', version: '> 0.9.0', required: false) |
148 |
- zlib = dependency('zlib') |
149 |
- |
150 |
--libgif = cc.find_library('gif', required: false) |
151 |
-+libgif = cc.find_library('gif', required: get_option('gif')) |
152 |
- libmath = cc.find_library('m', required: false) |
153 |
- |
154 |
- # FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid' |
155 |
-diff --git a/meson_options.txt b/meson_options.txt |
156 |
-index a91ac6c0f..5fce7a529 100644 |
157 |
---- a/meson_options.txt |
158 |
-+++ b/meson_options.txt |
159 |
-@@ -35,6 +35,43 @@ option('text', type: 'boolean', value: 'true', |
160 |
- option('unzip_ps_gz_files', type: 'boolean', value: 'true', |
161 |
- description: 'Enable extractor for PS.GZ metadata') |
162 |
- |
163 |
-+option('cue', type: 'feature', value: 'auto', |
164 |
-+ description: 'Support cue sheet parsing') |
165 |
-+option('exif', type: 'feature', value: 'auto', |
166 |
-+ description: 'Support EXIF metadata') |
167 |
-+option('flac', type: 'feature', value: 'auto', |
168 |
-+ description: 'Support extracting metadata from Flac audio') |
169 |
-+option('gif', type: 'feature', value: 'auto', |
170 |
-+ description: 'Support extracting metadata from GIF images') |
171 |
-+option('gsf', type: 'feature', value: 'auto', |
172 |
-+ description: 'Support extracting metadata from MS & Open Office documents') |
173 |
-+option('iptc', type: 'feature', value: 'auto', |
174 |
-+ description: 'Support IPTC photo metadata') |
175 |
-+option('iso', type: 'feature', value: 'auto', |
176 |
-+ description: 'Support ISO image parsing') |
177 |
-+option('jpeg', type: 'feature', value: 'auto', |
178 |
-+ description: 'Support extracting metadata from JPEG images') |
179 |
-+option('pdf', type: 'feature', value: 'auto', |
180 |
-+ description: 'Support extracting metadata from PDF documents') |
181 |
-+option('playlist', type: 'feature', value: 'auto', |
182 |
-+ description: 'Support extracting metadata from playlists (w/ Totem)') |
183 |
-+option('png', type: 'feature', value: 'auto', |
184 |
-+ description: 'Support extracting metadata from PNG images') |
185 |
-+option('raw', type: 'feature', value: 'auto', |
186 |
-+ description: 'Support extracting metadata from RAW photos') |
187 |
-+option('taglib', type: 'feature', value: 'auto', |
188 |
-+ description: 'Support writeback for audio files using Taglib') |
189 |
-+option('tiff', type: 'feature', value: 'auto', |
190 |
-+ description: 'Support extracting metadata from TIFF images') |
191 |
-+option('vorbis', type: 'feature', value: 'auto', |
192 |
-+ description: 'Support extracting metadata from Vorbis (ogg/etc) files') |
193 |
-+option('xml', type: 'feature', value: 'auto', |
194 |
-+ description: 'Support extracting metadata from XML and HTML documents') |
195 |
-+option('xmp', type: 'feature', value: 'auto', |
196 |
-+ description: 'Support XMP metadata') |
197 |
-+option('xps', type: 'feature', value: 'auto', |
198 |
-+ description: 'Support extracting metadata from XPS documents') |
199 |
-+ |
200 |
- option('battery_detection', type: 'combo', choices: ['auto', 'hal', 'upower', 'none'], value: 'auto', |
201 |
- description: 'Enable upower or HAL for battery/mains power detection') |
202 |
- option('charset_detection', type: 'combo', choices: ['auto', 'enca', 'icu', 'none'], value: 'auto', |
203 |
--- |
204 |
-2.17.0 |
205 |
- |
206 |
- |
207 |
-From b8c1768696c13275f5896374907fa192140ec922 Mon Sep 17 00:00:00 2001 |
208 |
-From: Mart Raudsepp <leio@g.o> |
209 |
-Date: Fri, 15 Feb 2019 00:18:09 +0200 |
210 |
-Subject: [PATCH 2/5] build: Fix minimum dep checks to allow the specified |
211 |
- version too |
212 |
- |
213 |
-Many of the minimum deps were expressed as "> x.y", but were meant to |
214 |
-allow x.y itself as well. Change all to ">= x.y". This seems to be |
215 |
-what was intended and was the case with autotools. |
216 |
---- |
217 |
- meson.build | 44 ++++++++++++++++++++++---------------------- |
218 |
- 1 file changed, 22 insertions(+), 22 deletions(-) |
219 |
- |
220 |
-diff --git a/meson.build b/meson.build |
221 |
-index 4f0e9a968..4263faf95 100644 |
222 |
---- a/meson.build |
223 |
-+++ b/meson.build |
224 |
-@@ -58,38 +58,38 @@ endif |
225 |
- avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) |
226 |
- avformat = dependency('libavformat', version: '>= 0.8.4', required: false) |
227 |
- avutil = dependency('libavutil', version: '>= 0.8.4', required: false) |
228 |
--dbus = dependency('dbus-1', version: '> 1.3.1') |
229 |
--exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp')) |
230 |
--flac = dependency('flac', version: '> 1.2.1', required: get_option('flac')) |
231 |
-+dbus = dependency('dbus-1', version: '>= 1.3.1') |
232 |
-+exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp')) |
233 |
-+flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac')) |
234 |
- gexiv2 = dependency('gexiv2', required: get_option('raw')) |
235 |
--gio = dependency('gio-2.0', version: '>' + glib_required) |
236 |
--gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required) |
237 |
--glib = dependency('glib-2.0', version: '>' + glib_required) |
238 |
--gmodule = dependency('gmodule-2.0', version: '>' + glib_required) |
239 |
--gobject = dependency('gobject-2.0', version: '>' + glib_required) |
240 |
-+gio = dependency('gio-2.0', version: '>=' + glib_required) |
241 |
-+gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required) |
242 |
-+glib = dependency('glib-2.0', version: '>=' + glib_required) |
243 |
-+gmodule = dependency('gmodule-2.0', version: '>=' + glib_required) |
244 |
-+gobject = dependency('gobject-2.0', version: '>=' + glib_required) |
245 |
- gstreamer = dependency('gstreamer-1.0', required: false) |
246 |
- gstreamer_pbutils = dependency('gstreamer-pbutils-1.0', required: false) |
247 |
- gstreamer_tag = dependency('gstreamer-tag-1.0', required: false) |
248 |
--gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false) |
249 |
--gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false) |
250 |
--icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false) |
251 |
--icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false) |
252 |
-+gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false) |
253 |
-+gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false) |
254 |
-+icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false) |
255 |
-+icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false) |
256 |
- libcue = dependency('libcue', required: get_option('cue')) |
257 |
--libexif = dependency('libexif', version: '> 0.6', required: get_option('exif')) |
258 |
--libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf')) |
259 |
-+libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif')) |
260 |
-+libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf')) |
261 |
- libgxps = dependency('libgxps', required: get_option('xps')) |
262 |
- libiptcdata = dependency('libiptcdata', required: get_option('iptc')) |
263 |
- libjpeg = dependency('libjpeg', required: get_option('jpeg')) |
264 |
--libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso')) |
265 |
--libpng = dependency('libpng', version: '> 0.89', required: get_option('png')) |
266 |
-+libosinfo = dependency('libosinfo-1.0', version: '>= 0.2.9', required: get_option('iso')) |
267 |
-+libpng = dependency('libpng', version: '>= 0.89', required: get_option('png')) |
268 |
- libseccomp = dependency('libseccomp', version: '>= 2.0', required: false) |
269 |
- libtiff = dependency('libtiff-4', required: get_option('tiff')) |
270 |
--libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml')) |
271 |
--libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis')) |
272 |
--poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf')) |
273 |
--taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib')) |
274 |
-+libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml')) |
275 |
-+libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis')) |
276 |
-+poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf')) |
277 |
-+taglib = dependency('taglib_c', version: '>= 1.6', required: get_option('taglib')) |
278 |
- totem_plparser = dependency('totem-plparser', required: get_option('playlist')) |
279 |
--upower = dependency('upower-glib', version: '> 0.9.0', required: false) |
280 |
-+upower = dependency('upower-glib', version: '>= 0.9.0', required: false) |
281 |
- zlib = dependency('zlib') |
282 |
- |
283 |
- libgif = cc.find_library('gif', required: get_option('gif')) |
284 |
-@@ -143,7 +143,7 @@ elif get_option('battery_detection') == 'upower' |
285 |
- endif |
286 |
- |
287 |
- if battery_detection_library_name == '' |
288 |
-- hal = dependency('hal', version: '> 0.5', required: false) |
289 |
-+ hal = dependency('hal', version: '>= 0.5', required: false) |
290 |
- |
291 |
- if hal.found() |
292 |
- battery_detection_library = hal |
293 |
--- |
294 |
-2.17.0 |
295 |
- |
296 |
- |
297 |
-From 6a215b9088abb9df4a837c1b74f281454f286ddf Mon Sep 17 00:00:00 2001 |
298 |
-From: Mart Raudsepp <leio@g.o> |
299 |
-Date: Fri, 15 Feb 2019 01:11:23 +0200 |
300 |
-Subject: [PATCH 3/5] build: Remove unnecessary vala language dependency |
301 |
- |
302 |
-tracker-miners doesn't use any vala, but due to vala declared as |
303 |
-a used language it does error out if valac isn't found. Remove the |
304 |
-language and unused vapi helper variable. |
305 |
---- |
306 |
- meson.build | 3 +-- |
307 |
- 1 file changed, 1 insertion(+), 2 deletions(-) |
308 |
- |
309 |
-diff --git a/meson.build b/meson.build |
310 |
-index 4263faf95..bfd2d624b 100644 |
311 |
---- a/meson.build |
312 |
-+++ b/meson.build |
313 |
-@@ -1,4 +1,4 @@ |
314 |
--project('tracker-miners', 'c', 'vala', |
315 |
-+project('tracker-miners', 'c', |
316 |
- version: '2.1.5', |
317 |
- meson_version: '>=0.47') |
318 |
- |
319 |
-@@ -385,7 +385,6 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib |
320 |
- tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract') |
321 |
- |
322 |
- gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas') |
323 |
--vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi') |
324 |
- |
325 |
- glib_mkenums = find_program('glib-mkenums') |
326 |
- |
327 |
--- |
328 |
-2.17.0 |
329 |
- |
330 |
- |
331 |
-From a163936b590184291c6ac6b8365eb5f7e9bf3474 Mon Sep 17 00:00:00 2001 |
332 |
-From: Mart Raudsepp <leio@g.o> |
333 |
-Date: Fri, 15 Feb 2019 01:12:25 +0200 |
334 |
-Subject: [PATCH 4/5] build: Remove unnecessary uuid util-linux hard dependency |
335 |
- |
336 |
-tracker core might use uuid, but nothing in tracker-miners needs it |
337 |
---- |
338 |
- meson.build | 8 -------- |
339 |
- 1 file changed, 8 deletions(-) |
340 |
- |
341 |
-diff --git a/meson.build b/meson.build |
342 |
-index bfd2d624b..8d23a1157 100644 |
343 |
---- a/meson.build |
344 |
-+++ b/meson.build |
345 |
-@@ -95,14 +95,6 @@ zlib = dependency('zlib') |
346 |
- libgif = cc.find_library('gif', required: get_option('gif')) |
347 |
- libmath = cc.find_library('m', required: false) |
348 |
- |
349 |
--# FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid' |
350 |
--# pkg-config component corresponds to 'libuuid.vapi', but Meson assumes that |
351 |
--# .vapi name always matches pkg-config name, and will add `--pkg uuid` to the |
352 |
--# Vala commandline. By finding 'uuid' using find_library() instead, we get |
353 |
--# a dependency object back that won't cause any `--pkg` arguments to be added |
354 |
--# to the Vala commandline, but still works as expected for C code. |
355 |
--uuid = cc.find_library('uuid') |
356 |
-- |
357 |
- have_tracker_extract = get_option('extract') |
358 |
- have_tracker_miner_apps = get_option('miner_apps') |
359 |
- have_tracker_miner_fs = get_option('miner_fs') |
360 |
--- |
361 |
-2.17.0 |
362 |
- |
363 |
- |
364 |
-From cc87c22592868e700333f31f333bf850c89f0135 Mon Sep 17 00:00:00 2001 |
365 |
-From: Sam Thursfield <sam@×××××××××.uk> |
366 |
-Date: Sun, 7 Oct 2018 23:42:28 +0200 |
367 |
-Subject: [PATCH 5/5] build: Fix breakage when libcue isn't found |
368 |
- |
369 |
-Commit 6e281037a5f0abc introduced a regression on systems where libcue |
370 |
-is not available. |
371 |
- |
372 |
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33 |
373 |
- |
374 |
-(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae) |
375 |
---- |
376 |
- meson.build | 2 +- |
377 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
378 |
- |
379 |
-diff --git a/meson.build b/meson.build |
380 |
-index 8d23a1157..d69588435 100644 |
381 |
---- a/meson.build |
382 |
-+++ b/meson.build |
383 |
-@@ -303,7 +303,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer') |
384 |
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA') |
385 |
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal') |
386 |
- conf.set('HAVE_LIBCUE', libcue.found()) |
387 |
--conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0') |
388 |
-+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0')) |
389 |
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu') |
390 |
- conf.set('HAVE_LIBEXIF', libexif.found()) |
391 |
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found()) |
392 |
--- |
393 |
-2.17.0 |
394 |
- |
395 |
|
396 |
diff --git a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch |
397 |
deleted file mode 100644 |
398 |
index 9cccb2e36e9..00000000000 |
399 |
--- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch |
400 |
+++ /dev/null |
401 |
@@ -1,42 +0,0 @@ |
402 |
-From 0d8b3388c415edebc75268358bab4ec2408d5685 Mon Sep 17 00:00:00 2001 |
403 |
-From: Sam Thursfield <sam@×××××××××.uk> |
404 |
-Date: Sun, 18 Nov 2018 20:33:51 +0100 |
405 |
-Subject: [PATCH 1/2] meson: Fix bad string comparisons in |
406 |
- create-miner-symlinks.sh script |
407 |
- |
408 |
-This script creates symlinks from $prefix/share/tracker/miners to the |
409 |
-real D-Bus .service files, which usually live in /usr/share/dbus-1. |
410 |
- |
411 |
-The script was comparing strings incorrectly, leading to misbehaviour. |
412 |
- |
413 |
-See https://gitlab.gnome.org/GNOME/tracker-miners/issues/38 |
414 |
- |
415 |
-(cherry picked from commit 949e7003c7027a9946b751c73e1e030d35c78bd7) |
416 |
---- |
417 |
- src/create-miner-symlinks.sh | 6 +++--- |
418 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
419 |
- |
420 |
-diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh |
421 |
-index 114cc54c8..9d8ded2fb 100644 |
422 |
---- a/src/create-miner-symlinks.sh |
423 |
-+++ b/src/create-miner-symlinks.sh |
424 |
-@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4" |
425 |
- have_tracker_miner_rss="$5" |
426 |
- |
427 |
- mkdir -p ${DESTDIR}/${tracker_miner_services_dir} |
428 |
--if [[ "$have_tracker_miner_apps" -eq "true" ]]; then |
429 |
-+if [[ "$have_tracker_miner_apps" == "true" ]]; then |
430 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
431 |
- fi |
432 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
433 |
--if [[ "$have_tracker_miner_fs" -eq "true" ]]; then |
434 |
-+if [[ "$have_tracker_miner_fs" == "true" ]]; then |
435 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
436 |
- fi |
437 |
--if [[ "$have_tracker_miner_rss" -eq "true" ]]; then |
438 |
-+if [[ "$have_tracker_miner_rss" == "true" ]]; then |
439 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
440 |
- fi |
441 |
--- |
442 |
-2.17.0 |
443 |
- |
444 |
|
445 |
diff --git a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch |
446 |
deleted file mode 100644 |
447 |
index 30fef51ca49..00000000000 |
448 |
--- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch |
449 |
+++ /dev/null |
450 |
@@ -1,39 +0,0 @@ |
451 |
-From 191a67bae395eab322f1adc000c95d35b1a60c71 Mon Sep 17 00:00:00 2001 |
452 |
-From: Jeremy Bicha <jbicha@××××××.com> |
453 |
-Date: Sun, 18 Nov 2018 16:42:53 -0500 |
454 |
-Subject: [PATCH 2/2] meson: fix bashism in equality check |
455 |
- |
456 |
-Thanks https://rgeissert.blogspot.com/2012/12/a-bashism-week-testing-for-equality.html |
457 |
- |
458 |
-and checkbashisms from Debian's devscripts |
459 |
- |
460 |
-Closes: https://gitlab.gnome.org/GNOME/tracker-miners/issues/38 |
461 |
-(cherry picked from commit 0304f28a9963bff0c5b029d88dc36f91f53dcf65) |
462 |
---- |
463 |
- src/create-miner-symlinks.sh | 6 +++--- |
464 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
465 |
- |
466 |
-diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh |
467 |
-index 9d8ded2fb..3ed270bca 100644 |
468 |
---- a/src/create-miner-symlinks.sh |
469 |
-+++ b/src/create-miner-symlinks.sh |
470 |
-@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4" |
471 |
- have_tracker_miner_rss="$5" |
472 |
- |
473 |
- mkdir -p ${DESTDIR}/${tracker_miner_services_dir} |
474 |
--if [[ "$have_tracker_miner_apps" == "true" ]]; then |
475 |
-+if ([ "$have_tracker_miner_apps" = "true" ]); then |
476 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
477 |
- fi |
478 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
479 |
--if [[ "$have_tracker_miner_fs" == "true" ]]; then |
480 |
-+if ([ "$have_tracker_miner_fs" = "true" ]); then |
481 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
482 |
- fi |
483 |
--if [[ "$have_tracker_miner_rss" == "true" ]]; then |
484 |
-+if ([ "$have_tracker_miner_rss" = "true" ]); then |
485 |
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/" |
486 |
- fi |
487 |
--- |
488 |
-2.17.0 |
489 |
- |
490 |
|
491 |
diff --git a/app-misc/tracker-miners/files/2.1.5-seccomp.patch b/app-misc/tracker-miners/files/2.1.5-seccomp.patch |
492 |
deleted file mode 100644 |
493 |
index f32d698a487..00000000000 |
494 |
--- a/app-misc/tracker-miners/files/2.1.5-seccomp.patch |
495 |
+++ /dev/null |
496 |
@@ -1,42 +0,0 @@ |
497 |
-From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001 |
498 |
-From: Mart Raudsepp <leio@g.o> |
499 |
-Date: Fri, 15 Feb 2019 21:11:29 +0200 |
500 |
-Subject: [PATCH] build: Only require seccomp when the CPU architecture |
501 |
- supports it |
502 |
- |
503 |
---- |
504 |
- meson.build | 18 +++++++++++++++++- |
505 |
- 1 file changed, 17 insertions(+), 1 deletion(-) |
506 |
- |
507 |
-diff --git a/meson.build b/meson.build |
508 |
-index ef48e77a6..65ad19cad 100644 |
509 |
---- a/meson.build |
510 |
-+++ b/meson.build |
511 |
-@@ -261,7 +261,23 @@ endif |
512 |
- # Check for libseccomp |
513 |
- ################################################################## |
514 |
- |
515 |
--if not libseccomp.found() and host_machine.system() == 'linux' |
516 |
-+host_system = host_machine.system() |
517 |
-+host_cpu = host_machine.cpu() |
518 |
-+unsupported_cpus = [ |
519 |
-+ 'alpha', |
520 |
-+ 'ia64', |
521 |
-+ 'm68k', |
522 |
-+ 'parisc', |
523 |
-+ 'parisc64', |
524 |
-+ 'sh4', |
525 |
-+ 'sparc', |
526 |
-+ 'sparc64', |
527 |
-+] |
528 |
-+system_supports_seccomp = host_system == 'linux' |
529 |
-+cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) |
530 |
-+seccomp_required = system_supports_seccomp and cpu_supports_seccomp |
531 |
-+ |
532 |
-+if not libseccomp.found() and seccomp_required |
533 |
- error('Libseccomp is mandatory for sandboxed metadata extraction') |
534 |
- endif |
535 |
- |
536 |
--- |
537 |
-2.17.0 |
538 |
- |
539 |
|
540 |
diff --git a/app-misc/tracker-miners/files/2.1.5-test-fix.patch b/app-misc/tracker-miners/files/2.1.5-test-fix.patch |
541 |
deleted file mode 100644 |
542 |
index be979e6af05..00000000000 |
543 |
--- a/app-misc/tracker-miners/files/2.1.5-test-fix.patch |
544 |
+++ /dev/null |
545 |
@@ -1,50 +0,0 @@ |
546 |
-From 02a54749117d609d75bad80331024661c2e598ce Mon Sep 17 00:00:00 2001 |
547 |
-From: Mart Raudsepp <leio@g.o> |
548 |
-Date: Fri, 15 Feb 2019 12:20:39 +0200 |
549 |
-Subject: [PATCH] libtracker-miners-common: improve path_evaluate_name |
550 |
- environment handling |
551 |
- |
552 |
-Under some environments $PWD might not point where we expect, so simply |
553 |
-use g_get_current_dir() instead. |
554 |
-g_getenv() is documented to return a pointer that may get overwritten |
555 |
-by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after |
556 |
-removing the second g_getenv, there's still g_setenv calls, take a copy. |
557 |
---- |
558 |
- .../libtracker-miners-common/tracker-file-utils-test.c | 10 ++++++---- |
559 |
- 1 file changed, 6 insertions(+), 4 deletions(-) |
560 |
- |
561 |
-diff --git a/tests/libtracker-miners-common/tracker-file-utils-test.c b/tests/libtracker-miners-common/tracker-file-utils-test.c |
562 |
-index 93b94472c..3f86a0cdc 100644 |
563 |
---- a/tests/libtracker-miners-common/tracker-file-utils-test.c |
564 |
-+++ b/tests/libtracker-miners-common/tracker-file-utils-test.c |
565 |
-@@ -134,14 +134,14 @@ test_path_list_filter_duplicates_with_exceptions () |
566 |
- static void |
567 |
- test_path_evaluate_name (void) |
568 |
- { |
569 |
-- gchar *result, *expected; |
570 |
-- |
571 |
-- const gchar *home = g_getenv ("HOME"); |
572 |
-- const gchar *pwd = g_getenv ("PWD"); |
573 |
-+ gchar *result, *expected, *home, *pwd; |
574 |
- |
575 |
- const gchar *test = "/one/two"; |
576 |
- gchar *parent_dir; |
577 |
- |
578 |
-+ home = g_strdup (g_getenv ("HOME")); |
579 |
-+ pwd = g_get_current_dir (); |
580 |
-+ |
581 |
- g_setenv ("TEST_TRACKER_DIR", test, TRUE); |
582 |
- |
583 |
- |
584 |
-@@ -219,6 +219,8 @@ test_path_evaluate_name (void) |
585 |
- result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ()); |
586 |
- g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ()); |
587 |
- |
588 |
-+ g_free (home); |
589 |
-+ g_free (pwd); |
590 |
- g_unsetenv ("TEST_TRACKER_DIR"); |
591 |
- } |
592 |
- |
593 |
--- |
594 |
-2.17.0 |
595 |
- |
596 |
|
597 |
diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild |
598 |
deleted file mode 100644 |
599 |
index b04c2c5f8c6..00000000000 |
600 |
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild |
601 |
+++ /dev/null |
602 |
@@ -1,142 +0,0 @@ |
603 |
-# Copyright 1999-2019 Gentoo Authors |
604 |
-# Distributed under the terms of the GNU General Public License v2 |
605 |
- |
606 |
-EAPI=6 |
607 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) |
608 |
- |
609 |
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg |
610 |
- |
611 |
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk" |
612 |
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" |
613 |
- |
614 |
-LICENSE="GPL-2+ LGPL-2.1+" |
615 |
-SLOT="0" |
616 |
-IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps" |
617 |
- |
618 |
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav |
619 |
- |
620 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
621 |
- |
622 |
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred) |
623 |
-RDEPEND=" |
624 |
- >=dev-libs/glib-2.46:2 |
625 |
- >=app-misc/tracker-2.1.0:= |
626 |
- gstreamer? ( |
627 |
- media-libs/gstreamer:1.0 |
628 |
- media-libs/gst-plugins-base:1.0 ) |
629 |
- !gstreamer? ( |
630 |
- ffmpeg? ( |
631 |
- libav? ( media-video/libav:0= ) |
632 |
- !libav? ( media-video/ffmpeg:0= ) ) ) |
633 |
- |
634 |
- >=sys-apps/dbus-1.3.1 |
635 |
- xmp? ( >=media-libs/exempi-2.1.0:= ) |
636 |
- flac? ( >=media-libs/flac-1.2.1 ) |
637 |
- raw? ( media-libs/gexiv2 ) |
638 |
- >=dev-libs/icu-4.8.1.2:= |
639 |
- cue? ( media-libs/libcue ) |
640 |
- exif? ( >=media-libs/libexif-0.6 ) |
641 |
- gsf? ( >=gnome-extra/libgsf-1.14.24:= ) |
642 |
- xps? ( app-text/libgxps ) |
643 |
- iptc? ( media-libs/libiptcdata ) |
644 |
- jpeg? ( virtual/jpeg:0 ) |
645 |
- iso? ( >=sys-libs/libosinfo-0.2.10 ) |
646 |
- >=media-libs/libpng-1.2:0= |
647 |
- seccomp? ( >=sys-libs/libseccomp-2.0 ) |
648 |
- tiff? ( media-libs/tiff:0 ) |
649 |
- xml? ( >=dev-libs/libxml2-2.6 ) |
650 |
- vorbis? ( >=media-libs/libvorbis-0.22 ) |
651 |
- pdf? ( >=app-text/poppler-0.16.0[cairo] ) |
652 |
- taglib? ( >=media-libs/taglib-1.6 ) |
653 |
- playlist? ( >=dev-libs/totem-pl-parser-3:= ) |
654 |
- upower? ( >=sys-power/upower-0.9.0 ) |
655 |
- sys-libs/zlib:0 |
656 |
- gif? ( media-libs/giflib:= ) |
657 |
- |
658 |
- rss? ( >=net-libs/libgrss-0.7:0 ) |
659 |
- app-arch/gzip |
660 |
-" |
661 |
-DEPEND="${RDEPEND} |
662 |
- dev-util/glib-utils |
663 |
- |
664 |
- >=dev-util/intltool-0.40.0 |
665 |
- >=sys-devel/gettext-0.19.8 |
666 |
- virtual/pkgconfig |
667 |
- test? ( ${PYTHON_DEPS} ) |
668 |
-" |
669 |
-# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29) |
670 |
- |
671 |
-PATCHES=( |
672 |
- "${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49 |
673 |
- "${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50 |
674 |
- "${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51 |
675 |
- "${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6 |
676 |
- "${FILESDIR}"/${PV}-libav-build-fix.patch # master branch, fixed in 2.2.0, might be backported to 2.1.6 too |
677 |
-) |
678 |
- |
679 |
-pkg_setup() { |
680 |
- use test && python-any-r1_pkg_setup |
681 |
-} |
682 |
- |
683 |
-src_prepare() { |
684 |
- xdg_src_prepare |
685 |
- gnome2_environment_reset # sets gstreamer safety variables |
686 |
-} |
687 |
- |
688 |
-src_configure() { |
689 |
- local media_extractor="none" |
690 |
- if use gstreamer ; then |
691 |
- media_extractor="gstreamer" |
692 |
- elif use ffmpeg ; then |
693 |
- media_extractor="libav" |
694 |
- fi |
695 |
- |
696 |
- local emesonargs=( |
697 |
- -Dtracker_core=system |
698 |
- |
699 |
- -Ddocs=true |
700 |
- -Dextract=true |
701 |
- $(meson_use test functional_tests) |
702 |
- -Dminer_apps=true |
703 |
- -Dminer_fs=true |
704 |
- $(meson_use rss miner_rss) |
705 |
- -Dwriteback=true |
706 |
- -Dabiword=true |
707 |
- -Ddvi=true |
708 |
- -Dicon=true |
709 |
- -Dmp3=true |
710 |
- -Dps=true |
711 |
- -Dtext=true |
712 |
- -Dunzip_ps_gz_files=true # spawns gunzip |
713 |
- |
714 |
- -Dcue=$(usex cue enabled disabled) |
715 |
- -Dexif=$(usex exif enabled disabled) |
716 |
- -Dflac=$(usex flac enabled disabled) |
717 |
- -Dgif=$(usex gif enabled disabled) |
718 |
- -Dgsf=$(usex gsf enabled disabled) |
719 |
- -Diptc=$(usex iptc enabled disabled) |
720 |
- -Diso=$(usex iso enabled disabled) |
721 |
- -Djpeg=$(usex jpeg enabled disabled) |
722 |
- -Dpdf=$(usex pdf enabled disabled) |
723 |
- -Dplaylist=$(usex playlist enabled disabled) |
724 |
- -Dpng=enabled |
725 |
- -Draw=$(usex raw enabled disabled) |
726 |
- -Dtaglib=$(usex taglib enabled disabled) |
727 |
- -Dtiff=$(usex tiff enabled disabled) |
728 |
- -Dvorbis=$(usex vorbis enabled disabled) |
729 |
- -Dxml=$(usex xml enabled disabled) |
730 |
- -Dxmp=$(usex xmp enabled disabled) |
731 |
- -Dxps=$(usex xps enabled disabled) |
732 |
- |
733 |
- -Dbattery_detection=$(usex upower upower none) |
734 |
- -Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca |
735 |
- -Dgeneric_media_extractor=${media_extractor} |
736 |
- # gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default |
737 |
- -Dsystemd_user_services="$(systemd_get_userunitdir)" |
738 |
- ) |
739 |
- meson_src_configure |
740 |
-} |
741 |
- |
742 |
-src_test() { |
743 |
- dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' |
744 |
-} |