From 2480f36bfb3d39469cc44843d1fe664bd40443a3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Jul 2022 14:44:25 +0100 Subject: gentoo auto-resync : 21:07:2022 - 14:44:25 --- app-misc/tracker-miners/Manifest | 3 - .../files/2.3.5-fix-autostart-build.patch | 80 ----------- .../tracker-miners/tracker-miners-2.3.5-r1.ebuild | 159 --------------------- 3 files changed, 242 deletions(-) delete mode 100644 app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch delete mode 100644 app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild (limited to 'app-misc/tracker-miners') diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest index 6b20042c89aa..b757e5d078b2 100644 --- a/app-misc/tracker-miners/Manifest +++ b/app-misc/tracker-miners/Manifest @@ -1,6 +1,3 @@ -AUX 2.3.5-fix-autostart-build.patch 3518 BLAKE2B e41b39cb8576a533bb4e1bae9b96daf3d2614109a94f4cf6edb8968a7a17b3788d824f3b3b156a17eeea7232ad720306f5c081c3beb4c891ddfbb911af5ed3c1 SHA512 4b325b89675c3e2f470c6be48da4f2598bdfc8be5b44ea55e09e161428b041ee8b7f3ecc3b6c3a9dcac612b46f3f05511fabbaf8ed2b17ed589349f103c0fae6 -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 -EBUILD tracker-miners-2.3.5-r1.ebuild 4729 BLAKE2B a9b88ca7efee49e804ad2ba2a14f4b73924c4192c0054ef4dff784b72ab9f1e7ae23e88ddd9e31b7b6bab9cb21d6e57ac15be175e4a7c853b2d3eb9aa316e86a SHA512 4e384b35ddeb2b61fa9b5c9d65ee8a9856d8040bf19fea746c2940e1a14f19bae857bc20fade912ca825d6743576d0ed34b6f704fd1856ab194928a5df2533f9 EBUILD tracker-miners-3.3.1.ebuild 4674 BLAKE2B 31a7fc6f2b343740e48421a64f559ebd5b2ec97145a911f3fd8b65ebc6a8d697c2cd586a8c2410cc52b370c7a43110bf6d46d5cb1714521df5b0c250f9f83ffe SHA512 364bb3d7f1511617b6a5843277423db42fe9ed5922beadaa649a247a59cdfdd623b4706739850bd3068aa4a2928b808c23e15c75537107bad7b50883f8f03820 MISC metadata.xml 740 BLAKE2B 038c1a4f3d5a1dce875cdd315187b3299b9a5ac0831dbd6d7967b9d5ea99610e134d9ccbffe3717819b88843e4836fc74c125bdfaa827f7b8479565cebd521d3 SHA512 474d28d444a83797a8f8bf287fd67b8e432dc7e93dccb30774e5eed254547840ae72eff5ccffbff6a020385a4d55fa1d7b0e3fc36280d6a6968f8b53ceff50a7 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 -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 -} -- cgit v1.2.3