From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libcanberra: apply patch from upstream
Date: Thu, 23 Jan 2020 21:58:49 +0100 [thread overview]
Message-ID: <20200123205849.wn2vuD55eYdsfIA4nc-KfMFqZtU_vwFwTywvtbe_ot8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18513@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages canberra
https://github.com/void-linux/void-packages/pull/18513
libcanberra: apply patch from upstream
fixes a crash in pavucontrol when running on wayland
closes #15505
A patch file from https://github.com/void-linux/void-packages/pull/18513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-canberra-18513.patch --]
[-- Type: text/x-diff, Size: 4489 bytes --]
From d340f138e180254a972ef6dd127f46c34bd4a394 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Thu, 23 Jan 2020 21:28:58 +0100
Subject: [PATCH] libcanberra: apply patch from upstream
fixes a crash in pavucontrol when running on wayland
closes #15505
---
...e-all-GdkDisplays-are-GdkX11Displays.patch | 70 +++++++++++++++++++
srcpkgs/libcanberra/template | 4 +-
2 files changed, 72 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch
diff --git a/srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch b/srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch
new file mode 100644
index 00000000000..246ae579823
--- /dev/null
+++ b/srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch
@@ -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
+
diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template
index f8e3c7d444d..de049b68e08 100644
--- a/srcpkgs/libcanberra/template
+++ b/srcpkgs/libcanberra/template
@@ -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
next prev parent reply other threads:[~2020-01-23 20:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 20:31 [PR PATCH] " voidlinux-github
2020-01-23 20:58 ` voidlinux-github [this message]
2020-01-23 21:30 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200123205849.wn2vuD55eYdsfIA4nc-KfMFqZtU_vwFwTywvtbe_ot8@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).