From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RAKCs-0000tc-OG for garchives@archives.gentoo.org; Sun, 02 Oct 2011 11:27:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E12321C09E; Sun, 2 Oct 2011 11:27:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DB28121C09E for ; Sun, 2 Oct 2011 11:27:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A1111B4009 for ; Sun, 2 Oct 2011 11:27:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9C3618004B for ; Sun, 2 Oct 2011 11:27:33 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <61287ed80a5149c6a62fe1f8273832927b611597.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-misc/tracker/ X-VCS-Repository: proj/gnome X-VCS-Files: app-misc/tracker/tracker-0.12.3-r1.ebuild app-misc/tracker/tracker-0.12.3.ebuild X-VCS-Directories: app-misc/tracker/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 61287ed80a5149c6a62fe1f8273832927b611597 Date: Sun, 2 Oct 2011 11:27:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: bc07daf202f393510bcc2f5f171de89f commit: 61287ed80a5149c6a62fe1f8273832927b611597 Author: Alexandre Rostovtsev gmail com> AuthorDate: Sun Oct 2 10:53:39 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sun Oct 2 11:26:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D61287ed8 app-misc/tracker: disable qt4 albumart, fix ff/tb access violations Disable the qt4-based albumart extractor; it appears very unstable (see bug #385345, and confirmed on multiple machines here). Forcce a revbump to get people to use the gdk-pixbuf based extractor, since the qt4 USE flag is enabled by default for most users. Also, do not call firefox and thunderbird directly to get their versions, this results in access violations, and Gentoo has a better way of doing this (bug #385347). Thanks to Valentin David gmail.com> for reporting. --- ...cker-0.12.3.ebuild =3D> tracker-0.12.3-r1.ebuild} | 33 ++++++++++++= ------- 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app-misc/tracker/tracker-0.12.3.ebuild b/app-misc/tracker/tr= acker-0.12.3-r1.ebuild similarity index 85% rename from app-misc/tracker/tracker-0.12.3.ebuild rename to app-misc/tracker/tracker-0.12.3-r1.ebuild index 66839f6..681bd8b 100644 --- a/app-misc/tracker/tracker-0.12.3.ebuild +++ b/app-misc/tracker/tracker-0.12.3-r1.ebuild @@ -8,7 +8,7 @@ GNOME2_LA_PUNT=3D"yes" GNOME_TARBALL_SUFFIX=3D"xz" PYTHON_DEPEND=3D"2:2.6" =20 -inherit eutils gnome2 linux-info multilib python virtualx +inherit autotools eutils gnome2 linux-info multilib python =20 DESCRIPTION=3D"A tagging metadata database, search tool and indexer" HOMEPAGE=3D"http://www.tracker-project.org/" @@ -17,7 +17,7 @@ LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" # USE=3D"doc" is managed by eclass. -IUSE=3D"applet doc eds elibc_glibc exif firefox flac flickr gif gnome-ke= yring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf= playlist qt4 rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # st= rigi +IUSE=3D"applet doc eds elibc_glibc exif firefox flac flickr gif gnome-ke= yring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf= playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 st= rigi =20 # Test suite highly disfunctional, loops forever # putting aside for now @@ -70,8 +70,7 @@ RDEPEND=3D" laptop? ( >=3Dsys-power/upower-0.9 ) mp3? ( >=3Dmedia-libs/taglib-1.6 - gtk? ( x11-libs/gdk-pixbuf:2 ) - qt4? ( >=3Dx11-libs/qt-gui-4.7.1:4 ) ) + gtk? ( x11-libs/gdk-pixbuf:2 ) ) nautilus? ( >=3Dgnome-base/nautilus-2.90 x11-libs/gtk+:3 ) @@ -89,6 +88,7 @@ RDEPEND=3D" xml? ( >=3Ddev-libs/libxml2-2.6 ) xmp? ( >=3Dmedia-libs/exempi-2.1 )" # strigi? ( >=3Dapp-misc/strigi-0.7 ) +# mp3? ( qt4? ( >=3Dx11-libs/qt-gui-4.7.1:4 ) ) DEPEND=3D"${RDEPEND} >=3Ddev-util/intltool-0.40 >=3Dsys-devel/gettext-0.17 @@ -143,14 +143,17 @@ pkg_setup() { G2CONF=3D"${G2CONF} VALAC=3D$(type -P valac-0.12)" fi =20 - if use mp3 && (use gtk || use qt4); then - G2CONF=3D"${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)" + # if use mp3 && (use gtk || use qt4); then + if use mp3 && use gtk; then + #G2CONF=3D"${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)= " + G2CONF=3D"${G2CONF} --enable-gdkpixbuf" fi =20 # unicode-support: libunistring, libicu or glib ? # According to NEWS, introspection is required # FIXME: disabling streamanalyzer for now since tracker-sparql-builder.= h # is not being generated + # XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345 G2CONF=3D"${G2CONF} --disable-hal --enable-tracker-fts @@ -159,6 +162,7 @@ pkg_setup() { --enable-guarantee-metadata --enable-introspection --disable-libstreamanalyzer + --disable-qt $(use_enable applet tracker-search-bar) $(use_enable eds miner-evolution) $(use_enable exif libexif) @@ -203,20 +207,25 @@ src_prepare() { find "${S}" -name "*.pyc" -delete python_convert_shebangs -r 2 tests utils examples =20 + # Don't run firefox or thunderbird. It results in access violations on = some + # setups (bug #385347) and does nothing useful on Gentoo. + local ff_version=3D$(best_version www-client/firefox) + ff_version=3D${ff_version#www-client/firefox-} + local tb_version=3D$(best_version mail-client/thunderbird) + tb_version=3D${tb_version#mail-client/thunderbird-} + sed -e "s:firefox_version=3D.*:firefox_version=3D'${ff_version}':" \ + -e "s:thunderbird_version=3D.*:thunderbird_version=3D'${tb_version}':"= \ + -i configure.ac || die "sed failed" + # FIXME: report broken tests sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^= \(.*\)$:/*\1*/:' \ -e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.= *\)$:/*\1*/:' \ -i tests/libtracker-miner/tracker-password-provider-test.c || die =20 + eautoreconf gnome2_src_prepare } =20 -src_configure() { - # Apparently, "firefox --version" on some systems will try write to - # /dev/dri/card0 and trigger the sandbox. - VIRTUALX_COMMAND=3D"gnome2_src_configure" virtualmake -} - src_test() { unset DBUS_SESSION_BUS_ADDRESS Xemake check XDG_DATA_HOME=3D"${T}" XDG_CONFIG_HOME=3D"${T}" || die "te= sts failed"