Fix excessive notifications from some streams; bug #166484

Package-Manager: portage-2.1.2-r9

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index dad8833377935f3e3e8ea885634f9bb0542e651b..1a2f05144664ec00ba0dd1ed836f085e4aef16ae 100644 (file)
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.86 2007/02/02 21:50:32 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.87 2007/02/13 21:04:12 dang Exp $
+
+*rhythmbox-0.9.7-r2 (13 Feb 2007)
+
+  13 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/rhythmbox-0.9.7-excessive-notification.patch,
+  +rhythmbox-0.9.7-r2.ebuild:
+  Fix excessive notifications from some streams; bug #166484
 
 *rhythmbox-0.9.7-r1 (02 Feb 2007)
 

diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 0605492ed2ea1752cff1468273e2f4fb86daea94..bb5fde30bd97d96d09e8f70d1e7817a53903f994 100644 (file)
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.8.7-gst_shn_support.patch 665 RMD160 8f8eec7bf19405ea70b7ab5984c5d5a96e834822 SHA1 033ca9aa8109a558162a6ddbbdf4f270da2e239c SHA256 1c4fbabdff94741c88fb92f37c84ae70e05be9054481241efcab49f8c2c19018
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
 RMD160 8f8eec7bf19405ea70b7ab5984c5d5a96e834822 files/rhythmbox-0.8.7-gst_shn_support.patch 665
@@ -26,6 +29,10 @@ AUX rhythmbox-0.9.7-daap_fix.patch 1185 RMD160 5529b848990e410ca090c778d05d45e8b
 MD5 8411cab9f1d3894aee9c56d8ed4c4eaf files/rhythmbox-0.9.7-daap_fix.patch 1185
 RMD160 5529b848990e410ca090c778d05d45e8bbea1501 files/rhythmbox-0.9.7-daap_fix.patch 1185
 SHA256 56c0af8afa900c267bc7eb2d17dbce216b080c837cefc7524d557b1eb2f3dd5c files/rhythmbox-0.9.7-daap_fix.patch 1185
+AUX rhythmbox-0.9.7-excessive-notification.patch 618 RMD160 b1d5f2550b672b2d64c131cbc7e4ff65062ace29 SHA1 213b269fd8aa55ac7fd837e619c959d90c0fb9ce SHA256 32cbaec58b7f82abaf34b7f2b21cab216523d005c16ed96607495159e59917e8
+MD5 32b9b46d3c52cecf7fdb56c21e57cd78 files/rhythmbox-0.9.7-excessive-notification.patch 618
+RMD160 b1d5f2550b672b2d64c131cbc7e4ff65062ace29 files/rhythmbox-0.9.7-excessive-notification.patch 618
+SHA256 32cbaec58b7f82abaf34b7f2b21cab216523d005c16ed96607495159e59917e8 files/rhythmbox-0.9.7-excessive-notification.patch 618
 DIST rhythmbox-0.8.8.tar.bz2 2435338 RMD160 7c436dd556c330ea98d87bad5cb304ab4a236020 SHA1 a48713cc191ce6df44f5466638dda39d56280243 SHA256 7faf1c10aaa198a1acacd3eb12979a2ea0730a0aa98d28f3c673a7f78b8dbda1
 DIST rhythmbox-0.9.4.1.tar.bz2 2155482 RMD160 5ce11aeae6631650cc4edfdbf46a7a13162d246f SHA1 dc59634de9471a14f62528c5a8453a284c74f7b0 SHA256 2d2305d575c7cc3a366ea9075efcb23b215da49b82b5b81ad3f8649a6cca80f6
 DIST rhythmbox-0.9.5.tar.bz2 2429543 RMD160 b51fd8800d00fd8a8ad16e1ab511cb40630fd4f1 SHA1 94b35f20c9fa45b105d4a068d83e150f4380e921 SHA256 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
@@ -51,14 +58,18 @@ EBUILD rhythmbox-0.9.7-r1.ebuild 3487 RMD160 211bfcaca169b36f50292bc069685b20ee0
 MD5 d95b1d728c56b34373a91d40eefec1be rhythmbox-0.9.7-r1.ebuild 3487
 RMD160 211bfcaca169b36f50292bc069685b20ee0312a7 rhythmbox-0.9.7-r1.ebuild 3487
 SHA256 f92694c7ca53efb12d59ac3b7688f95e9ddd70794f24e7627d702cf6e6d8a808 rhythmbox-0.9.7-r1.ebuild 3487
