[41393] trunk/dports/gnome/gnome-desktop
pguyot at kallisys.net
pguyot at kallisys.net
Sat Nov 1 11:03:09 PDT 2008
Revision: 41393
http://trac.macports.org/changeset/41393
Author: pguyot at kallisys.net
Date: 2008-11-01 11:03:07 -0700 (Sat, 01 Nov 2008)
Log Message:
-----------
New quartz variant
Modified Paths:
--------------
trunk/dports/gnome/gnome-desktop/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-desktop/files/patch-configure.diff
trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff
trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff
trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr.c.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-desktop/files/patch_gnome-desktop-item.c
Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile 2008-11-01 16:30:29 UTC (rev 41392)
+++ trunk/dports/gnome/gnome-desktop/Portfile 2008-11-01 18:03:07 UTC (rev 41393)
@@ -4,6 +4,7 @@
name gnome-desktop
version 2.24.1
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers nomaintainer
categories gnome
@@ -40,6 +41,10 @@
port:py25-gnome \
port:gvfs
+patchfiles patch-libgnome-destop-gnome-bg.c.diff \
+ patch-libgnome-destop-gnome-rr.c.diff \
+ patch-libgnome-destop-gnome-rr-config.c.diff
+
configure.args --with-gnome-distributor=MacPorts \
--with-kde-datadir=${prefix}/share \
--disable-scrollkeeper
@@ -50,6 +55,44 @@
system "${prefix}/bin/scrollkeeper-update"
}
+if {[variant_isset no_x11]} {
+ default_variants +quartz
+}
+
+if {![variant_isset quartz]} {
+ default_variants +x11
+}
+
+pre-fetch {
+ if {![variant_isset quartz] && ![variant_isset x11]} {
+ error "Either +x11 or +quartz is required"
+ }
+}
+
+pre-configure {
+ if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
+ set gtk_quartz [exec grep -c GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h]
+ if {[variant_isset quartz] && ${gtk_quartz} == 0} {
+ error "+quartz variant selected, but gtk2+x11 is installed"
+ } elseif {[variant_isset x11] && ${gtk_quartz} == 1} {
+ error "+x11 variant selected, but gtk2+quartz is installed"
+ }
+ } else {
+ error "Cannot find gdkconfig.h"
+ }
+}
+
+variant quartz requires no_x11 conflicts x11 description {Enable Quartz rendering} {
+ depends_lib-delete port:startup-notification
+ patchfiles-append patch-configure.diff
+}
+
+variant x11 conflicts quartz description {Enable rendering in X11 (default)} {
+}
+
+variant no_x11 description {Same as +quartz} {
+}
+
livecheck.check regex
livecheck.url http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}
Added: trunk/dports/gnome/gnome-desktop/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/patch-configure.diff (rev 0)
+++ trunk/dports/gnome/gnome-desktop/files/patch-configure.diff 2008-11-01 18:03:07 UTC (rev 41393)
@@ -0,0 +1,23 @@
+--- configure.orig 2008-11-01 14:55:28.000000000 +0100
++++ configure 2008-11-01 14:55:52.000000000 +0100
+@@ -22241,20 +22241,8 @@
+
+
+
+-if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
+- echo "Building with libstartup-notification"
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STARTUP_NOTIFICATION 1
+-_ACEOF
+-
+- with_startup_notification=yes
+- STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
+-else
+- echo "***** WARNING: Building without libstartup-notification"
+ with_startup_notification=no
+ STARTUP_NOTIFICATION_PACKAGE=
+-fi
+
+
+
Added: trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff 2008-11-01 18:03:07 UTC (rev 41393)
@@ -0,0 +1,71 @@
+--- libgnome-desktop/gnome-bg.c.orig 2008-11-01 15:30:31.000000000 +0100
++++ libgnome-desktop/gnome-bg.c 2008-11-01 15:28:48.000000000 +0100
+@@ -33,9 +33,12 @@
+
+ #include <gio/gio.h>
+
++#include <gdk/gdk.h>
++#ifndef GDK_WINDOWING_QUARTZ
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
++#endif
+
+ #include <gconf/gconf-client.h>
+ #include <libgnomeui/libgnomeui.h>
+@@ -122,9 +125,11 @@
+
+ G_DEFINE_TYPE (GnomeBG, gnome_bg, G_TYPE_OBJECT)
+
++#ifndef GDK_WINDOWING_QUARTZ
+ static GdkPixmap *make_root_pixmap (GdkScreen *screen,
+ gint width,
+ gint height);
++#endif
+
+ /* Pixbuf utils */
+ static guint32 pixbuf_average_value (GdkPixbuf *pixbuf);
+@@ -798,8 +803,10 @@
+ gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height);
+
+ if (root) {
++#ifndef GDK_WINDOWING_QUARTZ
+ pixmap = make_root_pixmap (gdk_drawable_get_screen (window),
+ pm_width, pm_height);
++#endif
+ }
+ else {
+ pixmap = gdk_pixmap_new (window, pm_width, pm_height, -1);
+@@ -868,6 +875,7 @@
+ return intensity < 160; /* biased slightly to be dark */
+ }
+
++#ifndef GDK_WINDOWING_QUARTZ
+ /*
+ * Create a persistent pixmap. We create a separate display
+ * and set the closedown mode on it to RetainPermanent.
+@@ -916,6 +924,7 @@
+
+ return gdk_pixmap;
+ }
++#endif
+
+ static gboolean
+ get_original_size (const char *filename,
+@@ -1012,6 +1021,7 @@
+ }
+
+
++#ifndef GDK_WINDOWING_QUARTZ
+ /* Set the root pixmap, and properties pointing to it. We
+ * do this atomically with XGrabServer to make sure that
+ * we won't leak the pixmap if somebody else it setting
+@@ -1079,7 +1089,7 @@
+
+ XFlush (display);
+ }
+-
++#endif
+
+ /* Implementation of the pixbuf cache */
+ struct _SlideShow
Added: trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff 2008-11-01 18:03:07 UTC (rev 41393)
@@ -0,0 +1,40 @@
+--- libgnome-desktop/gnome-rr-config.c.orig 2008-11-01 15:21:40.000000000 +0100
++++ libgnome-desktop/gnome-rr-config.c 2008-11-01 15:27:04.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
++#include <gdk/gdk.h>
+ #include "libgnomeui/gnome-rr-config.h"
+ #include "edid.h"
+
+@@ -58,6 +59,8 @@
+ * </monitors>
+ */
+
++#ifndef GDK_WINDOWING_QUARTZ
++
+ /* A helper wrapper around the GMarkup parser stuff */
+ static gboolean parse_file_gmarkup (const gchar *file,
+ const GMarkupParser *parser,
+@@ -1319,7 +1322,6 @@
+ }
+ }
+ }
+-
+ return FALSE;
+ }
+
+@@ -1474,9 +1476,11 @@
+ if (success)
+ {
+ gnome_rr_screen_set_size (assign->screen, width, height, width_mm, height_mm);
+-
++
+ g_hash_table_foreach (assign->info, configure_crtc, NULL);
+ }
+
+ return success;
+ }
++
++#endif
Added: trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr.c.diff
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr.c.diff 2008-11-01 18:03:07 UTC (rev 41393)
@@ -0,0 +1,25 @@
+--- libgnome-desktop/gnome-rr.c.orig 2008-11-01 15:05:28.000000000 +0100
++++ libgnome-desktop/gnome-rr.c 2008-11-01 15:20:41.000000000 +0100
+@@ -26,12 +26,16 @@
+
+ #include "libgnomeui/gnome-rr.h"
+ #include <string.h>
++#include <gtk/gtk.h>
++#include <gdk/gdk.h>
++#ifndef GDK_WINDOWING_QUARTZ
+ #include <X11/Xlib.h>
+ #include <X11/extensions/Xrandr.h>
+-#include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xatom.h>
++#endif
+
++#ifndef GDK_WINDOWING_QUARTZ
+ #define DISPLAY(o) ((o)->info->screen->xdisplay)
+
+ typedef struct ScreenInfo ScreenInfo;
+@@ -1170,3 +1174,4 @@
+ g_free (mode->name);
+ g_free (mode);
+ }
++#endif
Deleted: trunk/dports/gnome/gnome-desktop/files/patch_gnome-desktop-item.c
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/patch_gnome-desktop-item.c 2008-11-01 16:30:29 UTC (rev 41392)
+++ trunk/dports/gnome/gnome-desktop/files/patch_gnome-desktop-item.c 2008-11-01 18:03:07 UTC (rev 41393)
@@ -1,15 +0,0 @@
---- libgnome-desktop/gnome-desktop-item.c.org Fri Sep 17 22:05:13 2004
-+++ libgnome-desktop/gnome-desktop-item.c Fri Sep 17 22:05:16 2004
-@@ -62,7 +62,11 @@
-
- #define sure_string(s) ((s)!=NULL?(s):"")
-
--extern char **environ;
-+#ifdef __APPLE__
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#elif extern char **environ;
-+#endif
-
- struct _GnomeDesktopItem {
- int refcount;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081101/38366a7d/attachment.html>
More information about the macports-changes
mailing list