Desktops different than GNOME need a xinit.d file (#520550 by ssuominen), add a fix from upstream for wayland, drop old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 165 insertions, 117 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index ab59104f6b7a..992503f8c583 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.109 2014/08/22 14:33:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.110 2014/10/14 08:23:21 pacho Exp $
+
+*libcanberra-0.30-r2 (14 Oct 2014)
+
+  14 Oct 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/libcanberra-0.30-wayland.patch, +files/libcanberra-gtk-module.sh,
+  +libcanberra-0.30-r2.ebuild, -files/gconf-2.m4,
+  -files/libcanberra-0.28-underlinking.patch,
+  -files/libcanberra-0.28-workaround-hang.patch:
+  Desktops different than GNOME need a xinit.d file (#520550 by ssuominen), add
+  a fix from upstream for wayland, drop old
 
   22 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
   libcanberra-0.30-r1.ebuild:
diff --git a/media-libs/libcanberra/files/gconf-2.m4 b/media-libs/libcanberra/files/gconf-2.m4
deleted file mode 100644
index 4a0936e44ed8..000000000000
--- a/media-libs/libcanberra/files/gconf-2.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH([gconf-schema-file-dir],
-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-			     [Directory for installing schema files.]),
-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-  	AC_HELP_STRING([--disable-schemas-install],
-		       [Disable the schemas installation]),
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
diff --git a/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch b/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch
deleted file mode 100644
index aa4843933932..000000000000
--- a/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 14504663805b9cdc5e514cacdadb7c137a06d6e1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Sun, 15 May 2011 15:02:34 +0200
-Subject: [PATCH] build-sys: link gtk and gtk3 modules to libX11 as well as
- Gtk itself.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Both of the modules use the XFree/XGetWindowProperty functions which are
-exposed by libX11; without this change, the modules would be
-underlinked, which causes some link editors to refuse the link (including
-GNU gold).
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
----
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 98102cc..2aaa51f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,7 +383,7 @@ AC_ARG_ENABLE([gtk],
- 
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
- if test "x${gtk}" != xno ; then
--    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ],
-+    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 x11 ],
-         [
-             HAVE_GTK=1
-             AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
-@@ -422,7 +422,7 @@ AC_ARG_ENABLE([gtk3],
-         [gtk3=auto])
- 
- if test "x${gtk3}" != xno ; then
--    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ],
-+    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 x11 ],
-         [
-             HAVE_GTK3=1
-             AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
--- 
-1.7.5.rc3
-
diff --git a/media-libs/libcanberra/files/libcanberra-0.28-workaround-hang.patch b/media-libs/libcanberra/files/libcanberra-0.28-workaround-hang.patch
deleted file mode 100644
index bc84ce30b41e..000000000000
--- a/media-libs/libcanberra/files/libcanberra-0.28-workaround-hang.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 151ddf4a0d6f4db39ccabf78b083a4343623bbc7 Mon Sep 17 00:00:00 2001
-From: Christopher Aillon <caillon@redhat.com>
-Date: Sat, 5 Mar 2011 11:03:31 -0800
-Subject: [PATCH] Workaround a hang if there are server problems
-
-https://bugs.freedesktop.org/show_bug.cgi?id=35024
----
- src/pulse.c |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulse.c b/src/pulse.c
-index d4225d1..8b4188b 100644
---- a/src/pulse.c
-+++ b/src/pulse.c
-@@ -312,10 +312,6 @@ static void context_state_cb(pa_context *pc, void *userdata) {
-                         }
- 
-                         p->subscribed = FALSE;
--
--                        /* If we managed to connect once, then let's try to
--                         * reconnect, and pass NOFAIL */
--                        context_connect(c, TRUE);
-                 }
-         }
- 
--- 
-1.7.4.1
-
diff --git a/media-libs/libcanberra/files/libcanberra-0.30-wayland.patch b/media-libs/libcanberra/files/libcanberra-0.30-wayland.patch
new file mode 100644
index 000000000000..e51cfe00c0df
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.30-wayland.patch
@@ -0,0 +1,64 @@
+From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
+From: Michael Meeks <michael.meeks@suse.com>
+Date: Fri, 09 Nov 2012 16:16:40 +0000
+Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland
+
+---
+diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
+index 67791f0..c1532ab 100644
+--- a/src/canberra-gtk-module.c
++++ b/src/canberra-gtk-module.c
+@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
+         gboolean ret = FALSE;
+         Atom xembed;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return FALSE;
++#endif
++
+         /* Gnome Panel applets are XEMBED windows. We need to make sure we
+          * ignore them */
+ 
+diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
+index 34446f5..08cb668 100644
+--- a/src/canberra-gtk.c
++++ b/src/canberra-gtk.c
+@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+--
+cgit v0.9.2
diff --git a/media-libs/libcanberra/files/libcanberra-gtk-module.sh b/media-libs/libcanberra/files/libcanberra-gtk-module.sh
new file mode 100644
index 000000000000..63c16af71861
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-gtk-module.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# to be sourced
+
+case "$SESSION" in
+	GNOME)
+		# Done by gnome-settings-daemon
+		;;
+	*)
+		if [ -z "$GTK_MODULES" ] ; then
+		        GTK_MODULES="canberra-gtk-module"
+		else
+	        	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+		fi
+		export GTK_MODULES
+		;;
+esac
diff --git a/media-libs/libcanberra/libcanberra-0.30-r2.ebuild b/media-libs/libcanberra/libcanberra-0.30-r2.ebuild
new file mode 100644
index 000000000000..4d4181828615
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.30-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.30-r2.ebuild,v 1.1 2014/10/14 08:23:21 pacho Exp $
+
+EAPI="5"
+
+inherit eutils systemd
+
+DESCRIPTION="Portable sound event library"
+HOMEPAGE="http://git.0pointer.net/libcanberra.git/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
+
+COMMON_DEPEND="
+	media-libs/libvorbis
+	>=sys-devel/libtool-2.2.6b
+	alsa? (
+		media-libs/alsa-lib:=
+		udev? ( virtual/libudev:= ) )
+	gstreamer? ( media-libs/gstreamer:1.0 )
+	gtk? (
+		>=dev-libs/glib-2.32:2
+		>=x11-libs/gtk+-2.20.0:2
+		x11-libs/libX11 )
+	gtk3? (
+		>=dev-libs/glib-2.32:2
+		x11-libs/gtk+:3
+		x11-libs/libX11 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+	tdb? ( sys-libs/tdb:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+REQUIRED_USE="udev? ( alsa )"
+
+src_prepare() {
+	# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
+	epatch "${FILESDIR}/${PN}-0.30-wayland.patch"
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable tdb) \
+		$(use_enable udev) \
+		$(systemd_with_unitdir) \
+		--disable-lynx \
+		--disable-gtk-doc
+}
+
+src_install() {
+	# Disable parallel installation until bug #253862 is solved
+	MAKEOPTS="${MAKEOPTS} -j1" default
+	prune_libtool_files --modules
+
+	# This is needed for desktops different than GNOME, bug #520550
+	insinto /etc/X11/xinit.d/
+	doins "${FILESDIR}"/libcanberra-gtk-module.sh
+}