Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcanberra rebuild

Browse Source
This commit is contained in:
Rmys
2025-11-03 16:44:14 +03:00
parent d9bb2fd1c3
commit a1bcfae26b
3 changed files with 133 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/sound/libcanberra/actions.py
+1 -1
View File
@@ -33,6 +33,6 @@ def install():
autotools.rawInstall('DESTDIR="%s"' % get.installDIR())
#pisitools.remove("/usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so")
#pisitools.removeDir("/usr/share/gtk-doc")
pisitools.removeDir("/usr/share/gtk-doc")
pisitools.dodoc("LGPL")
multimedia/sound/libcanberra/files/fedora/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
+123
View File
@@ -0,0 +1,123 @@
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 | 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
--- 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..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) {
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,
@@ -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) {
--
2.34.1
multimedia/sound/libcanberra/pspec.xml
+9 -1
View File
@@ -13,7 +13,7 @@
<IsA>app:console</IsA>
<Summary>A library for generating event sounds on free desktops</Summary>
<Description>libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. It comes with several backends (ALSA, PulseAudio, OSS, GStreamer, null) and is designed to be portable.</Description>
<Archive sha1sum="88c5c886afd4ab2f8c33edfbeb723f0bb0e0e674" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/libcanberra-0.30.tar.xz</Archive>
<Archive sha1sum="fd4c16e341ffc456d688ed3462930d17ca6f6c20" type="tarxz">http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz</Archive>
<BuildDependencies>
<Dependency>libogg-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
@@ -39,6 +39,7 @@
<Patches>
<Patch>fix-pthread.patch</Patch>
<Patch>fix-underlinking.patch</Patch>
<Patch level="1">fedora/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch</Patch>
</Patches>
</Source>
@@ -140,6 +141,13 @@
</Package>
<History>
<Update release="9">
<Date>2025-11-02</Date>
<Version>0.30</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2022-09-18</Date>
<Version>0.30</Version>