[87362] trunk/dports/xfce/Thunar

[afb at macports.org]

Revision: 87362
          http://trac.macports.org/changeset/87362
Author:   afb at macports.org
Date:     2011-11-18 00:33:17 -0800 (Fri, 18 Nov 2011)
Log Message:
-----------
Thunar: allow building with +quartz (#31944)

Modified Paths:
--------------
    trunk/dports/xfce/Thunar/Portfile

Added Paths:
-----------
    trunk/dports/xfce/Thunar/files/patch-thunar-vfs-exec.c

Modified: trunk/dports/xfce/Thunar/Portfile
===================================================================
--- trunk/dports/xfce/Thunar/Portfile	2011-11-18 08:19:37 UTC (rev 87361)
+++ trunk/dports/xfce/Thunar/Portfile	2011-11-18 08:33:17 UTC (rev 87362)
@@ -5,7 +5,7 @@
 
 name            Thunar
 version         1.0.2
-revision        3
+revision        4
 categories      xfce
 platforms       darwin
 license         GPL-2+ LGPL-2+
@@ -27,8 +27,15 @@
                 port:shared-mime-info port:desktop-file-utils \
                 port:startup-notification
 
-patchfiles      patch-thunar-metafile.c
+patchfiles      patch-thunar-metafile.c patch-thunar-vfs-exec.c
 
+variant quartz conflicts x11 {
+    configure.args-delete --enable-startup-notification
+    configure.args-append --disable-startup-notification
+    depends_lib-delete    port:startup-notification
+    configure.args-append --disable-wallpaper-plugin
+}
+
 platform darwin {
         configure.args-append --disable-visibility
 }

Added: trunk/dports/xfce/Thunar/files/patch-thunar-vfs-exec.c
===================================================================
--- trunk/dports/xfce/Thunar/files/patch-thunar-vfs-exec.c	                        (rev 0)
+++ trunk/dports/xfce/Thunar/files/patch-thunar-vfs-exec.c	2011-11-18 08:33:17 UTC (rev 87362)
@@ -0,0 +1,20 @@
+--- ./thunar-vfs/thunar-vfs-exec.c.orig	2010-05-21 19:10:52.000000000 +0200
++++ ./thunar-vfs/thunar-vfs-exec.c	2011-11-07 08:54:09.000000000 +0100
+@@ -370,6 +370,7 @@ tvsn_get_active_workspace_number (GdkScr
+ 
+   root = gdk_screen_get_root_window (screen);
+ 
++#if defined(GDK_WINDOWING_X11)
+   /* determine the X atom values */
+   _NET_CURRENT_DESKTOP = XInternAtom (GDK_WINDOW_XDISPLAY (root), "_NET_CURRENT_DESKTOP", False);
+   _WIN_WORKSPACE = XInternAtom (GDK_WINDOW_XDISPLAY (root), "_WIN_WORKSPACE", False);
+@@ -398,6 +399,9 @@ tvsn_get_active_workspace_number (GdkScr
+         ws_num = *prop_ret;
+       XFree (prop_ret);
+     }
++#else
++  /* dunno what to do on non-X11 window systems */
++#endif
+ 
+   gdk_error_trap_pop ();
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111118/7dc84665/attachment.html>