From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 10 22:04:50 2020 Received: (at submit) by debbugs.gnu.org; 11 Oct 2020 02:04:50 +0000 Received: from localhost ([127.0.0.1]:38877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRQjB-0007wr-Qk for submit@debbugs.gnu.org; Sat, 10 Oct 2020 22:04:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:40918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRQj7-0007wg-FN for submit@debbugs.gnu.org; Sat, 10 Oct 2020 22:04:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRQj6-0006Gj-RJ for guix-patches@gnu.org; Sat, 10 Oct 2020 22:04:45 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:47852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRQj1-0005F2-3v for guix-patches@gnu.org; Sat, 10 Oct 2020 22:04:44 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 65a50a26 for ; Sun, 11 Oct 2020 02:04:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=s1f iPeyM3ky5j6o75aqsjC/bYbfmwK1d9uYpt35swaQ=; b=brnm/aZOmbQpc59a2KU Burw1oPW7+j5aa0vJjh75LyCidcXVtN3oOpM1uxTx/0Oz7TFQuKjvAix5O5//pFS WoRfwrPtY1L0mXhjUvX0/sYQslSnCoNG8uuLGzZlUHcI4yvBCIpJ9M34VxekhQul Pm2gzBJKtaF9qUFIVWOVDyQa6nR+GMozKM56LMyrGr57F4LHqdQ9XTZAE48HZ92F cY7GC222MFwiB2ATkAli3qzoRcX13+PBrXOHCV4mx0nCI5xAW2wdpEJ/IYx5dlVr 0pzvUz2mncFTdCTZW++X4y2kDtAoyUEeiPWyxWrS/vUPfXG0vZbbUu6ualgm/WXv GTw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 206a77c5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sun, 11 Oct 2020 02:04:33 +0000 (UTC) Date: Sun, 11 Oct 2020 04:04:20 +0200 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] gnu: libcanberra: Fix a crash on wayland Message-ID: <20201011040420.269429ff@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/eQqxtKXp7BxHMURKk.y.x1i" Received-SPF: pass client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --MP_/eQqxtKXp7BxHMURKk.y.x1i Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Guix! Trying to play with sway, I noticed a crash in pavucontrol, when changing the volume of outputs (strangely enough, not of individual applications). This was already reported upstream, and they found the cause to be the assumption libcanberra makes that you're running on Xorg. This commit adds a patch that remove this assumption, and was pushed to libcanberra after the latest release (in 2012!). --MP_/eQqxtKXp7BxHMURKk.y.x1i Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-libcanberra-Fix-crashes-on-wayland.patch >From 98f3633c36ff4638910b4507cd09990910cac790 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 11 Oct 2020 03:58:50 +0200 Subject: [PATCH] gnu: libcanberra: Fix crashes on wayland. * gnu/packages/patches/libcanberra-wayland-crash.patch: New file. * gnu/packages/libcanberra.scm (libcanberra): Add it. * gnu/local.mk (dist_PATCH_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/libcanberra.scm | 3 +- .../patches/libcanberra-wayland-crash.patch | 55 +++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libcanberra-wayland-crash.patch diff --git a/gnu/local.mk b/gnu/local.mk index b59b122e86..a34902abc9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1228,6 +1228,7 @@ dist_patch_DATA = \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ + %D%/packages/patches/libcanberra-wayland-crash.patch \ %D%/packages/patches/libdrm-realpath-virtio.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 32d1cd3605..2d08fb46e3 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -69,7 +69,8 @@ ;; his pleasure. (patch-flags '("-p0")) (patches - (search-patches "libcanberra-sound-theme-freedesktop.patch")))) + (search-patches "libcanberra-sound-theme-freedesktop.patch" + "libcanberra-wayland-crash.patch")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) diff --git a/gnu/packages/patches/libcanberra-wayland-crash.patch b/gnu/packages/patches/libcanberra-wayland-crash.patch new file mode 100644 index 0000000000..e347436bbe --- /dev/null +++ b/gnu/packages/patches/libcanberra-wayland-crash.patch @@ -0,0 +1,55 @@ +# This patch comes from upstream commit c0620e432650e81062c1967cc669829dbd29b310. +# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland + +--- src/canberra-gtk-module.c.orig ++++ 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 */ + +--- src/canberra-gtk.c.orig ++++ 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.28.0 --MP_/eQqxtKXp7BxHMURKk.y.x1i-- From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 12 15:31:57 2020 Received: (at 43918) by debbugs.gnu.org; 12 Oct 2020 19:31:57 +0000 Received: from localhost ([127.0.0.1]:43998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kS3Y1-0007da-26 for submit@debbugs.gnu.org; Mon, 12 Oct 2020 15:31:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kS3Xw-0007dL-Gv for 43918@debbugs.gnu.org; Mon, 12 Oct 2020 15:31:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49158) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kS3Xp-0003rY-I8; Mon, 12 Oct 2020 15:31:41 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54352 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kS3Xn-000479-NX; Mon, 12 Oct 2020 15:31:41 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Julien Lepiller Subject: Re: [bug#43918] [PATCH] gnu: libcanberra: Fix a crash on wayland References: <20201011040420.269429ff@tachikoma.lepiller.eu> Date: Mon, 12 Oct 2020 21:31:37 +0200 In-Reply-To: <20201011040420.269429ff@tachikoma.lepiller.eu> (Julien Lepiller's message of "Sun, 11 Oct 2020 04:04:20 +0200") Message-ID: <87a6wrnsva.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43918 Cc: 43918@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Julien Lepiller skribis: >>>From 98f3633c36ff4638910b4507cd09990910cac790 Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Sun, 11 Oct 2020 03:58:50 +0200 > Subject: [PATCH] gnu: libcanberra: Fix crashes on wayland. > > * gnu/packages/patches/libcanberra-wayland-crash.patch: New file. > * gnu/packages/libcanberra.scm (libcanberra): Add it. > * gnu/local.mk (dist_PATCH_DATA): Add it. LGTM! I think it can go on =E2=80=98master=E2=80=99. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 12 15:53:10 2020 Received: (at 43918-done) by debbugs.gnu.org; 12 Oct 2020 19:53:11 +0000 Received: from localhost ([127.0.0.1]:44018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kS3sY-00088p-Ob for submit@debbugs.gnu.org; Mon, 12 Oct 2020 15:53:10 -0400 Received: from lepiller.eu ([89.234.186.109]:45644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kS3sS-00088D-UG for 43918-done@debbugs.gnu.org; Mon, 12 Oct 2020 15:53:05 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 18ebc55f; Mon, 12 Oct 2020 19:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=pIwCOgCbSft3 Px3lnngDOcT+Q0TMCVMby9kbd4ZpCe0=; b=HDcPoLWEMs0XUgfF1wCzjW5Ru/m7 em5uyjDUdJqQI2AUF9jcILJIjrgbGcls69KJF7IRcOUCgKlRUr0C0JfEVHyC3vT5 bvuZEGr6EMvobcQtC1MFjCJlXdxLmQDqEPhfrGf9ll6xAb6jepfYEH3hk08tBqU1 kDLlN7TVj92kOMqqsezw1wS4tmtf7v4h2JS4D678jEiSPT7TdldK2xKCwIwCjs7g XMZRmZ8RIrkzxVgqGAyPjUIETy/QmSORgsFK3Ga5vjUKt8u4cgKzQlThip2MNMrZ 9fWKDEw8IEf6PhoCDoPR6N6YZNddWNIeOqZMJWFsMbNtqqAZtfPa6RVDxQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 83b74db2 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 12 Oct 2020 19:52:58 +0000 (UTC) Date: Mon, 12 Oct 2020 21:52:50 +0200 From: Julien Lepiller To: Ludovic =?UTF-8?B?Q291cnTDqHM=?= Subject: Re: [bug#43918] [PATCH] gnu: libcanberra: Fix a crash on wayland Message-ID: <20201012215250.6cef399d@tachikoma.lepiller.eu> In-Reply-To: <87a6wrnsva.fsf@gnu.org> References: <20201011040420.269429ff@tachikoma.lepiller.eu> <87a6wrnsva.fsf@gnu.org> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 43918-done Cc: 43918-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Mon, 12 Oct 2020 21:31:37 +0200, Ludovic Court=C3=A8s a =C3=A9crit : > Hello, >=20 > Julien Lepiller skribis: >=20 > >>From 98f3633c36ff4638910b4507cd09990910cac790 Mon Sep 17 00:00:00 > >>2001 =20 > > From: Julien Lepiller > > Date: Sun, 11 Oct 2020 03:58:50 +0200 > > Subject: [PATCH] gnu: libcanberra: Fix crashes on wayland. > > > > * gnu/packages/patches/libcanberra-wayland-crash.patch: New file. > > * gnu/packages/libcanberra.scm (libcanberra): Add it. > > * gnu/local.mk (dist_PATCH_DATA): Add it. =20 >=20 > LGTM! I think it can go on =E2=80=98master=E2=80=99. >=20 > Thanks, > Ludo=E2=80=99. Thank you, pushed as ec82d58526c27a9ca26f6c5e39cec90a48cbc1cc. From unknown Sat Jun 21 05:20:27 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 10 Nov 2020 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator