commit: 87b403d27e7d8f08c91c497a72edab271adf620d Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Wed Jun 3 22:38:13 2015 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Wed Jun 3 22:39:20 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=87b403d2
app-misc/tracker: fix configure issues, bug #550910 .../files/tracker-1.4.0-have-gstreamer-fix.patch | 35 ++++++++++++++++++++++ app-misc/tracker/tracker-1.4.0.ebuild | 5 +++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch b/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch new file mode 100644 index 0000000..de2b774 --- /dev/null +++ b/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch @@ -0,0 +1,35 @@ +From 32333d707ca2a4a33bbefd051c70f037d81207eb Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +Date: Wed, 3 Jun 2015 23:42:56 +0200 +Subject: [PATCH] Fix AM_CONDITIONAL position HAVE_{GSTREAMER,LIBAV} definition + +--- + configure.ac | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b2e3ae8..6ed8801 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1884,14 +1884,13 @@ fi + + if test "$have_generic_media_handler_app" = "GStreamer"; then + AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer]) +- AM_CONDITIONAL(HAVE_GSTREAMER, true) +- AM_CONDITIONAL(HAVE_LIBAV, false) + elif test "$have_generic_media_handler_app" = "libav"; then +- AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have libav]) +- AM_CONDITIONAL(HAVE_LIBAV, true) +- AM_CONDITIONAL(HAVE_GSTREAMER, false) ++ AC_DEFINE(HAVE_LIBAV, [], [Define if we have libav]) + fi + ++AM_CONDITIONAL(HAVE_GSTREAMER, [test "$have_generic_media_handler_app" = "GStreamer"]) ++AM_CONDITIONAL(HAVE_LIBAV, [test "$have_generic_media_handler_app" = "libav"]) ++ + ########################################################################### + # Check for gstreamer backend: tagreadbin/decodebin2/discoverer/gupnp-dlna + ########################################################################### +-- +2.4.1 + diff --git a/app-misc/tracker/tracker-1.4.0.ebuild b/app-misc/tracker/tracker-1.4.0.ebuild index 2f63f49..cc76fd2 100644 --- a/app-misc/tracker/tracker-1.4.0.ebuild +++ b/app-misc/tracker/tracker-1.4.0.ebuild @@ -130,6 +130,9 @@ pkg_setup() { } src_prepare() { + # Fix position of AM_CONDITIONAL, bug #550910, upstream bug #750368 + epatch "${FILESDIR}"/${PN}-1.4.0-have-gstreamer-fix.patch + # Don't run 'firefox --version' or 'thunderbird --version'; it results in # access violations on some setups (bug #385347, #385495). create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh @@ -209,7 +212,7 @@ src_configure() { $(use_enable pdf poppler) \ $(use_enable playlist) \ $(use_enable rss miner-rss) \ - $(use_enable stemmer) \ + $(use_enable stemmer libstemmer) \ $(use_enable test functional-tests) \ $(use_enable test unit-tests) \ $(use_enable thunderbird miner-thunderbird) \
