snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

libcanberra: apply patch from upstream 

fixes a crash in pavucontrol when running on wayland

closes #15505
This commit is contained in:
Johannes 2020-01-23 21:28:58 +01:00 committed by Johannes
parent 1f86d0732e
commit da5b5075ff
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch Normal file
View File

@ -0,0 +1,70 @@
From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@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(+)
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index 67791f0..c1532ab 100644
--- src/canberra-gtk-module.c
+++ 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
--- src/canberra-gtk.c
+++ 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,
--
2.25.0

4
srcpkgs/libcanberra/template
View File

@ -1,7 +1,7 @@
# Template file for 'libcanberra'
pkgname=libcanberra
version=0.30
revision=10
revision=11
build_style=gnu-configure
configure_args="--enable-alsa --enable-null --disable-lynx
--enable-gstreamer --disable-oss --with-builtin=dso"
@ -12,7 +12,7 @@ makedepends="
eudev-libudev-devel vala-devel"
short_desc="XDG Sound Theme and Name Specification library implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
license="LGPL-2.1-or-later"
homepage="http://0pointer.de/lennart/projects/libcanberra/"
distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-${version}.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/libcanberra-${version}.tar.xz"
checksum=c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72