Hello community,
here is the log from the commit of package libcanberra for openSUSE:Factory
checked in at 2012-11-26 18:57:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcanberra (Old)
and /work/SRC/openSUSE:Factory/.libcanberra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcanberra", Maintainer is "gnome-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-10-03
15:09:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes
2012-11-26 18:59:14.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 9 18:27:56 UTC 2012 - michael.me...@suse.com
+
+- Add libcanberra-broadway-fix.patch: Fix crash with
+ libcanberra-gtk-module's and non-X11 displays (bnc#789066).
+
+-------------------------------------------------------------------
New:
----
libcanberra-broadway-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcanberra.spec ++++++
--- /var/tmp/diff_new_pack.FBRXQf/_old 2012-11-26 18:59:21.000000000 +0100
+++ /var/tmp/diff_new_pack.FBRXQf/_new 2012-11-26 18:59:21.000000000 +0100
@@ -30,6 +30,8 @@
Source99: baselibs.conf
#PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 fdo#51662
dims...@opensuse.org -- Set the multi backend as default and allow it actually
to work.
Patch0: libcanberra-multi-backend.patch
+#PATCH-FIX-UPSTREAM libcanberra-broadway-fix.patch bnc#789066
michael.me...@suse.com -- mailed to lennart
+Patch1: libcanberra-broadway-fix.patch
BuildRequires: gtk-doc
BuildRequires: libltdl-devel
BuildRequires: lynx
@@ -184,6 +186,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure --with-pic --disable-static --enable-pulse --enable-alsa
--enable-null --with-builtin=dso V=1
++++++ libcanberra-broadway-fix.patch ++++++
>From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.me...@suse.com>
Date: Fri, 9 Nov 2012 16:16:40 +0000
Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
broadway/wayland
---
src/canberra-gtk-module.c | 15 +++++++++++++++
src/canberra-gtk.c | 5 +++++
2 files changed, 20 insertions(+), 0 deletions(-)
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,
--
1.7.7
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
