Removing Ebuild
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							ca583949b9
						
					
				
				
					commit
					62abe724eb
				
			@@ -1 +0,0 @@
 | 
			
		||||
DIST tracker-miners-3.0.4.tar.xz 4017600 BLAKE2B c84c9e4af9f3ea6542a2a063089d385c8b4429035b10e5955ddc47429e856628dc0273270bb69afd45b16aef79f120436e416318b3a36977768172bd883990c9 SHA512 f7eb48cd112aab154eb896b7d475f651f3a6d7987b5a6defe3d5106a79d9c93647d8f2afb2765a33bf66014ca0e4c1460f50e59d9adc4e47c898680663e5bca5
 | 
			
		||||
@@ -1,79 +0,0 @@
 | 
			
		||||
From e7b6d5f8b7541a4693c61be5d210fad85a5c9d06 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Carlos Garnacho <carlosg@gnome.org>
 | 
			
		||||
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
 | 
			
		||||
@@ -1,161 +0,0 @@
 | 
			
		||||
# Distributed under the terms of the GNU General Public License v2
 | 
			
		||||
 | 
			
		||||
EAPI=7
 | 
			
		||||
PYTHON_COMPAT=( python3_{7,8} )
 | 
			
		||||
 | 
			
		||||
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; might be properly gone by 3.0
 | 
			
		||||
RDEPEND="${RDEPEND}
 | 
			
		||||
	!>=app-misc/tracker-miners-2.99
 | 
			
		||||
" # Incompatible revision for (upcoming) parallel-installable tracker-miners-3 due to autostart; a revision that disables autostart and drops the blocker to be added together with v3
 | 
			
		||||
 | 
			
		||||
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=true # turn to 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
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user