+EBUILD rhythmbox-0.9.7-r2.ebuild 3545 RMD160 491dbc18da3eb5097df3dafd755129b786f45250 SHA1 7b8fb951bfea8d0a0cfe1ae05470d2d8ffcdbe83 SHA256 e8c944d09105ad1ee71d41ca5d7f5688334862afde7fe20dba545c4d2b56c55b
+MD5 8c83f62d4484b85b654fe18a1808ce9d rhythmbox-0.9.7-r2.ebuild 3545
+RMD160 491dbc18da3eb5097df3dafd755129b786f45250 rhythmbox-0.9.7-r2.ebuild 3545
+SHA256 e8c944d09105ad1ee71d41ca5d7f5688334862afde7fe20dba545c4d2b56c55b rhythmbox-0.9.7-r2.ebuild 3545
 EBUILD rhythmbox-0.9.7.ebuild 3340 RMD160 2ef4214092a10acdb6777a32a2954ec1e17d67ff SHA1 1f6df125128d2a8ce8188f93b927f7309616764b SHA256 35b23740ec6121c7e766b632ff6ae0a883a6e0d9144f3ee282580e18e4590ee4
 MD5 9955e32da057f39a419d2c1d06b48839 rhythmbox-0.9.7.ebuild 3340
 RMD160 2ef4214092a10acdb6777a32a2954ec1e17d67ff rhythmbox-0.9.7.ebuild 3340
 SHA256 35b23740ec6121c7e766b632ff6ae0a883a6e0d9144f3ee282580e18e4590ee4 rhythmbox-0.9.7.ebuild 3340
-MISC ChangeLog 11665 RMD160 81657fb5f73d9f4ba90cd567ed9f2d6032bf152f SHA1 1fc8c7db835cc3736ed50fa4b3bbab6a15c3c230 SHA256 c01b55c24a4600a59e458fcd0587c7be91ddaaead522f1a76674311287424662
-MD5 2c109d02cfc4dfbef2d566d3f97d3d3c ChangeLog 11665
-RMD160 81657fb5f73d9f4ba90cd567ed9f2d6032bf152f ChangeLog 11665
-SHA256 c01b55c24a4600a59e458fcd0587c7be91ddaaead522f1a76674311287424662 ChangeLog 11665
+MISC ChangeLog 11898 RMD160 77b0c25dc490f02e924dc6df04a36224ab779edf SHA1 5f816b671abc6eafcd6d6bd76fa4d759d70e7e92 SHA256 e8e340228edffdafbd759397e870874dd504ac2e94c2964928bd52aff6f0ce8f
+MD5 7e7217edb33eac84ba7f397f9083abc6 ChangeLog 11898
+RMD160 77b0c25dc490f02e924dc6df04a36224ab779edf ChangeLog 11898
+SHA256 e8e340228edffdafbd759397e870874dd504ac2e94c2964928bd52aff6f0ce8f ChangeLog 11898
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200
@@ -81,3 +92,13 @@ SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/di
 MD5 a25f279ade6a38fa5491711846736bf0 files/digest-rhythmbox-0.9.7-r1 253
 RMD160 7ad58e52c516b9a01adcc901ddc6b6795306f307 files/digest-rhythmbox-0.9.7-r1 253
 SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/digest-rhythmbox-0.9.7-r1 253
+MD5 a25f279ade6a38fa5491711846736bf0 files/digest-rhythmbox-0.9.7-r2 253
+RMD160 7ad58e52c516b9a01adcc901ddc6b6795306f307 files/digest-rhythmbox-0.9.7-r2 253
+SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/digest-rhythmbox-0.9.7-r2 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF0ifAomPajV0RnrERAgpFAJ9C5QekSmNm8Rz6bpmpmHQhW8fXwQCfQV5H
+S3zstp+poUe1DBl8vH4laIQ=
+=Nsin
+-----END PGP SIGNATURE-----

diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r2 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r2
new file mode 100644 (file)
index 0000000..9b731a1
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r2
@@ -0,0 +1,3 @@
+MD5 3ca989c655c5931ce056af7ff311885b rhythmbox-0.9.7.tar.bz2 3231718
+RMD160 547643b40b36e4e0c18b6d817c37426ce585119f rhythmbox-0.9.7.tar.bz2 3231718
+SHA256 2fac1912a15c19841d4ca3188df7aa8c7aaa37dbbffb279b24259cc1281ff995 rhythmbox-0.9.7.tar.bz2 3231718

