From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E834F158094 for ; Thu, 21 Jul 2022 11:45:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E1F3E0B14; Thu, 21 Jul 2022 11:45:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 106D9E0B14 for ; Thu, 21 Jul 2022 11:45:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 758483406C0 for ; Thu, 21 Jul 2022 11:45:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C413B4FB for ; Thu, 21 Jul 2022 11:45:51 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1658403940.99284024c734a676305164df8463cb25210b8efa.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/tracker-miners/Manifest app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild X-VCS-Directories: app-misc/tracker-miners/files/ app-misc/tracker-miners/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 99284024c734a676305164df8463cb25210b8efa X-VCS-Branch: master Date: Thu, 21 Jul 2022 11:45:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ae916bb1-7ad2-488d-b313-21bbd8c90d6e X-Archives-Hash: d4c8f4d07c0ee5b95af92e9ab7569236 commit: 99284024c734a676305164df8463cb25210b8efa Author: Matt Turner gentoo org> AuthorDate: Thu Jul 21 11:40:42 2022 +0000 Commit: Matt Turner gentoo 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 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 -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 -}