[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/

[Mart Raudsepp]

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@×××××××××.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@××××××.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() {