diff --git a/media-sound/rhythmbox/files/rhythmbox-0.9.7-excessive-notification.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.7-excessive-notification.patch
new file mode 100644 (file)
index 0000000..ace510e
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.9.7-excessive-notification.patch
@@ -0,0 +1,16 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN rhythmbox-0.9.7.orig/sources/rb-streaming-source.c rhythmbox-0.9.7/sources/rb-streaming-source.c
+--- rhythmbox-0.9.7.orig/sources/rb-streaming-source.c 2006-10-30 08:51:11.000000000 -0500
++++ rhythmbox-0.9.7/sources/rb-streaming-source.c      2007-02-13 15:53:31.000000000 -0500
+@@ -360,6 +360,12 @@ set_streaming_metadata (RBStreamingSourc
+                       const char *value)
+ {
+       GValue v = {0,};
++
++      /* don't do anything if the value isn't changing */
++      if (*field != NULL && strcmp (*field, value) == 0) {
++              return;
++      }
++
+       g_free (*field);
+       *field = g_strdup (value);
+ 

diff --git a/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild
new file mode 100644 (file)
index 0000000..a885740
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild,v 1.1 2007/02/13 21:04:12 dang Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
+tagwriting python keyring"
+#I want tagwriting to be on by default in the future. It is just a local flag
+#now because it is still considered experimental by upstream and doesn't work
+#well with all formats due to gstreamer limitation.
+
+SLOT="0"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+       >=gnome-base/libgnomeui-2
+       >=gnome-base/libglade-2
+       >=gnome-base/gnome-vfs-2.7.4
+       >=gnome-base/libbonobo-2
+       >=gnome-extra/nautilus-cd-burner-2.11.3
+       >=media-video/totem-1.1.5
+       >=x11-libs/libsexy-0.1.5
+       >=gnome-extra/gnome-media-2.14.0
+       >=media-plugins/gst-plugins-cdparanoia-0.10
+       keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+       musicbrainz? ( >=media-libs/musicbrainz-2.1 )
+       >=net-libs/libsoup-2.2.99
+       hal? ( ipod? ( >=media-libs/libgpod-0.4 )
+                       >=sys-apps/hal-0.5 )
+       avahi? ( >=net-dns/avahi-0.6 )
+       !avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
+       dbus? ( || ( >=dev-libs/dbus-glib-0.71
+                       ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
+       >=media-libs/gst-plugins-base-0.10
+       >=media-plugins/gst-plugins-gnomevfs-0.10
+       vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10
+                               >=media-plugins/gst-plugins-ogg-0.10 )
+       mad? ( >=media-plugins/gst-plugins-mad-0.10 )
+       flac? ( >=media-plugins/gst-plugins-flac-0.10 )
+       libnotify? ( >=x11-libs/libnotify-0.3.2 )
+       python? ( >=dev-lang/python-2.4.2
+                               >=dev-python/pygtk-2.8
+                               >=dev-python/gnome-python-2.12 )"
+
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       >=dev-util/intltool-0.29
+       app-text/scrollkeeper"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+
+       if ! use avahi && ! use howl; then
+               if use daap ; then
+               ewarn "Daap support requires either howl or avahi"
+               ewarn "to be installed. Please remerge with either"
+               ewarn "USE=avahi or USE=howl"
+               fi
+       fi
+       if use howl || use avahi ; then
+               G2CONF="${G2CONF} $(use_enable daap)"
+       fi
+
+       if use howl ; then
+               G2CONF="${G2CONF} --with-mdns=howl"
+       fi
+
+       if use avahi ; then
+               G2CONF="${G2CONF} --with-mdns=avahi"
+       fi
+
+       G2CONF="${G2CONF} \
+       $(use_enable tagwriting tag-writing) \
+       $(use_with ipod) \
+       $(use_enable ipod ipod-writing) \
+       $(use_enable musicbrainz) \
+       $(use_with dbus) \
+       $(use_enable python) \
+       $(use_enable libnotify) \
+       $(use_enable lirc) \
+       $(use_with keyring gnome-keyring)
+       --with-playback=gstreamer-0-10 \
+       --with-cd-burning
+       --enable-mmkeys \
+       --enable-audioscrobbler \
+       --enable-track-transfer \
+       --with-metadata-helper \
+       --disable-schemas-install"
+
+DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
+         MAINTAINERS NEWS README README.iPod THANKS TODO"
+
+export GST_INSPECT=/bin/true
+USE_DESTDIR=1
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch "${FILESDIR}"/${P}-daap_fix.patch
+       epatch "${FILESDIR}"/${P}-excessive-notification.patch
+       gnome2_omf_fix
+}
+
+src_compile() {
+       addpredict "$(unset HOME; echo ~)/.gconf"
+       addpredict "$(unset HOME; echo ~)/.gconfd"
+       gnome2_src_compile
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+       elog "The aac flag has been removed from rhythmbox."
+       elog "This is due to stabilization issues with any gst-bad plugins."
+       elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
+       elog "See bug #159538 for more information"
+}