[jhbuild] [3.0] Add patch to make libcanberra build
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] [3.0] Add patch to make libcanberra build
- Date: Sat, 2 Oct 2010 00:21:15 +0000 (UTC)
commit 77fe779bec18abe02892fdd3f3af17c538616498
Author: William Jon McCann <jmccann redhat com>
Date: Fri Oct 1 20:19:54 2010 -0400
[3.0] Add patch to make libcanberra build
modulesets/gnome-external-deps-3.0.modules | 1 +
...-1cea6c4528d069a2c77ec42ef305545b9e9609b7.patch | 27 ++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 76019f4..c0da960 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -768,6 +768,7 @@
<branch repo="0pointer.de" module="libcanberra/libcanberra-0.25.tar.gz" version="0.25"
hash="sha256:46329eda4c877206232d4c906e8f5f401518cec52859395cde3a9e39ea97553c"
md5sum="d7a158d22d0b44fb2a67aadae74e28ab" size="463014"/>
+ <patch file="libcanberra.git-1cea6c4528d069a2c77ec42ef305545b9e9609b7.patch" strip="1"/>
<dependencies>
<dep package="gtk-doc"/>
</dependencies>
diff --git a/patches/libcanberra.git-1cea6c4528d069a2c77ec42ef305545b9e9609b7.patch b/patches/libcanberra.git-1cea6c4528d069a2c77ec42ef305545b9e9609b7.patch
new file mode 100644
index 0000000..6d90af6
--- /dev/null
+++ b/patches/libcanberra.git-1cea6c4528d069a2c77ec42ef305545b9e9609b7.patch
@@ -0,0 +1,27 @@
+From: Matthias Clasen <mclasen redhat com>
+Date: Mon, 27 Sep 2010 20:43:37 +0000 (-0400)
+Subject: gtk: Fix the build with current GTK+
+X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=1cea6c4528d069a2c77ec42ef305545b9e9609b7;hp=3f3b8de37b3018c9f5780598dbf8242be2d4f2a1
+
+gtk: Fix the build with current GTK+
+
+gdk_drawable_get_screen has been removed in GTK3. Instead, use
+gdk_window_get_screen.
+---
+
+diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
+index fffcfef..34446f5 100644
+--- a/src/canberra-gtk.c
++++ b/src/canberra-gtk.c
+@@ -505,7 +505,11 @@ int ca_gtk_play_for_event(GdkEvent *e, uint32_t id, ...) {
+ goto fail;
+
+ if (e->any.window)
++#if GTK_CHECK_VERSION (2, 90, 7)
++ s = gdk_window_get_screen(e->any.window);
++#else
+ s = gdk_drawable_get_screen(GDK_DRAWABLE(e->any.window));
++#endif
+ else
+ s = gdk_screen_get_default();
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]