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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 56 insertions, 15 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/Manifest b/media-sound/pavucontrol/Manifest
index b6821aa79d5e..a4e1bf5532fe 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX pavucontrol-0.9.8-icons.patch 1114 RMD160 d8fddb6933510047b648267de2ed127e36658be9 SHA1 f991e06a9404ab1c1d918e400b8ce043c934f72d SHA256 fb23ef038551c2585b11af1ec04808531ebf5f5cd42df137992741359336361f
 DIST pavucontrol-0.9.4.tar.gz 92837 RMD160 6b709fdde8d734463e3e411a238198dea01b79a1 SHA1 bfa42b8be909a540927d6c93ffdf068202227ba6 SHA256 e44d39ad35e849ccb0bfddd7204eb1d1517c855fa94c40af28beffd819f86a54
 DIST pavucontrol-0.9.5.tar.gz 94981 RMD160 007e287d9aff2cc64c0538ae524cef058c02c934 SHA1 370b350205010ba03f1d102f310c8d90f9d8e95d SHA256 6c743728c9623c43952ab259c35fecf58d67d36c82de6fe0c46e9ddc960b76f8
 DIST pavucontrol-0.9.8.tar.gz 211683 RMD160 fa4423af427e1ffa174c623011326c7e7e903353 SHA1 01d899f149b161043d0e56b197f1aa2314900a50 SHA256 e0ac5d5a0e936d564785270c6dab756d156c7d24d06a9ab71e1c87362b221447
 EBUILD pavucontrol-0.9.4.ebuild 986 RMD160 b64ccadeaac1f1d9253d61d8732e9ed7db775570 SHA1 2bc5bc3d18838c811fa4e41e3fc8c065d7a73d2b SHA256 ff6dff62a21057fb659651fa1897b669fd8037701d8eb36c8b22c59bad201fc5
 EBUILD pavucontrol-0.9.5.ebuild 1245 RMD160 06c98c8cf3ab7322d944550b226b56dfa763c775 SHA1 d39f5e9da79f119fcd205bd05d12103cf5183974 SHA256 40497a4b8444f514164546630cbff9446a595a0184cc659a67154a3f26a29f11
-EBUILD pavucontrol-0.9.8.ebuild 1067 RMD160 26482ee59ab178115d3176a1fd4fc8565d79bce4 SHA1 85cce8303709899dfef91a7f0d90ed05fe003aa3 SHA256 6ed1bae6285524cf51e0a9ee56cc7484197cc2b61914cc8b24b09045183fda18
-MISC ChangeLog 3496 RMD160 a40bd1a1e43b44495aa04ce5cfad6c50d1e8e321 SHA1 6a67ea09a0ef2e2b1614ac5ba55bbc0058a0eeac SHA256 c611229995c1f724ad11c28b007fcd23d32edfec49ea15b1c2960baae6e52f11
+EBUILD pavucontrol-0.9.8-r1.ebuild 1178 RMD160 5e00d9b76953aede035ee9f99bfbba935fc48d32 SHA1 3dd2352ef5121751b91fd3e141b73b2cefb00ae5 SHA256 57b4a05b4f912657b13fb5c00270cf7e0dc3fa943e694f5cf72a7ed54f97ebd5
+MISC ChangeLog 3763 RMD160 89e267656aa39485b68e064bfcecad30a8ee0294 SHA1 d0c33a79fd05c69239a4a13d4df2195d34a2d99c SHA256 9731e7745a9d0c9139045b4691c081a90933464b25e7eccecc37b7c1c4fd36b3
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpWC7cACgkQAiZjviIA2Xh6GQCeIhoW2q/5IkAiXJOZT8A0A9UN
-e9oAoMbZnIKmfyVkTnLk3ndo+KbV0Kty
-=AUm9
------END PGP SIGNATURE-----
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} \