diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
commit | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch) | |
tree | b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /app-misc/tracker-miners/files | |
parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) |
gentoo resync : 20.02.2019
Diffstat (limited to 'app-misc/tracker-miners/files')
3 files changed, 110 insertions, 0 deletions
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 000000000000..580ecb34ba22 --- /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/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 000000000000..9cccb2e36e9c --- /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 000000000000..30fef51ca492 --- /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 + |