[49914] trunk/dports/gnome/gnome-desktop
devans at macports.org
devans at macports.org
Sun Apr 19 18:02:21 PDT 2009
Revision: 49914
http://trac.macports.org/changeset/49914
Author: devans at macports.org
Date: 2009-04-19 18:02:18 -0700 (Sun, 19 Apr 2009)
Log Message:
-----------
gnome-desktop: update to version 2.26.1, simplify dependencies, remove outdated configure option.
Modified Paths:
--------------
trunk/dports/gnome/gnome-desktop/Portfile
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
Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile 2009-04-19 23:53:17 UTC (rev 49913)
+++ trunk/dports/gnome/gnome-desktop/Portfile 2009-04-20 01:02:18 UTC (rev 49914)
@@ -4,8 +4,7 @@
PortSystem 1.0
name gnome-desktop
-version 2.24.3
-revision 1
+version 2.26.1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers nomaintainer
categories gnome
@@ -21,9 +20,9 @@
master_sites gnome:sources/${name}/${branch}/
use_bzip2 yes
-checksums md5 27579963a56d1d35a22e30c21666a500 \
- sha1 2ebbf2475bb741131b523819fb46e71d4489fa79 \
- rmd160 b6489965a0baa6056b5c7826418401459ffbf0b9
+checksums md5 96f2a033b2db2da1cd8d3d21fef61c4d \
+ sha1 236e8c63cdb8ae4bc2ebae662a1fac88e09c2747 \
+ rmd160 12456ea4f356b5e6b772b077ca23e0d8d59ffccb
depends_build port:gnome-doc-utils \
port:intltool \
@@ -32,14 +31,10 @@
port:libxslt
depends_lib port:libxml2 \
- port:gtk2 \
- path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gconf \
port:libgnomecanvas \
port:libgnomeui \
port:startup-notification \
- port:gettext \
- port:python25 \
port:py25-gnome
depends_run port:gnome-themes
@@ -49,7 +44,6 @@
patch-libgnome-destop-gnome-rr-config.c.diff
configure.args --with-gnome-distributor=MacPorts \
- --with-kde-datadir=${prefix}/share \
--disable-scrollkeeper
configure.python ${prefix}/bin/python2.5
Modified: 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 2009-04-19 23:53:17 UTC (rev 49913)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff 2009-04-20 01:02:18 UTC (rev 49914)
@@ -1,6 +1,6 @@
---- 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 @@
+--- libgnome-desktop/gnome-bg.c.orig 2009-04-13 15:00:20.000000000 -0700
++++ libgnome-desktop/gnome-bg.c 2009-04-19 17:02:36.000000000 -0700
+@@ -34,9 +34,12 @@
#include <gio/gio.h>
@@ -11,10 +11,10 @@
#include <X11/Xatom.h>
+#endif
- #include <gconf/gconf-client.h>
- #include <libgnomeui/libgnomeui.h>
-@@ -122,9 +125,11 @@
+ #include <cairo.h>
+@@ -132,9 +135,11 @@
+
G_DEFINE_TYPE (GnomeBG, gnome_bg, G_TYPE_OBJECT)
+#ifndef GDK_WINDOWING_QUARTZ
@@ -25,7 +25,7 @@
/* Pixbuf utils */
static guint32 pixbuf_average_value (GdkPixbuf *pixbuf);
-@@ -798,8 +803,10 @@
+@@ -862,8 +867,10 @@
gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height);
if (root) {
@@ -36,7 +36,7 @@
}
else {
pixmap = gdk_pixmap_new (window, pm_width, pm_height, -1);
-@@ -868,6 +875,7 @@
+@@ -932,6 +939,7 @@
return intensity < 160; /* biased slightly to be dark */
}
@@ -44,28 +44,29 @@
/*
* Create a persistent pixmap. We create a separate display
* and set the closedown mode on it to RetainPermanent.
-@@ -916,6 +924,7 @@
-
+@@ -985,6 +993,8 @@
return gdk_pixmap;
}
+
+#endif
-
++
static gboolean
get_original_size (const char *filename,
-@@ -1012,6 +1021,7 @@
+ int *orig_width,
+@@ -1220,6 +1230,7 @@
+ (guchar *) &pixmap_id, 1);
}
-
+#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);
+ /**
+ * gnome_bg_set_pixmap_as_root:
+ * @screen: the #GdkScreen to change root background on
+@@ -1257,6 +1268,8 @@
+ gdk_x11_display_ungrab (gdk_screen_get_display (screen));
}
--
+
+#endif
-
- /* Implementation of the pixbuf cache */
- struct _SlideShow
++
+ /**
+ * gnome_bg_set_pixmap_as_root_with_crossfade:
+ * @screen: the #GdkScreen to change root background on
Modified: 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 2009-04-19 23:53:17 UTC (rev 49913)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff 2009-04-20 01:02:18 UTC (rev 49914)
@@ -1,14 +1,14 @@
---- 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>
+--- libgnome-desktop/gnome-rr-config.c.orig 2009-04-13 15:00:20.000000000 -0700
++++ libgnome-desktop/gnome-rr-config.c 2009-04-19 17:31:04.000000000 -0700
+@@ -32,6 +32,7 @@
#include <glib/gstdio.h>
+
+ #undef GNOME_DISABLE_DEPRECATED
+#include <gdk/gdk.h>
#include "libgnomeui/gnome-rr-config.h"
#include "edid.h"
-
-@@ -58,6 +59,8 @@
+ #include <X11/Xlib.h>
+@@ -67,6 +68,8 @@
* </monitors>
*/
@@ -17,7 +17,7 @@
/* A helper wrapper around the GMarkup parser stuff */
static gboolean parse_file_gmarkup (const gchar *file,
const GMarkupParser *parser,
-@@ -1319,7 +1322,6 @@
+@@ -1500,7 +1503,6 @@
}
}
}
@@ -25,14 +25,7 @@
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);
- }
+@@ -1691,3 +1693,5 @@
return success;
}
Modified: 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 2009-04-19 23:53:17 UTC (rev 49913)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr.c.diff 2009-04-20 01:02:18 UTC (rev 49914)
@@ -1,7 +1,7 @@
---- 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 @@
-
+--- libgnome-desktop/gnome-rr.c.orig 2009-04-13 15:00:20.000000000 -0700
++++ libgnome-desktop/gnome-rr.c 2009-04-19 17:23:31.000000000 -0700
+@@ -28,15 +28,19 @@
+ #include <glib/gi18n-lib.h>
#include "libgnomeui/gnome-rr.h"
#include <string.h>
+#include <gtk/gtk.h>
@@ -14,11 +14,14 @@
#include <X11/Xatom.h>
+#endif
+ #include "private.h"
+ #include "gnome-rr-private.h"
+
+#ifndef GDK_WINDOWING_QUARTZ
#define DISPLAY(o) ((o)->info->screen->xdisplay)
- typedef struct ScreenInfo ScreenInfo;
-@@ -1170,3 +1174,4 @@
+ struct GnomeRROutput
+@@ -1367,3 +1371,4 @@
g_free (mode->name);
g_free (mode);
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090419/bee94672/attachment.html>
More information about the macports-changes
mailing list