Add patch from upstream, fixes bug 259891. Remove old.

(Portage version: 2.2_rc27/cvs/Linux i686)

4 files changed, 100 insertions, 57 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index dab6ba3512f8..77181ecc4142 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.16 2009/03/18 14:59:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.17 2009/03/28 18:25:12 ulm Exp $
+
+*libcanberra-0.11-r5 (28 Mar 2009)
+
+  28 Mar 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/libcanberra-0.11-dont-crash-without-display.patch,
+  -libcanberra-0.9.ebuild, -libcanberra-0.10.ebuild,
+  +libcanberra-0.11-r5.ebuild:
+  Add patch from upstream: don't crash if there is no default display on
+  initialization. Fixes bug 259891. Revbump to -r5 as requested by leio.
+  Remove old.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> libcanberra-0.11.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/media-libs/libcanberra/files/libcanberra-0.11-dont-crash-without-display.patch b/media-libs/libcanberra/files/libcanberra-0.11-dont-crash-without-display.patch
new file mode 100644
index 000000000000..856a9181f63f
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.11-dont-crash-without-display.patch
@@ -0,0 +1,77 @@
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 23 Mar 2009 20:55:36 +0000 (+0100)
+Subject: don't crash if there is no default display on initialization. Fixes #20693
+X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=ac5ac9e486aa33f7be0cd9ddd315c03780676795
+
+don't crash if there is no default display on initialization. Fixes #20693
+---
+
+diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
+index b9d8ae0..302eeb4 100644
+--- a/src/canberra-gtk-module.c
++++ b/src/canberra-gtk-module.c
+@@ -647,11 +647,15 @@ static gboolean idle_cb(void *userdata) {
+     return FALSE;
+ }
+ 
++static void connect_settings(void);
++
+ static gboolean emission_hook_cb(GSignalInvocationHint *hint, guint n_param_values, const GValue *param_values, gpointer data) {
+     static SoundEventData *d = NULL;
+     GdkEvent *e;
+     GObject *object;
+ 
++    connect_settings();
++
+     if (disabled)
+         return TRUE;
+ 
+@@ -719,15 +723,15 @@ static void enable_input_feedback_sounds_changed(GtkSettings *s, GParamSpec *arg
+     read_enable_input_feedback_sounds(s);
+ }
+ 
+-G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
++static void connect_settings(void) {
+     GtkSettings *s;
++    static gboolean connected = FALSE;
+ 
+-    /* This is the same quark libgnomeui uses! */
+-    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
+-    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
++    if (connected)
++        return;
+ 
+-    /* Hook up the gtk setting */
+-    s = gtk_settings_get_default();
++    if (!(s = gtk_settings_get_default()))
++        return;
+ 
+     if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-enable-input-feedback-sounds")) {
+         g_signal_connect(G_OBJECT(s), "notify::gtk-enable-input-feedback-sounds", G_CALLBACK(enable_input_feedback_sounds_changed), NULL);
+@@ -735,6 +739,18 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+     } else
+         g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-enable-input-feedback-sounds property.");
+ 
++    connected = TRUE;
++}
++
++G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
++
++    /* This is the same quark libgnomeui uses! */
++    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
++    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
++
++    /* Hook up the gtk setting */
++    connect_settings();
++
+     install_hook(GTK_TYPE_WINDOW, "show", &signal_id_widget_show);
+     install_hook(GTK_TYPE_WINDOW, "hide", &signal_id_widget_hide);
+     install_hook(GTK_TYPE_DIALOG, "response", &signal_id_dialog_response);
+@@ -749,7 +765,6 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+     install_hook(GTK_TYPE_ICON_VIEW, "selection-changed", &signal_id_icon_view_selection_changed);
+ }
+ 
+-
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
+ 
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module) {
diff --git a/media-libs/libcanberra/libcanberra-0.10.ebuild b/media-libs/libcanberra/libcanberra-0.11-r5.ebuild
index 0666bfdec039..035abeef93fd 100644
--- a/media-libs/libcanberra/libcanberra-0.10.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.11-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.10.ebuild,v 1.6 2009/02/11 08:48:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.11-r5.ebuild,v 1.1 2009/03/28 18:25:12 ulm Exp $
 
 EAPI="1"
 
-inherit gnome2-utils
+inherit eutils gnome2-utils
 
 DESCRIPTION="Portable Sound Event Library"
 HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
@@ -12,8 +12,8 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa doc gstreamer +gtk pulseaudio"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa doc gstreamer +gtk oss pulseaudio"
 
 RDEPEND="media-libs/libvorbis
 	sys-devel/libtool
@@ -27,14 +27,20 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.17
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-dont-crash-without-display.patch"	#259891
+}
+
 src_compile() {
 	econf --disable-static \
 		$(use_enable alsa) \
+		$(use_enable gstreamer) \
 		$(use_enable gtk) \
+		$(use_enable oss) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable gstreamer) \
 		$(use_enable doc gtk-doc) \
-		--disable-oss \
 		--disable-tdb \
 		--disable-lynx
 	# tdb support would need a split-out from samba before we can use it
diff --git a/media-libs/libcanberra/libcanberra-0.9.ebuild b/media-libs/libcanberra/libcanberra-0.9.ebuild
deleted file mode 100644
index 9c3bf64b6de5..000000000000
--- a/media-libs/libcanberra/libcanberra-0.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.9.ebuild,v 1.4 2009/02/27 18:36:49 josejx Exp $
-
-EAPI="1"
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa doc gstreamer gtk pulseaudio"
-
-RDEPEND="media-libs/libvorbis
-	sys-devel/libtool
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-	gtk? ( dev-libs/glib:2
-		>=x11-libs/gtk+-2.13.4:2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-src_compile() {
-	econf --disable-static \
-		$(use_enable alsa) \
-		$(use_enable gtk) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable gstreamer) \
-		$(use_enable doc gtk-doc) \
-		--disable-oss \
-		--disable-tdb \
-		--disable-lynx
-	# tdb support would need a split-out from samba before we can use it
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	rm "${D}/usr/share/doc/${PN}/README"
-	# If the rmdir errors, you probably need to add a file to dodoc
-	# and remove the package installed above
-	rmdir "${D}/usr/share/doc/${PN}"
-	dodoc README
-}