Don't abort if icons are not found wrt #273815, thanks to Robert Förster.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 53 insertions, 3 deletions

diff --git a/media-sound/pavucontrol/ChangeLog b/media-sound/pavucontrol/ChangeLog
index bedf57ed2a0f..563263de13e6 100644
--- a/media-sound/pavucontrol/ChangeLog
+++ b/media-sound/pavucontrol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pavucontrol
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.23 2009/07/09 15:24:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.24 2009/07/19 13:11:29 ssuominen Exp $
+
+*pavucontrol-0.9.8-r1 (19 Jul 2009)
+
+  19 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  pavucontrol-0.9.8.ebuild, +pavucontrol-0.9.8-r1.ebuild,
+  +files/pavucontrol-0.9.8-icons.patch:
+  Don't abort if icons are not found wrt #273815, thanks to Robert Förster.
 
   09 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   pavucontrol-0.9.8.ebuild:
diff --git a/media-sound/pavucontrol/files/pavucontrol-0.9.8-icons.patch b/media-sound/pavucontrol/files/pavucontrol-0.9.8-icons.patch
new file mode 100644
index 000000000000..7ec645848f69
--- /dev/null
+++ b/media-sound/pavucontrol/files/pavucontrol-0.9.8-icons.patch
@@ -0,0 +1,38 @@
+From 874ebedf163195c7d54d5f9da3ff1725c1e43aa2 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Sun, 14 Jun 2009 19:28:32 +0200
+Subject: [PATCH] don't abort when icon is missing from the theme
+
+---
+ src/mainwindow.cc |   13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/mainwindow.cc b/src/mainwindow.cc
+index 9d2a33d..61156c4 100644
+--- a/src/mainwindow.cc
++++ b/src/mainwindow.cc
+@@ -111,12 +111,17 @@ static void set_icon_name_fallback(Gtk::Image *i, const char *name, Gtk::IconSiz
+ 
+     Gtk::IconSize::lookup(size, width, height);
+     theme = Gtk::IconTheme::get_default();
+-    pixbuf = theme->load_icon(name, width, Gtk::ICON_LOOKUP_GENERIC_FALLBACK);
+ 
+-    if (pixbuf)
+-        i->set(pixbuf);
+-    else
++    try {
++        pixbuf = theme->load_icon(name, width, Gtk::ICON_LOOKUP_GENERIC_FALLBACK);
++
++        if (pixbuf)
++            i->set(pixbuf);
++        else
++            i->set(name);
++    } catch (Gtk::IconThemeError &e) {
+         i->set(name);
++    }
+ }
+ 
+ void MainWindow::updateCard(const pa_card_info &info) {
+-- 
+1.6.2.4
+
diff --git a/media-sound/pavucontrol/pavucontrol-0.9.8.ebuild b/media-sound/pavucontrol/pavucontrol-0.9.8-r1.ebuild
index 521b378e4732..eba98bb36f95 100644
--- a/media-sound/pavucontrol/pavucontrol-0.9.8.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-0.9.8-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-0.9.8.ebuild,v 1.4 2009/07/09 15:24:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-0.9.8-r1.ebuild,v 1.1 2009/07/19 13:11:29 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
 HOMEPAGE="http://0pointer.de/lennart/projects/pavucontrol/"
@@ -19,12 +20,16 @@ RDEPEND="dev-cpp/gtkmm:2.4
 	>=x11-libs/gtk+-2.16:2
 	>=media-sound/pulseaudio-0.9.15[glib]
 	>=media-libs/libcanberra-0.11[gtk]
-	x11-themes/gnome-icon-theme"
+	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext
 		dev-util/intltool )
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-icons.patch
+}
+
 src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \