rpms/libcanberra
5
0
Fork 0
Code Issues Pull Requests Releases Activity

+ libcanberra-0.30-27

Browse Source 
Update X11 avoidance patch
This commit is contained in:
Bastien Nocera 2022-02-06 18:45:51 +01:00
parent 6dd04456bf
commit 8321a12330
2 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
View File

@ -1,13 +1,14 @@
From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
From d6dd5cdf45c1aac6c0519c8a4f5f89321770fb53 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
Co-Authored-By: Bastien Nocera <hadess@hadess.net>
---
src/canberra-gtk-module.c | 15 +++++++++++++++
src/canberra-gtk.c | 5 +++++
2 files changed, 20 insertions(+)
src/canberra-gtk.c | 28 ++++++++++++++++++++++------
2 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index 67791f0..c1532ab 100644
@ -50,7 +51,7 @@ index 67791f0..c1532ab 100644
* ignore them */
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
index 34446f5..08cb668 100644
index 34446f5..47285f8 100644
--- a/src/canberra-gtk.c
+++ b/src/canberra-gtk.c
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
@ -65,6 +66,58 @@ index 34446f5..08cb668 100644
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,
@@ -254,18 +259,28 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
if (gtk_widget_get_realized(GTK_WIDGET(w))) {
GdkWindow *dw = NULL;
+#ifdef GDK_IS_X11_DISPLAY
GdkScreen *screen = NULL;
+#endif
GdkDisplay *display = NULL;
gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1;
- if ((dw = gtk_widget_get_window(GTK_WIDGET(w))))
- if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
- return ret;
+ if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) {
+#ifdef GDK_IS_X11_DISPLAY
+ if (GDK_IS_X11_DISPLAY(display)) {
+ if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
+ return ret;
+ }
+#endif
+ }
if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) {
- if ((t = gdk_display_get_name(display)))
+#ifdef GDK_IS_X11_DISPLAY
+ if (GDK_IS_X11_DISPLAY(display) && (t = gdk_display_get_name(display))) {
if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0)
return ret;
+ }
+#endif
if (dw) {
gint desktop = window_get_desktop(display, dw);
@@ -276,7 +291,8 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
}
}
- if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
+#ifdef GDK_IS_X11_DISPLAY
+ if (GDK_IS_X11_DISPLAY(display) && (screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0)
return ret;
@@ -285,7 +301,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0)
return ret;
}
-
+#endif
/* FIXME, this might cause a round trip */
if (dw) {
--
1.9.0
2.34.1

6
libcanberra.spec
View File

@ -1,6 +1,6 @@
Name: libcanberra
Version: 0.30
Release: 27%{?dist}
Release: 28%{?dist}
Summary: Portable Sound Event Library
Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@ -124,6 +124,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
%{_datadir}/vala/vapi/libcanberra.vapi
%changelog
* Sun Feb 06 2022 Bastien Nocera <bnocera@redhat.com> - 0.30-28
+ libcanberra-0.30-27
- Update X11 avoidance patch
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild