r47853 - in /packages/unstable/libcanberra/debian: changelog compat control control.in patches/gtk_dont_assume_x11.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Tue Apr 5 15:26:14 UTC 2016
Author: bigon
Date: Tue Apr 5 15:26:14 2016
New Revision: 47853
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47853
Log:
* debian/patches/gtk_dont_assume_x11.patch: Don't assume all GdkDisplays are
GdkX11Displays, this patch should fix crashes when running wayland.
* debian/control, debian/compat: Bump debhelper compatibility to 9
* debian/control: Bump Standards-Version to 3.9.7 (no furter changes)
* Drop -dbg package and rely on automatically built -dbgsym ones
Added:
packages/unstable/libcanberra/debian/patches/gtk_dont_assume_x11.patch
Modified:
packages/unstable/libcanberra/debian/changelog
packages/unstable/libcanberra/debian/compat
packages/unstable/libcanberra/debian/control
packages/unstable/libcanberra/debian/control.in
packages/unstable/libcanberra/debian/patches/series
Modified: packages/unstable/libcanberra/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/changelog?rev=47853&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/changelog [utf-8] (original)
+++ packages/unstable/libcanberra/debian/changelog [utf-8] Tue Apr 5 15:26:14 2016
@@ -1,11 +1,19 @@
libcanberra (0.30-3) UNRELEASED; urgency=medium
+ [ Emilio Pozuelo Monfort ]
* debian/libcanberra0.symbols,
debian/libcanberra0.symbols.hurd-i386:
+ Drop hurd-i386 symbols file, instead use arch tags to mark a couple of
symbols as not available on hurd.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 06 Sep 2014 14:47:40 +0200
+ [ Laurent Bigonville ]
+ * debian/patches/gtk_dont_assume_x11.patch: Don't assume all GdkDisplays are
+ GdkX11Displays, this patch should fix crashes when running wayland.
+ * debian/control, debian/compat: Bump debhelper compatibility to 9
+ * debian/control: Bump Standards-Version to 3.9.7 (no furter changes)
+ * Drop -dbg package and rely on automatically built -dbgsym ones
+
+ -- Laurent Bigonville <bigon at debian.org> Tue, 05 Apr 2016 16:22:00 +0200
libcanberra (0.30-2.1) unstable; urgency=medium
Modified: packages/unstable/libcanberra/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/compat?rev=47853&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/compat [utf-8] (original)
+++ packages/unstable/libcanberra/debian/compat [utf-8] Tue Apr 5 15:26:14 2016
@@ -1 +1 @@
-5
+9
Modified: packages/unstable/libcanberra/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/control?rev=47853&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/control [utf-8] (original)
+++ packages/unstable/libcanberra/debian/control [utf-8] Tue Apr 5 15:26:14 2016
@@ -2,13 +2,12 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: libcanberra
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 9.20160114~),
cdbs (>= 0.4.93~),
dh-autoreconf,
gnome-pkg-tools,
@@ -23,7 +22,7 @@
gtk-doc-tools,
libpulse-dev (>= 0.9.11),
libgstreamer1.0-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.7
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libcanberra/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libcanberra/
Homepage: http://0pointer.de/lennart/projects/libcanberra/
@@ -43,18 +42,6 @@
is found via the mechanisms defined in the XDG sound theming
specification.
-Package: libcanberra0-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra0 (= ${binary:Version})
-Description: libcanberra libraries detached debugging symbols
- libcanberra defines a simple abstract interface for playing event
- sounds.
- .
- This package contains detached debugging symbols for it.
-
Package: libcanberra-dev
Section: libdevel
Architecture: any
@@ -82,20 +69,6 @@
.
This package contains the PulseAudio backend for libcanberra.
-Package: libcanberra-pulse-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libcanberra-pulse (= ${binary:Version})
-Description: PulseAudio libcanberra backend detached debugging symbols
- libcanberra defines a simple abstract interface for playing event
- sounds.
- .
- This package contains the PulseAudio backend debugging symbols.
-
Package: libcanberra-gstreamer
Architecture: any
Multi-Arch: same
@@ -107,20 +80,6 @@
sounds.
.
This package contains the GStreamer backend for libcanberra.
-
-Package: libcanberra-gstreamer-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libcanberra-gstreamer (= ${binary:Version})
-Description: GStreamer libcanberra backend detached debugging symbols
- libcanberra defines a simple abstract interface for playing event
- sounds.
- .
- This package contains the GStreamer backend debugging symbols.
Package: libcanberra-gtk0
Architecture: any
@@ -135,22 +94,6 @@
Contextual information is needed to play event sound. This library
can help to compile directly event sounds property lists based on
active GtkWidget objects or GdkEvent events.
-
-Package: libcanberra-gtk0-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk0 (= ${binary:Version})
-Description: libcanberra-gtk libraries detached debugging symbols
- libcanberra-gtk provides a few functions that simplify libcanberra
- usage from GTK+.
- .
- Contextual information is needed to play event sound. This library
- can help to compile directly event sounds property lists based on
- active GtkWidget objects or GdkEvent events.
- .
- This package contains detached debugging symbols for it.
Package: libcanberra-gtk-common-dev
Section: libdevel
@@ -199,18 +142,6 @@
A GtkModule which will automatically hook into all kinds of events
inside a GTK+ program and generate sound events from them.
-Package: libcanberra-gtk-module-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
-Description: libcanberra GtkModule detached debugging symbols
- A GtkModule which will automatically hook into all kinds of events
- inside a GTK+ program and generate sound events from them.
- .
- This package contains detached debugging symbols for it.
-
Package: libcanberra-gtk3-0
Architecture: any
Multi-Arch: same
@@ -224,22 +155,6 @@
Contextual information is needed to play event sound. This library
can help to compile directly event sounds property lists based on
active GtkWidget objects or GdkEvent events.
-
-Package: libcanberra-gtk3-0-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk3-0 (= ${binary:Version})
-Description: libcanberra-gtk libraries detached debugging symbols
- libcanberra-gtk provides a few functions that simplify libcanberra
- usage from GTK+ 3.0.
- .
- Contextual information is needed to play event sound. This library
- can help to compile directly event sounds property lists based on
- active GtkWidget objects or GdkEvent events.
- .
- This package contains detached debugging symbols for it.
Package: libcanberra-gtk3-dev
Section: libdevel
@@ -281,18 +196,6 @@
.
This package is using canberra-gtk-play from libcanberra.
-Package: libcanberra-gtk3-module-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk3-module (= ${binary:Version})
-Description: libcanberra GtkModule detached debugging symbols
- A GtkModule which will automatically hook into all kinds of events
- inside a GTK+ 3.0 program and generate sound events from them.
- .
- This package contains detached debugging symbols for it.
-
Package: libcanberra-doc
Section: doc
Architecture: all
Modified: packages/unstable/libcanberra/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/control.in?rev=47853&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/control.in [utf-8] (original)
+++ packages/unstable/libcanberra/debian/control.in [utf-8] Tue Apr 5 15:26:14 2016
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 9.20160114~),
cdbs (>= 0.4.93~),
dh-autoreconf,
gnome-pkg-tools,
@@ -18,7 +18,7 @@
gtk-doc-tools,
libpulse-dev (>= 0.9.11),
libgstreamer1.0-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.7
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libcanberra/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libcanberra/
Homepage: http://0pointer.de/lennart/projects/libcanberra/
@@ -38,18 +38,6 @@
is found via the mechanisms defined in the XDG sound theming
specification.
-Package: libcanberra0-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra0 (= ${binary:Version})
-Description: libcanberra libraries detached debugging symbols
- libcanberra defines a simple abstract interface for playing event
- sounds.
- .
- This package contains detached debugging symbols for it.
-
Package: libcanberra-dev
Section: libdevel
Architecture: any
@@ -77,20 +65,6 @@
.
This package contains the PulseAudio backend for libcanberra.
-Package: libcanberra-pulse-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libcanberra-pulse (= ${binary:Version})
-Description: PulseAudio libcanberra backend detached debugging symbols
- libcanberra defines a simple abstract interface for playing event
- sounds.
- .
- This package contains the PulseAudio backend debugging symbols.
-
Package: libcanberra-gstreamer
Architecture: any
Multi-Arch: same
@@ -102,20 +76,6 @@
sounds.
.
This package contains the GStreamer backend for libcanberra.
-
-Package: libcanberra-gstreamer-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libcanberra-gstreamer (= ${binary:Version})
-Description: GStreamer libcanberra backend detached debugging symbols
- libcanberra defines a simple abstract interface for playing event
- sounds.
- .
- This package contains the GStreamer backend debugging symbols.
Package: libcanberra-gtk0
Architecture: any
@@ -130,22 +90,6 @@
Contextual information is needed to play event sound. This library
can help to compile directly event sounds property lists based on
active GtkWidget objects or GdkEvent events.
-
-Package: libcanberra-gtk0-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk0 (= ${binary:Version})
-Description: libcanberra-gtk libraries detached debugging symbols
- libcanberra-gtk provides a few functions that simplify libcanberra
- usage from GTK+.
- .
- Contextual information is needed to play event sound. This library
- can help to compile directly event sounds property lists based on
- active GtkWidget objects or GdkEvent events.
- .
- This package contains detached debugging symbols for it.
Package: libcanberra-gtk-common-dev
Section: libdevel
@@ -194,18 +138,6 @@
A GtkModule which will automatically hook into all kinds of events
inside a GTK+ program and generate sound events from them.
-Package: libcanberra-gtk-module-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk-module (= ${binary:Version})
-Description: libcanberra GtkModule detached debugging symbols
- A GtkModule which will automatically hook into all kinds of events
- inside a GTK+ program and generate sound events from them.
- .
- This package contains detached debugging symbols for it.
-
Package: libcanberra-gtk3-0
Architecture: any
Multi-Arch: same
@@ -219,22 +151,6 @@
Contextual information is needed to play event sound. This library
can help to compile directly event sounds property lists based on
active GtkWidget objects or GdkEvent events.
-
-Package: libcanberra-gtk3-0-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk3-0 (= ${binary:Version})
-Description: libcanberra-gtk libraries detached debugging symbols
- libcanberra-gtk provides a few functions that simplify libcanberra
- usage from GTK+ 3.0.
- .
- Contextual information is needed to play event sound. This library
- can help to compile directly event sounds property lists based on
- active GtkWidget objects or GdkEvent events.
- .
- This package contains detached debugging symbols for it.
Package: libcanberra-gtk3-dev
Section: libdevel
@@ -276,18 +192,6 @@
.
This package is using canberra-gtk-play from libcanberra.
-Package: libcanberra-gtk3-module-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: ${misc:Depends}, libcanberra-gtk3-module (= ${binary:Version})
-Description: libcanberra GtkModule detached debugging symbols
- A GtkModule which will automatically hook into all kinds of events
- inside a GTK+ 3.0 program and generate sound events from them.
- .
- This package contains detached debugging symbols for it.
-
Package: libcanberra-doc
Section: doc
Architecture: all
Added: packages/unstable/libcanberra/debian/patches/gtk_dont_assume_x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/patches/gtk_dont_assume_x11.patch?rev=47853&op=file
==============================================================================
--- packages/unstable/libcanberra/debian/patches/gtk_dont_assume_x11.patch (added)
+++ packages/unstable/libcanberra/debian/patches/gtk_dont_assume_x11.patch [utf-8] Tue Apr 5 15:26:14 2016
@@ -0,0 +1,70 @@
+From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
+From: Michael Meeks <michael.meeks at suse.com>
+Date: Fri, 9 Nov 2012 16:16:40 +0000
+Subject: 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
+--- 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..08cb668 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,
+--
+cgit v0.12
+
Modified: packages/unstable/libcanberra/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/patches/series?rev=47853&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/patches/series [utf-8] (original)
+++ packages/unstable/libcanberra/debian/patches/series [utf-8] Tue Apr 5 15:26:14 2016
@@ -1 +1,2 @@
undefined_reference.diff
+gtk_dont_assume_x11.patch
More information about the pkg-gnome-commits
mailing list