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

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

8 files changed, 172 insertions, 128 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/Manifest b/media-libs/libcanberra/Manifest
index 5a92c97145e2..1b9519b2f3f7 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gconf-2.m4 1579 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8 SHA512 66a341f1c96634d7fddcb26c99e3ae6d44bb3e97f8d547aa1b03b170f2dad8d19a902fe6a945544b8a5a0e26f054a9d0a3f85380efd04e5dd8262bbcb32c4063 WHIRLPOOL 3509829bdecb1eb23ac21df58769f39f3216052f8cdd3ebd67c543d03e2c2a3d57084637152203b9eb5afc9e77f20401467db3cf3b728dc2c02f87abe072032e
-AUX libcanberra-0.28-underlinking.patch 1485 SHA256 3798873e8895602159b0df11f45e806c28056a7f3c3820a0664ed1e6cf25a8a4 SHA512 3d9742e40c49797fc11f409b63295a3ff753deb30630fdb7e6d2bcf8a2bd682dca3a1772c48f4bc5d697448adf7fb28ed65d849af26a8bb293c25b7c3eb53f0f WHIRLPOOL c7878ef263b4347de7f8301b2e64059e62ffcb60ae4f9067a688d68fb63bb438e790ca46292ce370a22745b1d3f4f814be0810b451977eae83fdaa34148ea676
-AUX libcanberra-0.28-workaround-hang.patch 849 SHA256 ffcac176507075d76ca360302b53a45228df785f689e95302b48200a20e4dda4 SHA512 c64cddf7771ff049f3ca4e57b8e11df00f73ab84c62f94ba37717181668cca22664edcce370547743c4b66a530a594fe05c4078d06c7865cde31ff7ec453f47d WHIRLPOOL 1ddfce1524a5b23193ac5249cabc32477e885c1a41a2212fb95e1fa41bbd6d5d9a6b1a89af462042a4a8f702ed378b09a86283666ea6d897a735f97a621a10f4
+AUX libcanberra-0.30-wayland.patch 2382 SHA256 ab3a989e346f871b22c99bcb8b6203eb800bc83f66269f3c26133a1edf5fbd5d SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a WHIRLPOOL b8a42caec51e389ac7f236fab604866dca8ea3ae9a502677917bc93b50a7b5ea73ed3be90045eb5aa532127458ac0f977923208768672b371b0757ee18d7e173
+AUX libcanberra-gtk-module.sh 275 SHA256 05ec5bf32497e85f3b55b1e5ae2d7c3beac939471e92471f0665c8687830efaf SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d WHIRLPOOL 81bdb7bd2d8f6a45e580205343898145dddff4a6bb50f9851da32981820bd7cf4673a066df2f3fe207a1c62e3790d8947c4379ad20b5832272982539ea1c2172
 DIST libcanberra-0.30.tar.xz 318960 SHA256 c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 WHIRLPOOL 684f0c4886f5bbc22d92500d0aa6371655106c8e788fe57d98b011e61fc0b09412edfddf782d42424009445e66bfa28ec43953ad263ea3eb0d9d9049ec479d87
 EBUILD libcanberra-0.30-r1.ebuild 1832 SHA256 fde1cd7cc2b83c533a26e0c02d3dc52a4bdbf040f896335df85f938cc7a035af SHA512 2c094d273d7f6af9600350f924a63126140edaf966b582df0ee8dc588fe28677fad13a33a958d529d4e33cb1f84f2ef996edf40b07fe6debe081281bfe615b45 WHIRLPOOL 956659bf478c5c8c428f96b75428b331c1256c99032f24f3846e5cfc10c1b5d71b2d6d43941481fa8a222f375ea850874d04d0728c505350387db072dc5a93da
-MISC ChangeLog 16707 SHA256 bda680e29210d1a8314f42e7bef2409962b1a3bb2c3c3522714a3a719162b065 SHA512 537c222643dc40b9bc9fb4ad212de8ff57906517fc9bd1d640eb1d5c8d14ed8aaaf40461eace15542a6fac22aa69db1a4c64c099d085ca53803797683a7f2208 WHIRLPOOL 53b95692b3935f88d194ac05073fd5ee7f46ba8951403af430ed52367a1fa7e53d97f29017707dcb2482b63889d091ba16c1def628ad961c42d196202be37566
+EBUILD libcanberra-0.30-r2.ebuild 2127 SHA256 4f37a388c4e2feda285786c8f3c8d37c81bec9f50ee8ce8f475520bd2b341c05 SHA512 cc4dea4e2c79a7e86c58c726d729a733904002c5eea51e2e29cdf79c2cbaa84dbddf2c93cd928cf26b5a07828090322db532e1ee4cc4fca2cbde5e1c55c19407 WHIRLPOOL eb2721f7348824ee96c048a9ba2abe9325931773cff819f362b25a3b4bdacda5fbb98c2eb6c889993b57f1dc8d9e6ccecd7d70865206226d7377e02b490f5d9f
+MISC ChangeLog 17130 SHA256 065faf7b83251690218284bf6472637e3dd345635c4a19ae5e9f4f7e65c79cb8 SHA512 c2137b463f373323803ad62d9970807d2745dd7290e66552331e9cf664478d44268742dac2d56abff2ba721d8ebd8d60d613268fef4346134824fc6f077f5c69 WHIRLPOOL 8262bdf0e9c870f04a80c26964c5bbe4000b9cd503e7b58551c8bd143d38b42f1023797831d2eff0b236100064523566b70070b737c49337b26cc5127e187c44
 MISC metadata.xml 1542 SHA256 937a49bfb06b48512919df4237fabf66d40794144843790337f884961bdcf1c9 SHA512 47defa808a9e568f0608ab1c09ccbdc02be391fb8a855fd16c4a9bf8d7ea86c5eeab98612ef0624706f4190cc48688d69f5831d34be8ceafebd1889071021021 WHIRLPOOL 97ac02cb17da73790ac9992d28f7c59befb5baef72c35c5dd4118ac5415b8894bb2b6c1e6d6fac9e29752d6cc283acc5967a4f04f75a71f33157673a2b77147b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT91Q6AAoJEEdUh39IaPFN4h4H/RNAVO0njnnLXLiuEBArFcnG
-B+MQMSi5CfNYxBWwKYchfWJeAwlMKegvrbYZJl9shWOV9Gj8YNEZdymWS0ou7PlC
-GNAg194Uo+w+y9AW6Q+4FZxDcEchhufdwTkupYTD58+0OFRitN3b1SwtLUUpCmp9
-GN+g2nFufnVGIBGyX5orp28o0LrRXVIp4V/K6+7GjpmMNDVCHnILzTWdmD3Nf8qA
-rCrUzk9fFhHimIUnR77bWSfAb01NjqGnJ8Vk6RYpo/OiIBM6Ze/UjyZnXiEx7xeX
-jnQ2qZFKsiIzT2d9YDL7Gcv0uWdztMNLqtKS4yhoTQMy49ry97BGOSHZM4NoC6w=
-=WUAK
+iEYEAREIAAYFAlQ83XoACgkQCaWpQKGI+9Qd5gCfQbNjoG8Rj5M/oIAh7feNRhxC
+sIYAnjb2fbOk5oz9nkiT+HyMl/HyQNSQ
+=HeRq
 -----END PGP SIGNATURE-----
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
+}