[77611] trunk/dports/audio/libcanberra

[afb at macports.org]

Revision: 77611
          http://trac.macports.org/changeset/77611
Author:   afb at macports.org
Date:     2011-04-06 01:31:58 -0700 (Wed, 06 Apr 2011)
Log Message:
-----------
make libcanberra compile with +quartz gtk2 (#19705)

Modified Paths:
--------------
    trunk/dports/audio/libcanberra/Portfile

Added Paths:
-----------
    trunk/dports/audio/libcanberra/files/
    trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff

Modified: trunk/dports/audio/libcanberra/Portfile
===================================================================
--- trunk/dports/audio/libcanberra/Portfile	2011-04-06 05:00:45 UTC (rev 77610)
+++ trunk/dports/audio/libcanberra/Portfile	2011-04-06 08:31:58 UTC (rev 77611)
@@ -5,7 +5,7 @@
 
 name                libcanberra
 version             0.26
-revision            1
+revision            2
 license             LGPLv2.1+
 categories          audio devel
 maintainers         nomaintainer
@@ -26,6 +26,8 @@
                     port:gconf \
                     port:libvorbis
 
+patchfiles          patch-gtkquartz.diff
+
 configure.args      --enable-gtk \
                     --disable-null \
                     --disable-schemas-install

Added: trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff
===================================================================
--- trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff	                        (rev 0)
+++ trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff	2011-04-06 08:31:58 UTC (rev 77611)
@@ -0,0 +1,90 @@
+--- src/canberra-gtk-module.c
++++ src/canberra-gtk-module.c
+@@ -25,8 +25,10 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
++#if defined(GDK_WINDOWING_X11)
+ #include <gdk/gdkx.h>
+ #include <X11/Xatom.h>
++#endif
+ 
+ #include "canberra-gtk.h"
+ 
+@@ -299,6 +301,7 @@ static SoundEventData* filter_sound_event(SoundEventData *d) {
+         return d;
+ }
+ 
++#ifdef GDK_WINDOWING_X11
+ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         Atom type_return;
+         gint format_return;
+@@ -386,6 +389,19 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
+ 
+         return ret;
+ }
++#else /* !GDK_WINDOWING_X11 */
++static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
++        return -1;
++}
++
++static gint display_get_desktop(GdkDisplay *d) {
++        return -1;
++}
++
++static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
++        return FALSE;
++}
++#endif
+ 
+ static void dispatch_sound_event(SoundEventData *d) {
+         int ret = CA_SUCCESS;
+--- src/canberra-gtk.c
++++ src/canberra-gtk.c
+@@ -26,8 +26,10 @@
+ 
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
++#if defined(GDK_WINDOWING_X11)
+ #include <gdk/gdkx.h>
+ #include <X11/Xatom.h>
++#endif
+ 
+ #include "canberra.h"
+ #include "canberra-gtk.h"
+@@ -177,6 +179,7 @@ static GtkWindow* get_toplevel(GtkWidget *w) {
+         return GTK_WINDOW(w);
+ }
+ 
++#ifdef GDK_WINDOWING_X11
+ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         Atom type_return;
+         gint format_return;
+@@ -204,6 +207,7 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+ 
+         return ret;
+ }
++#endif
+ 
+ /**
+  * ca_gtk_proplist_set_for_widget:
+@@ -258,6 +262,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+                 GdkDisplay *display = NULL;
+                 gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1;
+ 
++#ifdef GDK_WINDOWING_X11
+                 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;
+@@ -285,6 +290,11 @@ 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;
+                 }
++#else /* !GDK_WINDOWING_X11 */
++                dw = gtk_widget_get_window(GTK_WIDGET(w));
++                display = gtk_widget_get_display(GTK_WIDGET(w));
++                screen = gtk_widget_get_screen(GTK_WIDGET(w));
++#endif
+ 
+                 /* FIXME, this might cause a round trip */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110406/75e051cd/attachment.html>