diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-03-23 12:34:16 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-03-23 12:34:16 +0000 |
| commit | 7584f2502d69967636078da9b52e1bece32af8e1 (patch) | |
| tree | 72c68eb7ef2fa0044d8defe9951b72d5bab28bb2 /audio/libcanberra | |
| parent | 35b58b4a137ee2c4a48186edea22cef255aedc7a (diff) | |
| download | ports-7584f2502d69967636078da9b52e1bece32af8e1.tar.gz ports-7584f2502d69967636078da9b52e1bece32af8e1.zip | |
Notes
Diffstat (limited to 'audio/libcanberra')
| -rw-r--r-- | audio/libcanberra/Makefile | 4 | ||||
| -rw-r--r-- | audio/libcanberra/files/patch-dont-assume-x11 | 55 |
2 files changed, 57 insertions, 2 deletions
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 34889847c9b8..e57d39f256a5 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -4,7 +4,7 @@ PORTNAME= libcanberra PORTVERSION= 0.30 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ \ http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/ @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LGPL LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libltdl.so:devel/libltdl -USES= gmake libtool pathfix pkgconfig tar:xz +USES= gmake gnome libtool pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix gtk20 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/audio/libcanberra/files/patch-dont-assume-x11 b/audio/libcanberra/files/patch-dont-assume-x11 new file mode 100644 index 000000000000..7cfc46a788a1 --- /dev/null +++ b/audio/libcanberra/files/patch-dont-assume-x11 @@ -0,0 +1,55 @@ +gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland + +Obtained from: upstream (c0620e432650e81062c1967cc669829dbd29b310) +--- 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, |