From: Alexandre Rostovtsev Date: Sat, 26 Nov 2011 19:27:22 +0000 (+0000) Subject: Bump, fixes a number of crashes and leaks. Also, loosen version restriction on nautil... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2a94fbc104cd9915c7d71f17fb80202894287bdd;p=gentoo.git Bump, fixes a number of crashes and leaks. Also, loosen version restriction on nautilus-tracker-tags to make updates easier. Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog index bcb7e779fad0..5a63ff794d89 100644 --- a/app-misc/tracker/ChangeLog +++ b/app-misc/tracker/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/tracker # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.118 2011/11/08 22:25:58 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.119 2011/11/26 19:27:22 tetromino Exp $ + +*tracker-0.12.8 (26 Nov 2011) + + 26 Nov 2011; Alexandre Rostovtsev + tracker-0.12.7.ebuild, +tracker-0.12.8.ebuild: + Bump, fixes a number of crashes and leaks. Also, loosen version restriction + on nautilus-tracker-tags to make updates easier. 08 Nov 2011; Gilles Dartiguelongue tracker-0.12.7.ebuild, tracker-9999.ebuild: diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index 905fe7bff70f..0171dbb745ba 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX tracker-0.12.3-strigi.patch 1166 RMD160 a7d225010ba23cf1c2526ce08f97f73718b0442c SHA1 a950e59e69d4e78fd250d961e5a0feed29b4654a SHA256 01078f04c1f5c37e767d0bc4ea13f8dc2d478ed95498cb350d915768f71aa8f0 AUX tracker-0.8.0-strigi.patch 1385 RMD160 69d07b6145de6919cc1550e4722737cf5b96051d SHA1 5221ac64d5c21e540bb0bb07bd074b3ad5ce0a27 SHA256 7ae959cd52ac96f6427646089b554e0572727f27d5d4aab1913f795e270a4ccb @@ -10,16 +10,18 @@ AUX tracker-0.8.17-use-upower.patch 16884 RMD160 a9545a4aa89b6574ccb58d5b9796386 DIST tracker-0.10.27.tar.xz 5721444 RMD160 63e3609ac51fae013fc0daf9935ec50ef3a4c609 SHA1 01f0a52a21c3aecaaf6cfb140f7a4b5085a7bc5f SHA256 30ca97cc8a1c82cb0e09a921c0ebe8acbfe7be6908b2303266f447477465444f DIST tracker-0.10.35.tar.xz 5754872 RMD160 6919a7623bf3f041b617d7c2a2b55856863b5e9e SHA1 93fdeb6be256085e72f1ab9f9e578332de9605f0 SHA256 5f6a32d0b2b0036f4aec74a6d36d889e33ea038a1530161ca4eb9a549cc87fe3 DIST tracker-0.12.7.tar.xz 5969180 RMD160 e31b85538145404640c303968ecbbb8f729d2564 SHA1 188c9aaa5478302be818e36c3ef126267971289d SHA256 e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4 +DIST tracker-0.12.8.tar.xz 5876100 RMD160 10f29842973c0489d5e0c2e0c0c977ca87d47fee SHA1 a1a528bdcaacce4350c2368026083236db7cd165 SHA256 92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473 EBUILD tracker-0.10.27.ebuild 6070 RMD160 1b551075534798b0e4a70cde2b99ea28bbaf16c0 SHA1 1a4fa27525df3114dc7d9348d40c9a9b927fc969 SHA256 cf380edbe80f5da7f7643167a4e275e8b70a1b1aae861b4fefbd1463fd0bd2bc EBUILD tracker-0.10.35.ebuild 6070 RMD160 ec058f97ccc92537c39121d363a4ca00b8b0afc0 SHA1 41954ff9631eb25fa957aaaa61ab09cd679ae47d SHA256 8aab9dca68b1742e410805453c21beb5907dda8d44ca3ea742d89b0aeab55d43 -EBUILD tracker-0.12.7.ebuild 8187 RMD160 d0fb114422d8b95cbf64386075a85c1b88982570 SHA1 4f5932f6578a09a6ddbb537964a5359061a6d5b6 SHA256 550f6e81a6e7031e247d97832f91e7cc9da4fc3c064e5bf881d49ea77f294cac +EBUILD tracker-0.12.7.ebuild 8194 RMD160 6fd960ab3cdb6b5dbe420e4d0d1f2ffbea532333 SHA1 213efafb4ee9193c4dc7e7abad83d919cfe1a511 SHA256 ce3ebab4da59c13f66bf42c0c932bf8c4dabe7fe7801fd5568c2c30bf19a4f69 +EBUILD tracker-0.12.8.ebuild 8194 RMD160 73fe976dc81eea1a7e0815af0d64f4d154b580c4 SHA1 50b4baa7a7124dc5c4a3b44e9f914c2c267d02df SHA256 2a63abef9fd217b260dd5ed3c2f9a5844f4b89a4a89b621202f5ddea01dbdf08 EBUILD tracker-9999.ebuild 8057 RMD160 b7a474f317dc513b14b67b2f104364e25887c2c8 SHA1 ce178ba141214db723e15ad29bbc82b9060dad68 SHA256 e6ae652a7f28d3df682078bb3d06dfe4b2baa21fc66839e0af25da9492657898 -MISC ChangeLog 21969 RMD160 86550b379ceb92c8a3a61a2108db9a8b298db333 SHA1 10805be676fe699a4f3978518f4682e90430e8d0 SHA256 92cd4aa3fb8c65b2bc5ad4abd4a52351db478ff57798fad6948b0e2821ea6160 +MISC ChangeLog 22244 RMD160 09aca966260a96b91daa1f05a2aa987c31c8bc18 SHA1 b5704d6fda300de4e0e401e5dd7587f5cb850059 SHA256 9eee0b7c89a32a1b96433131676bb198a89d2bbf6d477567cd27079f4054dc4b MISC metadata.xml 1493 RMD160 7c1571bebea478fa6ecbdbf94aad99745da96d50 SHA1 70c721ac6e96538e2978dd4d361682af516dd1a6 SHA256 7d6953b715e4656de079be4a23c5be6acd1695a5b3a50f5ab8f1ddc437104e3a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk65rHsACgkQ1fmVwcYIWAa8NQCdGjlqDSYwCk9OM4M8UQXgbmW4 -PLcAoLahjWYotdtGE7HOOwfy5oLoaGA8 -=prUE +iF4EAREIAAYFAk7RPaAACgkQdjK8w9WeBnCYxgD+PI2i9zXzZuE1ZCZLK/zPSArx +qSdks2jETVJK7piZp4oA/0W3HXiYeKv7k9+cBuJ/te85PnyPHBNJVz2k8csfMHLj +=Rn5e -----END PGP SIGNATURE----- diff --git a/app-misc/tracker/tracker-0.12.7.ebuild b/app-misc/tracker/tracker-0.12.7.ebuild index 2b511b90c7b9..63de79a65825 100644 --- a/app-misc/tracker/tracker-0.12.7.ebuild +++ b/app-misc/tracker/tracker-0.12.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.2 2011/11/08 22:25:58 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.3 2011/11/26 19:27:22 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -106,7 +106,7 @@ DEPEND="${RDEPEND} >=sys-apps/dbus-1.3.1[X] ) " # strigi? ( >=dev-lang/vala-0.12:0.12 ) -PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )" +PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.12.7 )" function inotify_enabled() { if linux_config_exists; then diff --git a/app-misc/tracker/tracker-0.12.8.ebuild b/app-misc/tracker/tracker-0.12.8.ebuild new file mode 100644 index 000000000000..481ca5c608a1 --- /dev/null +++ b/app-misc/tracker/tracker-0.12.8.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.8.ebuild,v 1.1 2011/11/26 19:27:22 tetromino Exp $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="xz" +PYTHON_DEPEND="2:2.6" + +inherit eutils gnome2 linux-info multilib python versionator + +DESCRIPTION="A tagging metadata database, search tool and indexer" +HOMEPAGE="http://www.tracker-project.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# USE="doc" is managed by eclass. +IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi + +# Test suite highly disfunctional, loops forever +# putting aside for now +RESTRICT="test" + +# vala is built with debug by default (see VALAFLAGS) +# According to NEWS, introspection is non-optional +# glibc-2.12 needed for SCHED_IDLE (see bug #385003) +RDEPEND=" + >=app-i18n/enca-1.9 + >=dev-db/sqlite-3.7[threadsafe] + >=dev-libs/glib-2.28:2 + >=dev-libs/gobject-introspection-0.9.5 + >=dev-libs/icu-4 + || ( + >=media-gfx/imagemagick-5.2.1[png,jpeg=] + media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) + >=media-libs/libpng-1.2 + >=x11-libs/pango-1 + sys-apps/util-linux + + applet? ( + >=gnome-base/gnome-panel-2.91.6 + >=x11-libs/gdk-pixbuf-2.12:2 + >=x11-libs/gtk+-3.0:3 ) + eds? ( + >=mail-client/evolution-2.91.90 + >=gnome-extra/evolution-data-server-2.91.90 ) + elibc_glibc? ( >=sys-libs/glibc-2.12 ) + exif? ( >=media-libs/libexif-0.6 ) + firefox-bookmarks? ( || ( + >=www-client/firefox-4.0 + >=www-client/firefox-bin-4.0 ) ) + flac? ( >=media-libs/flac-1.2.1 ) + flickr? ( net-libs/rest:0.7 ) + gif? ( media-libs/giflib ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 ) + gsf? ( + app-text/odt2txt + >=gnome-extra/libgsf-1.13 ) + gstreamer? ( + >=media-libs/gstreamer-0.10.31:0.10 + upnp? ( >=media-libs/gupnp-dlna-0.5 ) + !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) ) + !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) + gtk? ( + >=dev-libs/libgee-0.3:0 + >=x11-libs/gtk+-3.0.0:3 ) + iptc? ( media-libs/libiptcdata ) + jpeg? ( virtual/jpeg:0 ) + laptop? ( >=sys-power/upower-0.9 ) + mp3? ( + >=media-libs/taglib-1.6 + gtk? ( x11-libs/gdk-pixbuf:2 ) ) + networkmanager? ( >=net-misc/networkmanager-0.8 ) + pdf? ( + >=x11-libs/cairo-1 + >=app-text/poppler-0.16[cairo,utils] + >=x11-libs/gtk+-2.12:2 ) + playlist? ( dev-libs/totem-pl-parser ) + rss? ( net-libs/libgrss ) + thunderbird? ( || ( + >=mail-client/thunderbird-5.0 + >=mail-client/thunderbird-bin-5.0 ) ) + tiff? ( media-libs/tiff ) + vorbis? ( >=media-libs/libvorbis-0.22 ) + xine? ( >=media-libs/xine-lib-1 ) + xml? ( >=dev-libs/libxml2-2.6 ) + xmp? ( >=media-libs/exempi-2.1 )" +# strigi? ( >=app-misc/strigi-0.7 ) +# mp3? ( qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) ) +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + >=dev-util/pkgconfig-0.20 + applet? ( >=dev-lang/vala-0.12:0.12 ) + gtk? ( + >=dev-lang/vala-0.12:0.12 + >=dev-libs/libgee-0.3 ) + doc? ( + app-office/dia + >=dev-util/gtk-doc-1.8 + media-gfx/graphviz ) + test? ( + >=dev-libs/dbus-glib-0.82-r1 + >=sys-apps/dbus-1.3.1[X] ) +" +# strigi? ( >=dev-lang/vala-0.12:0.12 ) +PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.12.7 )" + +function inotify_enabled() { + if linux_config_exists; then + if ! linux_chkconfig_present INOTIFY_USER; then + ewarn "You should enable the INOTIFY support in your kernel." + ewarn "Check the 'Inotify support for userland' under the 'File systems'" + ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config" + die 'missing CONFIG_INOTIFY' + fi + else + einfo "Could not check for INOTIFY support in your kernel." + fi +} + +pkg_setup() { + linux-info_pkg_setup + + inotify_enabled + + if use gstreamer ; then + G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer" + if use upnp; then + G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna" + else + G2CONF="${G2CONF} --with-gstreamer-backend=discoverer" + fi + elif use xine ; then + G2CONF="${G2CONF} --enable-generic-media-extractor=xine" + else + G2CONF="${G2CONF} --enable-generic-media-extractor=external" + fi + + # if use applet || use gtk || use strigi; then + if use applet || use gtk; then + G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)" + fi + + # if use mp3 && (use gtk || use qt4); then + if use mp3 && use gtk; then + #G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)" + G2CONF="${G2CONF} --enable-gdkpixbuf" + fi + + # 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 + # nautilus extension is in a separate package, nautilus-tracker-tags + G2CONF="${G2CONF} + --disable-hal + --disable-libcue + --enable-tracker-fts + --with-enca + --with-unicode-support=libicu + --enable-guarantee-metadata + --enable-introspection + --disable-libstreamanalyzer + --disable-qt + --disable-nautilus-extension + $(use_enable applet tracker-search-bar) + $(use_enable eds miner-evolution) + $(use_enable exif libexif) + $(use_enable firefox-bookmarks miner-firefox) + $(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions) + FIREFOX=${S}/firefox-version.sh + $(use_enable flac libflac) + $(use_enable flickr miner-flickr) + $(use_enable gnome-keyring) + $(use_enable gsf libgsf) + $(use_enable gtk tracker-explorer) + $(use_enable gtk tracker-preferences) + $(use_enable gtk tracker-needle) + $(use_enable iptc libiptcdata) + $(use_enable jpeg libjpeg) + $(use_enable laptop upower) + $(use_enable mp3 taglib) + $(use_enable networkmanager network-manager) + $(use_enable pdf poppler) + $(use_enable playlist) + $(use_enable rss miner-rss) + $(use_enable test functional-tests) + $(use_enable test unit-tests) + $(use_enable thunderbird miner-thunderbird) + $(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions) + THUNDERBIRD=${S}/thunderbird-version.sh + $(use_enable tiff libtiff) + $(use_enable vorbis libvorbis) + $(use_enable xml libxml2) + $(use_enable xmp exempi)" + # $(use_enable strigi libstreamanalyzer) + + DOCS="AUTHORS ChangeLog NEWS README" + + python_set_active_version 2 +} + +src_prepare() { + # Fix build failures with USE=strigi + epatch "${FILESDIR}/${PN}-0.12.3-strigi.patch" + + # Fix functional tests scripts + find "${S}" -name "*.pyc" -delete + python_convert_shebangs -r 2 tests utils examples + + # 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 + create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh + + # 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 + + gnome2_src_prepare +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed" +} + +src_install() { + gnome2_src_install + + # Manually symlink extensions for {firefox,thunderbird}-bin + if use firefox-bookmarks; then + dosym /usr/share/xul-ext/trackerfox \ + /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org || die + fi + + if use thunderbird; then + dosym /usr/share/xul-ext/trackerbird \ + /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org || die + fi +} + +create_version_script() { + # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))" + + local v=$(best_version ${1}) + v=${v#${1}-} + local vbin=$(best_version ${1}-bin) + vbin=${vbin#${1}-bin-} + + if [[ -z ${v} ]]; then + v=${vbin} + else + version_compare ${v} ${vbin} + [[ $? -eq 1 ]] && v=${vbin} + fi + + echo -e "#!/bin/sh\necho $2 $v" > "$3" || die + chmod +x "$3" || die +}