public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/
@ 2019-02-15 19:22 Mart Raudsepp
  0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2019-02-15 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     a84897e9ae37ed3c3c3a74e7c0346e1f68049faf
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 19:21:06 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 19:21:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84897e9

app-misc/tracker-miners: fix build for architectures without seccomp

Closes: https://bugs.gentoo.org/645828
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker-miners/files/2.1.5-seccomp.patch  | 42 ++++++++++++++++++++++
 .../tracker-miners/tracker-miners-2.1.5.ebuild     |  1 +
 2 files changed, 43 insertions(+)

diff --git a/app-misc/tracker-miners/files/2.1.5-seccomp.patch b/app-misc/tracker-miners/files/2.1.5-seccomp.patch
new file mode 100644
index 00000000000..f32d698a487
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.5-seccomp.patch
@@ -0,0 +1,42 @@
+From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 15 Feb 2019 21:11:29 +0200
+Subject: [PATCH] build: Only require seccomp when the CPU architecture
+ supports it
+
+---
+ meson.build | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ef48e77a6..65ad19cad 100644
+--- a/meson.build
++++ b/meson.build
+@@ -261,7 +261,23 @@ endif
+ # Check for libseccomp
+ ##################################################################
+ 
+-if not libseccomp.found() and host_machine.system() == 'linux'
++host_system = host_machine.system()
++host_cpu = host_machine.cpu()
++unsupported_cpus = [
++  'alpha',
++  'ia64',
++  'm68k',
++  'parisc',
++  'parisc64',
++  'sh4',
++  'sparc',
++  'sparc64',
++]
++system_supports_seccomp = host_system == 'linux'
++cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu)
++seccomp_required = system_supports_seccomp and cpu_supports_seccomp
++
++if not libseccomp.found() and seccomp_required
+   error('Libseccomp is mandatory for sandboxed metadata extraction')
+ endif
+ 
+-- 
+2.17.0
+

diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
index 5cc68f9af1b..92999f830e5 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
@@ -69,6 +69,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50
+	"${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/
@ 2019-02-16 21:44 Mart Raudsepp
  0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2019-02-16 21:44 UTC (permalink / raw
  To: gentoo-commits

commit:     9d5552e58ce11aaa09a392b9be5f3c8960110bf4
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 21:38:58 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 21:41:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5552e5

app-misc/tracker-miners: fix broken symlink with USE=-rss

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 .../files/2.1.5-rss-symlink-fix1.patch             | 42 ++++++++++++++++++++++
 .../files/2.1.5-rss-symlink-fix2.patch             | 39 ++++++++++++++++++++
 .../tracker-miners/tracker-miners-2.1.5.ebuild     |  1 +
 3 files changed, 82 insertions(+)

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
new file mode 100644
index 00000000000..9cccb2e36e9
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch
@@ -0,0 +1,42 @@
+From 0d8b3388c415edebc75268358bab4ec2408d5685 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Sun, 18 Nov 2018 20:33:51 +0100
+Subject: [PATCH 1/2] meson: Fix bad string comparisons in
+ create-miner-symlinks.sh script
+
+This script creates symlinks from $prefix/share/tracker/miners to the
+real D-Bus .service files, which usually live in /usr/share/dbus-1.
+
+The script was comparing strings incorrectly, leading to misbehaviour.
+
+See https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
+
+(cherry picked from commit 949e7003c7027a9946b751c73e1e030d35c78bd7)
+---
+ src/create-miner-symlinks.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
+index 114cc54c8..9d8ded2fb 100644
+--- a/src/create-miner-symlinks.sh
++++ b/src/create-miner-symlinks.sh
+@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
+ have_tracker_miner_rss="$5"
+ 
+ mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
+-if [[ "$have_tracker_miner_apps" -eq "true" ]]; then
++if [[ "$have_tracker_miner_apps" == "true" ]]; then
+   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+ fi
+ ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+-if [[ "$have_tracker_miner_fs" -eq "true" ]]; then
++if [[ "$have_tracker_miner_fs" == "true" ]]; then
+   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+ fi
+-if [[ "$have_tracker_miner_rss" -eq "true" ]]; then
++if [[ "$have_tracker_miner_rss" == "true" ]]; then
+   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+ fi
+-- 
+2.17.0
+

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
new file mode 100644
index 00000000000..30fef51ca49
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch
@@ -0,0 +1,39 @@
+From 191a67bae395eab322f1adc000c95d35b1a60c71 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Sun, 18 Nov 2018 16:42:53 -0500
+Subject: [PATCH 2/2] meson: fix bashism in equality check
+
+Thanks https://rgeissert.blogspot.com/2012/12/a-bashism-week-testing-for-equality.html
+
+and checkbashisms from Debian's devscripts
+
+Closes: https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
+(cherry picked from commit 0304f28a9963bff0c5b029d88dc36f91f53dcf65)
+---
+ src/create-miner-symlinks.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
+index 9d8ded2fb..3ed270bca 100644
+--- a/src/create-miner-symlinks.sh
++++ b/src/create-miner-symlinks.sh
+@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
+ have_tracker_miner_rss="$5"
+ 
+ mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
+-if [[ "$have_tracker_miner_apps" == "true" ]]; then
++if ([ "$have_tracker_miner_apps" = "true" ]); then
+   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+ fi
+ ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+-if [[ "$have_tracker_miner_fs" == "true" ]]; then
++if ([ "$have_tracker_miner_fs" = "true" ]); then
+   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+ fi
+-if [[ "$have_tracker_miner_rss" == "true" ]]; then
++if ([ "$have_tracker_miner_rss" = "true" ]); then
+   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
+ fi
+-- 
+2.17.0
+

diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
index 92999f830e5..09bd5e23f90 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50
 	"${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51
+	"${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/
@ 2019-02-17 12:17 Mart Raudsepp
  0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2019-02-17 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     8af4730b1baa18b0b6049017d7a27241b4c0e94c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 12:15:55 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 12:16:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af4730b

app-misc/tracker-miners: fix build with ffmpeg media backend

Closes: https://bugs.gentoo.org/678226
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 .../files/2.1.5-libav-build-fix.patch              | 29 ++++++++++++++++++++++
 .../tracker-miners/tracker-miners-2.1.5.ebuild     |  1 +
 2 files changed, 30 insertions(+)

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
new file mode 100644
index 00000000000..580ecb34ba2
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch
@@ -0,0 +1,29 @@
+From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Mon, 10 Sep 2018 16:19:20 +0200
+Subject: [PATCH] build: Fix build with libav
+
+The extractor rules defined an array inside an array, which configure_file()
+wouldn't accept.
+
+(cherry picked from commit fff231c16b2ad9a2824f09c5b81f31ee220fba6f)
+---
+ src/tracker-extract/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
+index 9834dc422..bf19f8bac 100644
+--- a/src/tracker-extract/meson.build
++++ b/src/tracker-extract/meson.build
+@@ -60,7 +60,7 @@ if libjpeg.found()
+ endif
+ 
+ if generic_media_handler_name == 'libav'
+-  rules = ['90-libav-audio-generic.rule', ['90-libav-video-generic.rule']]
++  rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule']
+   dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep]
+   modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]]
+ endif
+-- 
+2.17.0
+

diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
index 09bd5e23f90..b04c2c5f8c6 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50
 	"${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51
 	"${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6
+	"${FILESDIR}"/${PV}-libav-build-fix.patch # master branch, fixed in 2.2.0, might be backported to 2.1.6 too
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/
@ 2019-02-27 13:21 Mart Raudsepp
  0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2019-02-27 13:21 UTC (permalink / raw
  To: gentoo-commits

commit:     25033f03396aaf5eb5cac6d9212ac24857dc44d8
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 13:20:33 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 13:21:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25033f03

app-misc/tracker-miners: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 -
 .../files/2.1.5-libav-build-fix.patch              |  29 --
 .../tracker-miners/files/2.1.5-meson-fixes.patch   | 322 ---------------------
 .../files/2.1.5-rss-symlink-fix1.patch             |  42 ---
 .../files/2.1.5-rss-symlink-fix2.patch             |  39 ---
 app-misc/tracker-miners/files/2.1.5-seccomp.patch  |  42 ---
 app-misc/tracker-miners/files/2.1.5-test-fix.patch |  50 ----
 .../tracker-miners/tracker-miners-2.1.5.ebuild     | 142 ---------
 8 files changed, 667 deletions(-)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index b60566f68f5..481551a583d 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,2 +1 @@
-DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605
 DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2

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
deleted file mode 100644
index 580ecb34ba2..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 10 Sep 2018 16:19:20 +0200
-Subject: [PATCH] build: Fix build with libav
-
-The extractor rules defined an array inside an array, which configure_file()
-wouldn't accept.
-
-(cherry picked from commit fff231c16b2ad9a2824f09c5b81f31ee220fba6f)
----
- src/tracker-extract/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
-index 9834dc422..bf19f8bac 100644
---- a/src/tracker-extract/meson.build
-+++ b/src/tracker-extract/meson.build
-@@ -60,7 +60,7 @@ if libjpeg.found()
- endif
- 
- if generic_media_handler_name == 'libav'
--  rules = ['90-libav-audio-generic.rule', ['90-libav-video-generic.rule']]
-+  rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule']
-   dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep]
-   modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]]
- endif
--- 
-2.17.0
-

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
deleted file mode 100644
index c8a3e6358df..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-From 5bb0709044fabe496601277ab5ba11a03500babe Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 00:15:08 +0200
-Subject: [PATCH 1/5] build: Add feature options for all external deps
-
-Automagic dependencies are bad for distributions. Add feature options
-for all of them that didn't have it before. If no options are specified,
-the behavior matches with before, but now it's possible to specify
-exactly what is linked to and what isn't.
-
-Fixes: #39
----
- meson.build       | 40 +++++++++++++++++++++-------------------
- meson_options.txt | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 58 insertions(+), 19 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index fd536f2e6..4f0e9a968 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,4 +1,6 @@
--project('tracker-miners', 'c', 'vala', version: '2.1.5')
-+project('tracker-miners', 'c', 'vala',
-+        version: '2.1.5',
-+        meson_version: '>=0.47')
- 
- gnome = import('gnome')
- i18n = import('i18n')
-@@ -57,9 +59,9 @@ avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
- avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
- avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
- dbus = dependency('dbus-1', version: '> 1.3.1')
--exempi = dependency('exempi-2.0', version: '> 2.1.0', required: false)
--flac = dependency('flac', version: '> 1.2.1', required: false)
--gexiv2 = dependency('gexiv2', required: false)
-+exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp'))
-+flac = dependency('flac', version: '> 1.2.1', required: get_option('flac'))
-+gexiv2 = dependency('gexiv2', required: get_option('raw'))
- gio = dependency('gio-2.0', version: '>' + glib_required)
- gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required)
- glib = dependency('glib-2.0', version: '>' + glib_required)
-@@ -72,25 +74,25 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
- gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false)
- icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
- icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
--libcue = dependency('libcue', required: false)
--libexif = dependency('libexif', version: '> 0.6', required: false)
--libgsf = dependency('libgsf-1', version: '> 1.14.24', required: false)
--libgxps = dependency('libgxps', required: false)
--libiptcdata = dependency('libiptcdata', required: false)
--libjpeg = dependency('libjpeg', required: false)
--libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: false)
--libpng = dependency('libpng', version: '> 0.89', required: false)
-+libcue = dependency('libcue', required: get_option('cue'))
-+libexif = dependency('libexif', version: '> 0.6', required: get_option('exif'))
-+libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf'))
-+libgxps = dependency('libgxps', required: get_option('xps'))
-+libiptcdata = dependency('libiptcdata', required: get_option('iptc'))
-+libjpeg = dependency('libjpeg', required: get_option('jpeg'))
-+libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso'))
-+libpng = dependency('libpng', version: '> 0.89', required: get_option('png'))
- libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
--libtiff = dependency('libtiff-4', required: false)
--libxml2 = dependency('libxml-2.0', version: '> 2.6')
--libvorbis = dependency('vorbisfile', version: '> 0.22')
--poppler = dependency('poppler-glib', version: '> 0.16.0', required: false)
--taglib = dependency('taglib_c', version: '> 1.6', required: false)
--totem_plparser = dependency('totem-plparser', required: false)
-+libtiff = dependency('libtiff-4', required: get_option('tiff'))
-+libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml'))
-+libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis'))
-+poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf'))
-+taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib'))
-+totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
- upower = dependency('upower-glib', version: '> 0.9.0', required: false)
- zlib = dependency('zlib')
- 
--libgif = cc.find_library('gif', required: false)
-+libgif = cc.find_library('gif', required: get_option('gif'))
- libmath = cc.find_library('m', required: false)
- 
- # FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid'
-diff --git a/meson_options.txt b/meson_options.txt
-index a91ac6c0f..5fce7a529 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -35,6 +35,43 @@ option('text', type: 'boolean', value: 'true',
- option('unzip_ps_gz_files', type: 'boolean', value: 'true',
-        description: 'Enable extractor for PS.GZ metadata')
- 
-+option('cue', type: 'feature', value: 'auto',
-+       description: 'Support cue sheet parsing')
-+option('exif', type: 'feature', value: 'auto',
-+       description: 'Support EXIF metadata')
-+option('flac', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from Flac audio')
-+option('gif', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from GIF images')
-+option('gsf', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from MS & Open Office documents')
-+option('iptc', type: 'feature', value: 'auto',
-+       description: 'Support IPTC photo metadata')
-+option('iso', type: 'feature', value: 'auto',
-+       description: 'Support ISO image parsing')
-+option('jpeg', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from JPEG images')
-+option('pdf', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from PDF documents')
-+option('playlist', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from playlists (w/ Totem)')
-+option('png', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from PNG images')
-+option('raw', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from RAW photos')
-+option('taglib', type: 'feature', value: 'auto',
-+       description: 'Support writeback for audio files using Taglib')
-+option('tiff', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from TIFF images')
-+option('vorbis', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from Vorbis (ogg/etc) files')
-+option('xml', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from XML and HTML documents')
-+option('xmp', type: 'feature', value: 'auto',
-+       description: 'Support XMP metadata')
-+option('xps', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from XPS documents')
-+
- option('battery_detection', type: 'combo', choices: ['auto', 'hal', 'upower', 'none'], value: 'auto',
-        description: 'Enable upower or HAL for battery/mains power detection')
- option('charset_detection', type: 'combo', choices: ['auto', 'enca', 'icu', 'none'], value: 'auto',
--- 
-2.17.0
-
-
-From b8c1768696c13275f5896374907fa192140ec922 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 00:18:09 +0200
-Subject: [PATCH 2/5] build: Fix minimum dep checks to allow the specified
- version too
-
-Many of the minimum deps were expressed as "> x.y", but were meant to
-allow x.y itself as well. Change all to ">= x.y". This seems to be
-what was intended and was the case with autotools.
----
- meson.build | 44 ++++++++++++++++++++++----------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4f0e9a968..4263faf95 100644
---- a/meson.build
-+++ b/meson.build
-@@ -58,38 +58,38 @@ endif
- avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
- avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
- avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
--dbus = dependency('dbus-1', version: '> 1.3.1')
--exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp'))
--flac = dependency('flac', version: '> 1.2.1', required: get_option('flac'))
-+dbus = dependency('dbus-1', version: '>= 1.3.1')
-+exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp'))
-+flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac'))
- gexiv2 = dependency('gexiv2', required: get_option('raw'))
--gio = dependency('gio-2.0', version: '>' + glib_required)
--gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required)
--glib = dependency('glib-2.0', version: '>' + glib_required)
--gmodule = dependency('gmodule-2.0', version: '>' + glib_required)
--gobject = dependency('gobject-2.0', version: '>' + glib_required)
-+gio = dependency('gio-2.0', version: '>=' + glib_required)
-+gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required)
-+glib = dependency('glib-2.0', version: '>=' + glib_required)
-+gmodule = dependency('gmodule-2.0', version: '>=' + glib_required)
-+gobject = dependency('gobject-2.0', version: '>=' + glib_required)
- gstreamer = dependency('gstreamer-1.0', required: false)
- gstreamer_pbutils = dependency('gstreamer-pbutils-1.0', required: false)
- gstreamer_tag = dependency('gstreamer-tag-1.0', required: false)
--gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
--gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false)
--icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
--icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
-+gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false)
-+gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false)
-+icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false)
-+icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false)
- libcue = dependency('libcue', required: get_option('cue'))
--libexif = dependency('libexif', version: '> 0.6', required: get_option('exif'))
--libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf'))
-+libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif'))
-+libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf'))
- libgxps = dependency('libgxps', required: get_option('xps'))
- libiptcdata = dependency('libiptcdata', required: get_option('iptc'))
- libjpeg = dependency('libjpeg', required: get_option('jpeg'))
--libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso'))
--libpng = dependency('libpng', version: '> 0.89', required: get_option('png'))
-+libosinfo = dependency('libosinfo-1.0', version: '>= 0.2.9', required: get_option('iso'))
-+libpng = dependency('libpng', version: '>= 0.89', required: get_option('png'))
- libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
- libtiff = dependency('libtiff-4', required: get_option('tiff'))
--libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml'))
--libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis'))
--poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf'))
--taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib'))
-+libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml'))
-+libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis'))
-+poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf'))
-+taglib = dependency('taglib_c', version: '>= 1.6', required: get_option('taglib'))
- totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
--upower = dependency('upower-glib', version: '> 0.9.0', required: false)
-+upower = dependency('upower-glib', version: '>= 0.9.0', required: false)
- zlib = dependency('zlib')
- 
- libgif = cc.find_library('gif', required: get_option('gif'))
-@@ -143,7 +143,7 @@ elif get_option('battery_detection') == 'upower'
- endif
- 
- if battery_detection_library_name == ''
--  hal = dependency('hal', version: '> 0.5', required: false)
-+  hal = dependency('hal', version: '>= 0.5', required: false)
- 
-   if hal.found()
-     battery_detection_library = hal
--- 
-2.17.0
-
-
-From 6a215b9088abb9df4a837c1b74f281454f286ddf Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 01:11:23 +0200
-Subject: [PATCH 3/5] build: Remove unnecessary vala language dependency
-
-tracker-miners doesn't use any vala, but due to vala declared as
-a used language it does error out if valac isn't found. Remove the
-language and unused vapi helper variable.
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4263faf95..bfd2d624b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,4 +1,4 @@
--project('tracker-miners', 'c', 'vala',
-+project('tracker-miners', 'c',
-         version: '2.1.5',
-         meson_version: '>=0.47')
- 
-@@ -385,7 +385,6 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib
- tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract')
- 
- gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
--vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')
- 
- glib_mkenums = find_program('glib-mkenums')
- 
--- 
-2.17.0
-
-
-From a163936b590184291c6ac6b8365eb5f7e9bf3474 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 01:12:25 +0200
-Subject: [PATCH 4/5] build: Remove unnecessary uuid util-linux hard dependency
-
-tracker core might use uuid, but nothing in tracker-miners needs it
----
- meson.build | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index bfd2d624b..8d23a1157 100644
---- a/meson.build
-+++ b/meson.build
-@@ -95,14 +95,6 @@ zlib = dependency('zlib')
- libgif = cc.find_library('gif', required: get_option('gif'))
- libmath = cc.find_library('m', required: false)
- 
--# FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid'
--# pkg-config component corresponds to 'libuuid.vapi', but Meson assumes that
--# .vapi name always matches pkg-config name, and will add `--pkg uuid` to the
--# Vala commandline. By finding 'uuid' using find_library() instead, we get
--# a dependency object back that won't cause any `--pkg` arguments to be added
--# to the Vala commandline, but still works as expected for C code.
--uuid = cc.find_library('uuid')
--
- have_tracker_extract = get_option('extract')
- have_tracker_miner_apps = get_option('miner_apps')
- have_tracker_miner_fs = get_option('miner_fs')
--- 
-2.17.0
-
-
-From cc87c22592868e700333f31f333bf850c89f0135 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sun, 7 Oct 2018 23:42:28 +0200
-Subject: [PATCH 5/5] build: Fix breakage when libcue isn't found
-
-Commit 6e281037a5f0abc introduced a regression on systems where libcue
-is not available.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
-
-(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8d23a1157..d69588435 100644
---- a/meson.build
-+++ b/meson.build
-@@ -303,7 +303,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
-+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
--- 
-2.17.0
-

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
deleted file mode 100644
index 9cccb2e36e9..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0d8b3388c415edebc75268358bab4ec2408d5685 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sun, 18 Nov 2018 20:33:51 +0100
-Subject: [PATCH 1/2] meson: Fix bad string comparisons in
- create-miner-symlinks.sh script
-
-This script creates symlinks from $prefix/share/tracker/miners to the
-real D-Bus .service files, which usually live in /usr/share/dbus-1.
-
-The script was comparing strings incorrectly, leading to misbehaviour.
-
-See https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
-
-(cherry picked from commit 949e7003c7027a9946b751c73e1e030d35c78bd7)
----
- src/create-miner-symlinks.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
-index 114cc54c8..9d8ded2fb 100644
---- a/src/create-miner-symlinks.sh
-+++ b/src/create-miner-symlinks.sh
-@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
- have_tracker_miner_rss="$5"
- 
- mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
--if [[ "$have_tracker_miner_apps" -eq "true" ]]; then
-+if [[ "$have_tracker_miner_apps" == "true" ]]; then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
--if [[ "$have_tracker_miner_fs" -eq "true" ]]; then
-+if [[ "$have_tracker_miner_fs" == "true" ]]; then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--if [[ "$have_tracker_miner_rss" -eq "true" ]]; then
-+if [[ "$have_tracker_miner_rss" == "true" ]]; then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--- 
-2.17.0
-

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
deleted file mode 100644
index 30fef51ca49..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 191a67bae395eab322f1adc000c95d35b1a60c71 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Sun, 18 Nov 2018 16:42:53 -0500
-Subject: [PATCH 2/2] meson: fix bashism in equality check
-
-Thanks https://rgeissert.blogspot.com/2012/12/a-bashism-week-testing-for-equality.html
-
-and checkbashisms from Debian's devscripts
-
-Closes: https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
-(cherry picked from commit 0304f28a9963bff0c5b029d88dc36f91f53dcf65)
----
- src/create-miner-symlinks.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
-index 9d8ded2fb..3ed270bca 100644
---- a/src/create-miner-symlinks.sh
-+++ b/src/create-miner-symlinks.sh
-@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
- have_tracker_miner_rss="$5"
- 
- mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
--if [[ "$have_tracker_miner_apps" == "true" ]]; then
-+if ([ "$have_tracker_miner_apps" = "true" ]); then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
--if [[ "$have_tracker_miner_fs" == "true" ]]; then
-+if ([ "$have_tracker_miner_fs" = "true" ]); then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--if [[ "$have_tracker_miner_rss" == "true" ]]; then
-+if ([ "$have_tracker_miner_rss" = "true" ]); then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/files/2.1.5-seccomp.patch b/app-misc/tracker-miners/files/2.1.5-seccomp.patch
deleted file mode 100644
index f32d698a487..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-seccomp.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 21:11:29 +0200
-Subject: [PATCH] build: Only require seccomp when the CPU architecture
- supports it
-
----
- meson.build | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index ef48e77a6..65ad19cad 100644
---- a/meson.build
-+++ b/meson.build
-@@ -261,7 +261,23 @@ endif
- # Check for libseccomp
- ##################################################################
- 
--if not libseccomp.found() and host_machine.system() == 'linux'
-+host_system = host_machine.system()
-+host_cpu = host_machine.cpu()
-+unsupported_cpus = [
-+  'alpha',
-+  'ia64',
-+  'm68k',
-+  'parisc',
-+  'parisc64',
-+  'sh4',
-+  'sparc',
-+  'sparc64',
-+]
-+system_supports_seccomp = host_system == 'linux'
-+cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu)
-+seccomp_required = system_supports_seccomp and cpu_supports_seccomp
-+
-+if not libseccomp.found() and seccomp_required
-   error('Libseccomp is mandatory for sandboxed metadata extraction')
- endif
- 
--- 
-2.17.0
-

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
deleted file mode 100644
index be979e6af05..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-test-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 02a54749117d609d75bad80331024661c2e598ce Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 12:20:39 +0200
-Subject: [PATCH] libtracker-miners-common: improve path_evaluate_name
- environment handling
-
-Under some environments $PWD might not point where we expect, so simply
-use g_get_current_dir() instead.
-g_getenv() is documented to return a pointer that may get overwritten
-by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after
-removing the second g_getenv, there's still g_setenv calls, take a copy.
----
- .../libtracker-miners-common/tracker-file-utils-test.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/tests/libtracker-miners-common/tracker-file-utils-test.c b/tests/libtracker-miners-common/tracker-file-utils-test.c
-index 93b94472c..3f86a0cdc 100644
---- a/tests/libtracker-miners-common/tracker-file-utils-test.c
-+++ b/tests/libtracker-miners-common/tracker-file-utils-test.c
-@@ -134,14 +134,14 @@ test_path_list_filter_duplicates_with_exceptions ()
- static void
- test_path_evaluate_name (void)
- {
--	gchar *result, *expected;
--
--	const gchar *home = g_getenv ("HOME");
--	const gchar *pwd = g_getenv ("PWD");
-+	gchar *result, *expected, *home, *pwd;
- 
- 	const gchar *test = "/one/two";
- 	gchar *parent_dir;
- 
-+	home = g_strdup (g_getenv ("HOME"));
-+	pwd = g_get_current_dir ();
-+
- 	g_setenv ("TEST_TRACKER_DIR", test, TRUE);
- 
- 
-@@ -219,6 +219,8 @@ test_path_evaluate_name (void)
- 	result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
- 	g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ());
- 
-+	g_free (home);
-+	g_free (pwd);
- 	g_unsetenv ("TEST_TRACKER_DIR");
- }
- 
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
deleted file mode 100644
index b04c2c5f8c6..00000000000
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-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"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# 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)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.1.0:=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	!gstreamer? (
-		ffmpeg? (
-			libav? ( media-video/libav:0= )
-			!libav? ( media-video/ffmpeg:0= ) ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	flac? ( >=media-libs/flac-1.2.1 )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	taglib? ( >=media-libs/taglib-1.6 )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29)
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49
-	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50
-	"${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51
-	"${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6
-	"${FILESDIR}"/${PV}-libav-build-fix.patch # master branch, fixed in 2.2.0, might be backported to 2.1.6 too
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		-Dminer_apps=true
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		-Dcue=$(usex cue enabled disabled)
-		-Dexif=$(usex exif enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dgif=$(usex gif enabled disabled)
-		-Dgsf=$(usex gsf enabled disabled)
-		-Diptc=$(usex iptc enabled disabled)
-		-Diso=$(usex iso enabled disabled)
-		-Djpeg=$(usex jpeg enabled disabled)
-		-Dpdf=$(usex pdf enabled disabled)
-		-Dplaylist=$(usex playlist enabled disabled)
-		-Dpng=enabled
-		-Draw=$(usex raw enabled disabled)
-		-Dtaglib=$(usex taglib enabled disabled)
-		-Dtiff=$(usex tiff enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dxml=$(usex xml enabled disabled)
-		-Dxmp=$(usex xmp enabled disabled)
-		-Dxps=$(usex xps enabled disabled)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/
@ 2019-12-22 20:47 Mart Raudsepp
  0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2019-12-22 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     dc0e09781d5cb5dad8746279ce80d70561ae3b4d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 20:38:52 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 20:46:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0e0978

app-misc/tracker-miners: remove old

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 -
 .../files/2.1.6-cue-meson-fixes.patch              |  67 ---------
 .../tracker-miners/tracker-miners-2.1.6.ebuild     | 157 ---------------------
 3 files changed, 225 deletions(-)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 738f0f14662..b28ee10aa1f 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,2 +1 @@
-DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2
 DIST tracker-miners-2.2.2.tar.xz 2893476 BLAKE2B 30bfd0454c5429a708ee10a299210e800e2d713859a20206b8c96cb41f4a1d14c438266b198788056b4d2f7fd5a9b8b465d9d7b460e3e57ddbd56d98f89c5ae2 SHA512 41dda92ddde2ba473ac0887ab5a0c0918c8a26a99cdcd1c0a7d49cdce0f7b02ff080fa868df7e855d08ce5cf61fa55b3ef0737bc58a83e80d2096435efa11cf3

diff --git a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
deleted file mode 100644
index 07d6ae9b649..00000000000
--- a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5d24ba00a7735ab3b7b381a102dc5536c12c8133 Mon Sep 17 00:00:00 2001
-From: Ernestas Kulik <ernestask@gnome.org>
-Date: Sun, 7 Oct 2018 11:40:41 +0300
-Subject: [PATCH 1/2] build: Fix libcue version comparison
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It currently performs a string comparison, as opposed to using
-version_compare(), which leads to results like
-“unknown >= 2.0.0 == True” when the dependency was not found.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/32
-
-(cherry picked from commit 6e281037a5f0abc12e5e8902e445f264200980b0)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4273638dd..c30ada4ed 100644
---- a/meson.build
-+++ b/meson.build
-@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
-+conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
--- 
-2.17.0
-
-
-From ff6a076330ba1b5a383196795b18e2c069ac54c6 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sun, 7 Oct 2018 23:42:28 +0200
-Subject: [PATCH 2/2] build: Fix breakage when libcue isn't found
-
-Commit 6e281037a5f0abc introduced a regression on systems where libcue
-is not available.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
-
-(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c30ada4ed..28072646a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
-+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
deleted file mode 100644
index 90a3454283d..00000000000
--- a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# 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)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.1.0:=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	!gstreamer? (
-		ffmpeg? (
-			libav? ( media-video/libav:0= )
-			!libav? ( media-video/ffmpeg:0= ) ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	flac? ( >=media-libs/flac-1.2.1 )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	taglib? ( >=media-libs/taglib-1.6 )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
-		gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0
-			media-plugins/gst-plugins-openh264:1.0 ) ) )
-"
-# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29)
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-cue-meson-fixes.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		-Dminer_apps=true
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		-Dcue=$(usex cue enabled disabled)
-		-Dexif=$(usex exif enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dgif=$(usex gif enabled disabled)
-		-Dgsf=$(usex gsf enabled disabled)
-		-Diptc=$(usex iptc enabled disabled)
-		-Diso=$(usex iso enabled disabled)
-		-Djpeg=$(usex jpeg enabled disabled)
-		-Dpdf=$(usex pdf enabled disabled)
-		-Dplaylist=$(usex playlist enabled disabled)
-		-Dpng=enabled
-		-Draw=$(usex raw enabled disabled)
-		-Dtaglib=$(usex taglib enabled disabled)
-		-Dtiff=$(usex tiff enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dxml=$(usex xml enabled disabled)
-		-Dxmp=$(usex xmp enabled disabled)
-		-Dxps=$(usex xps enabled disabled)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/
@ 2022-03-27  5:26 Matt Turner
  0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2022-03-27  5:26 UTC (permalink / raw
  To: gentoo-commits

commit:     3e8cb4a03048e73636688fbbf0676df53caf82e3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 05:26:12 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 05:26:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8cb4a0

Revert "app-misc/tracker-miners: Drop old versions"

This reverts commit e9c107ac11d4b9725cc2219a31d35d59d2d26a9b.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 +
 .../files/2.3.5-fix-autostart-build.patch          |  80 +++++++++++
 .../tracker-miners/tracker-miners-2.3.5-r1.ebuild  | 159 +++++++++++++++++++++
 3 files changed, 240 insertions(+)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 5be38922a013..02ab7b7bb733 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,4 @@
+DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
 DIST tracker-miners-3.2.1.tar.xz 4074476 BLAKE2B dfadb33f70462f8373d526ed7fce63553808b7b38ae444dcc67c2f9a0b5f4821526491ced9e43608793ef3190cb200a5fc1a7dee24ead02001b600cbb09931b9 SHA512 d3767f714cbda1688aecced96c6e9b6c51e69018db872e0427c98b09aacea3274b446dd85df1196dd4b24358dcabe6780abec9cc9f44af70261ef6bc74b78c2c
 DIST tracker-miners-3.2.2.tar.xz 4073752 BLAKE2B f2fe63cb6ea0704152305c8922d6a557cb24dd507d9ea00e8d800de50bd04ad1f373503ecd8b734c6dc74568a8ec370b2a8b29b6ca4d8512d420a938b1b179df SHA512 03508ef2bbfe3030c4afaaea740739b91e4b1c1dde364f801cf7deeb2358abde3561f7e1b43eeae97acbb010f7fcc063d7cd46578089cf1e1fc736d219c91b62
 DIST tracker-miners-3.3.0.tar.xz 7243888 BLAKE2B 3dcbb03808e823e46141ddc13c074a5e066d1b41b32291b8ad1d1ff7896ee6c7c1f09b1792555324ad54ea55481a5641c0426b09e7960506ff77717f756300ad SHA512 ef28abf48633125e2386cc6c9cc4afbc8c203cfd6fcd31eb6928eb6132e033be232e1141655b5d517e66170c5abb3799f9ea3c76f4b5db66e18524aea59f3969

diff --git a/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
new file mode 100644
index 000000000000..85f201bcf051
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
@@ -0,0 +1,80 @@
+From e7b6d5f8b7541a4693c61be5d210fad85a5c9d06 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Sat, 12 Sep 2020 13:37:11 +0200
+Subject: [PATCH] build: Fix -Dautostart=true
+
+Meson doesn't seem to like that we use install_data() with custom target
+results. Make this option toggle the "install" keyword argument in the
+custom target itself.
+---
+ src/miners/fs/meson.build       | 10 +++-------
+ src/miners/rss/meson.build      | 10 +++-------
+ src/tracker-extract/meson.build | 10 +++-------
+ 3 files changed, 9 insertions(+), 21 deletions(-)
+
+diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
+index a770516c9..5a23bd06c 100644
+--- a/src/miners/fs/meson.build
++++ b/src/miners/fs/meson.build
+@@ -54,13 +54,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-miner-fs-desktop-file',
+     input: desktop_file_untranslated,
+     output: 'tracker-miner-fs.desktop',
+-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++    install: get_option('autostart'),
++    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
+index f540befe2..0bf0bb765 100644
+--- a/src/miners/rss/meson.build
++++ b/src/miners/rss/meson.build
+@@ -31,13 +31,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-miner-rss-desktop-file',
+     input: desktop_file_untranslated,
+     output: 'tracker-miner-rss.desktop',
+-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++    install: get_option('autostart'),
++    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
+index 239907179..aec37bfcc 100644
+--- a/src/tracker-extract/meson.build
++++ b/src/tracker-extract/meson.build
+@@ -189,13 +189,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-extract-desktop-file',
+   input: desktop_file_untranslated,
+   output: 'tracker-extract.desktop',
+-  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++  install: get_option('autostart'),
++  install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+-- 
+2.27.0
+

diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
new file mode 100644
index 000000000000..804672ef7215
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# 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)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:0=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| ( media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0 )
+	) )
+"
+# intltool-merge manually called in meson.build in 2.3.5
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-autostart-build.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dautostart=false # false to co-exist with tracker-miners-3
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/
@ 2022-07-21 11:45 Matt Turner
  0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2022-07-21 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     99284024c734a676305164df8463cb25210b8efa
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 11:40:42 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 11:45:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99284024

app-misc/tracker-miners: Remove slot :0

Bug: https://bugs.gentoo.org/846617
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 -
 .../files/2.3.5-fix-autostart-build.patch          |  80 -----------
 .../tracker-miners/tracker-miners-2.3.5-r1.ebuild  | 159 ---------------------
 3 files changed, 240 deletions(-)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 1502a3c64df4..707d926c69ab 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,2 +1 @@
-DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
 DIST tracker-miners-3.3.1.tar.xz 7244032 BLAKE2B 0233ba74ed6c697055c12fb758fefc0f71dba7e17db0e92950491cf51e228896e46d27485e2cedd16a5a3a8e4d46eca66baf57824e6340bad9f177b206908e2e SHA512 bc0cb53a7296a2836f05d5d5413418af936ef7f0a4794705e5970699d69c27f513812d0daa182f5359d665a3b6111de06cd9fc671ad769472e0cde2550f66dcb

diff --git a/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
deleted file mode 100644
index 85f201bcf051..000000000000
--- a/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From e7b6d5f8b7541a4693c61be5d210fad85a5c9d06 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Sat, 12 Sep 2020 13:37:11 +0200
-Subject: [PATCH] build: Fix -Dautostart=true
-
-Meson doesn't seem to like that we use install_data() with custom target
-results. Make this option toggle the "install" keyword argument in the
-custom target itself.
----
- src/miners/fs/meson.build       | 10 +++-------
- src/miners/rss/meson.build      | 10 +++-------
- src/tracker-extract/meson.build | 10 +++-------
- 3 files changed, 9 insertions(+), 21 deletions(-)
-
-diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
-index a770516c9..5a23bd06c 100644
---- a/src/miners/fs/meson.build
-+++ b/src/miners/fs/meson.build
-@@ -54,13 +54,9 @@ desktop_file_untranslated = configure_file(
- desktop_file = custom_target('tracker-miner-fs-desktop-file',
-     input: desktop_file_untranslated,
-     output: 'tracker-miner-fs.desktop',
--    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
--
--if get_option('autostart')
--  install_data(desktop_file,
--      install: true,
--      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
--endif
-+    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
-+    install: get_option('autostart'),
-+    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
- 
- if install_systemd_user_services
-   configure_file(
-diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
-index f540befe2..0bf0bb765 100644
---- a/src/miners/rss/meson.build
-+++ b/src/miners/rss/meson.build
-@@ -31,13 +31,9 @@ desktop_file_untranslated = configure_file(
- desktop_file = custom_target('tracker-miner-rss-desktop-file',
-     input: desktop_file_untranslated,
-     output: 'tracker-miner-rss.desktop',
--    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
--
--if get_option('autostart')
--  install_data(desktop_file,
--      install: true,
--      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
--endif
-+    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
-+    install: get_option('autostart'),
-+    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
- 
- if install_systemd_user_services
-   configure_file(
-diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
-index 239907179..aec37bfcc 100644
---- a/src/tracker-extract/meson.build
-+++ b/src/tracker-extract/meson.build
-@@ -189,13 +189,9 @@ desktop_file_untranslated = configure_file(
- desktop_file = custom_target('tracker-extract-desktop-file',
-   input: desktop_file_untranslated,
-   output: 'tracker-extract.desktop',
--  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
--
--if get_option('autostart')
--  install_data(desktop_file,
--      install: true,
--      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
--endif
-+  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
-+  install: get_option('autostart'),
-+  install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
- 
- if install_systemd_user_services
-   configure_file(
--- 
-2.27.0
-

diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
deleted file mode 100644
index ed625d539a31..000000000000
--- a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# 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)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:0=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-meta:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| ( media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0 )
-	) )
-"
-# intltool-merge manually called in meson.build in 2.3.5
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-autostart-build.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
-		#$(meson_use test functional_tests)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature cue)
-		$(meson_feature exif)
-		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dautostart=false # false to co-exist with tracker-miners-3
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-07-21 11:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-17 12:17 [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/ Mart Raudsepp
  -- strict thread matches above, loose matches on Subject: below --
2022-07-21 11:45 Matt Turner
2022-03-27  5:26 Matt Turner
2019-12-22 20:47 Mart Raudsepp
2019-02-27 13:21 Mart Raudsepp
2019-02-16 21:44 Mart Raudsepp
2019-02-15 19:22 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox