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 | |
parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) |
gentoo resync : 20.02.2019
Diffstat (limited to 'app-misc/tracker-miners')
5 files changed, 116 insertions, 1 deletions
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest index 75486b65c08b..f84b3e11dab8 100644 --- a/app-misc/tracker-miners/Manifest +++ b/app-misc/tracker-miners/Manifest @@ -1,6 +1,9 @@ +AUX 2.1.5-libav-build-fix.patch 1054 BLAKE2B 30f0364d7f2f6469f6a2867fbbfb428f2b847b2bdebb766e7fa51faad03b10ee542b17602b69463233973b316d27c0943acc9e3104126cf86df54e07bc6bbdef SHA512 7534b850f30f72c6ef294977c8946f0e57bc6635069de45b66f38ca50aac9d2e745da0f51efc916e60bf70110aae5c39d3d73bea47537d6e0d4326ef219b1c02 AUX 2.1.5-meson-fixes.patch 16177 BLAKE2B 59c7ddaadb703612eadc500ba2cd60333d65f127e36a9dee4b60c65710b53e0cfdfa5b2829c8b334170e76e5eb37c1cc69c014150b928d7f897522f1141e1514 SHA512 d3bcb47e5e7449f9990d6aee261b72d943f61d610661652f18bda61270532591342a00c11b2de04b74744398b83a95c990271f1c7a7f07bfb5cf9db8f4c4b59a +AUX 2.1.5-rss-symlink-fix1.patch 1815 BLAKE2B 310b5a666fc2c074e07515676f826ba594ef5d672f1493a54ee81f27087f7b9d9107bc7f4f9bba34192d9d7a51482cb2eabc8f5129bc4f9f1f3e5eb8571e3a8d SHA512 7d09dc8e45fe897af3f8a2b91a69aab790f593b3ab16a66a4d3df3a6d694c7e4d709439e4ea8ddcf8dd4f9629634e64a0bba48013a48c628db6674f1d55d01f0 +AUX 2.1.5-rss-symlink-fix2.patch 1699 BLAKE2B 654e60d78af3036e47b8d1e152f24206a36250e2f80e37cd0a04ff1d34d9227a644e48cdbadedd8d620abe514ac1565462075e2d00020f14ab22d7d6d023bf1c SHA512 ced53feae62278acf4e5b35b48ede3b7982c4b2c2b973ca17a40272f93db23824122f2c262ad482901ddbc85bf91839e70a17e90684d36ad21e5af49e28eb68a AUX 2.1.5-seccomp.patch 1132 BLAKE2B e5f66ae4ab30b80fac96a54b58974a13a89f007e939c004680a163c98bc082dc710133443a7905bebaf71ace6f4138fbaf92586547c73da8da3d87f01d989b48 SHA512 7a5629dfd1854252c12066299bf5e3247524133dc54478fdadeeeb1b5945d2a3486a78f93223a56349be2539148a45046ffa5e6ec770ac3d203977de5a5392e6 AUX 2.1.5-test-fix.patch 1710 BLAKE2B 4e22251796d78fbfd7b1503bcebb58d4c9361c9c98613575ac9cf560724a83a3d5e5168427b131c2916e5a9727668b83295fffe1a03b7eb503aaf4fcc136bfc9 SHA512 8ff2471fd2781cfa87b4fa08a0e5237e8610235795f773799019dbff59785bb010f167bebdce5545de67acc2c4a69674aa41968854e739bc260916d602754cbf DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605 -EBUILD tracker-miners-2.1.5.ebuild 4297 BLAKE2B f13dfcb5cde8c191b44418b04eed32830516f0682fe4d6f2ed47bbe5d577d94484672b2e8f24c7930f45d849d8e36c7978349e10181786743a6fcd92bb90aafb SHA512 7170e2269da3affaaa03bd7f7ff7bbe9ed883d7b067a03fb05a740f9e7d059bc3e68c5d483bf2b5ca0c953537f3a7d16e62a362e03f97c0442709585c01e2caa +EBUILD tracker-miners-2.1.5.ebuild 4502 BLAKE2B ae176fccf4766badd611ac332798300fb9e530a9009541ce55893a20f931923f8fea7fa8c9526af1a038a1f5934e84beed6764882c3a06e1ee9e1b624f075609 SHA512 b7a9a87470333e6b6c69f8e9ee6f4b734203cfce5c22ca0fa94e0b5eeff1a4038b9579d997f28e741adc7e16f9acb38021674a01efa48562894237cb62a05396 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01 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 + 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 92999f830e52..b04c2c5f8c6f 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,8 @@ 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() { |