[70849] trunk/dports/gnome/gnome-desktop

23 Aug 2010

Revision: 70849
          http://trac.macports.org/changeset/70849
Author:   devans@macports.org
Date:     2010-08-23 02:57:43 -0700 (Mon, 23 Aug 2010)
Log Message:
-----------
gnome-desktop: update to version 2.30.2, use python26.

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

Removed Paths:
-------------
    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	2010-08-23 09:56:25 UTC (rev 70848)
+++ trunk/dports/gnome/gnome-desktop/Portfile	2010-08-23 09:57:43 UTC (rev 70849)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            gnome-desktop
-version         2.26.3
+version         2.30.2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     devans openmaintainer
 categories      gnome
@@ -20,9 +20,9 @@
 master_sites    gnome:sources/${name}/${branch}/
 use_bzip2       yes
 
-checksums       md5     1668dcedde64b30aa02f0a73e59c957d \
-                sha1    5b1090354ee775392d8faf4ee667a84c9c7a9e79 \
-                rmd160  04e0de4e9e31e2994e1a3220f2183f25ac780399
+checksums       md5     49f06f91b0579c6e5a07ff8195945629 \
+                sha1    92ace7dd3c017a71c9ac90d2df486ebc2ba3d2ba \
+                rmd160  bcdcc3c0483cfb438b2ae30c8f8a840a39967dc5
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -33,12 +33,11 @@
 depends_lib     port:gconf \
                 port:startup-notification \
                 port:xorg-libXrandr \
-                port:python25
+                port:py26-gtk
 
 depends_run     port:gnome-themes
 
 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 \
@@ -46,7 +45,7 @@
                 --x-libraries=${prefix}/lib \
                 --disable-scrollkeeper
 
-configure.python  ${prefix}/bin/python2.5
+configure.python  ${prefix}/bin/python2.6
 
 use_parallel_build  yes
 

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	2010-08-23 09:56:25 UTC (rev 70848)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff	2010-08-23 09:57:43 UTC (rev 70849)
@@ -1,5 +1,5 @@
---- 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
+--- libgnome-desktop/gnome-bg.c.orig	2010-06-21 18:40:37.000000000 -0700
++++ libgnome-desktop/gnome-bg.c	2010-08-23 02:21:26.000000000 -0700
 @@ -34,9 +34,12 @@
  
  #include <gio/gio.h>
@@ -25,18 +25,7 @@
  
  /* Pixbuf utils */
  static guint32    pixbuf_average_value (GdkPixbuf  *pixbuf);
-@@ -862,8 +867,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);
-@@ -932,6 +939,7 @@
+@@ -1061,6 +1066,7 @@
  	return intensity < 160; /* biased slightly to be dark */
  }
  
@@ -44,7 +33,7 @@
  /* 
   * Create a persistent pixmap. We create a separate display
   * and set the closedown mode on it to RetainPermanent.
-@@ -985,6 +993,8 @@
+@@ -1114,6 +1120,8 @@
  	return gdk_pixmap;
  }
  
@@ -53,7 +42,7 @@
  static gboolean
  get_original_size (const char *filename,
  		   int        *orig_width,
-@@ -1220,6 +1230,7 @@
+@@ -1359,6 +1367,7 @@
  			 (guchar *) &pixmap_id, 1);
  }
  
@@ -61,7 +50,7 @@
  /**
   * gnome_bg_set_pixmap_as_root:
   * @screen: the #GdkScreen to change root background on
-@@ -1257,6 +1268,8 @@
+@@ -1396,6 +1405,8 @@
  	gdk_x11_display_ungrab (gdk_screen_get_display (screen));
  }
  

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	2010-08-23 09:56:25 UTC (rev 70848)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff	2010-08-23 09:57:43 UTC (rev 70849)
@@ -1,14 +1,14 @@
---- 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>
+--- libgnome-desktop/gnome-rr-config.c.orig	2010-06-21 18:40:37.000000000 -0700
++++ libgnome-desktop/gnome-rr-config.c	2010-08-23 02:18:31.000000000 -0700
+@@ -35,6 +35,7 @@
+ #include <gdk/gdkx.h>
  
  #undef GNOME_DISABLE_DEPRECATED
 +#include <gdk/gdk.h>
  #include "libgnomeui/gnome-rr-config.h"
+ 
  #include "edid.h"
- #include <X11/Xlib.h>
-@@ -67,6 +68,8 @@
+@@ -68,6 +69,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,
-@@ -1500,7 +1503,6 @@
+@@ -1609,7 +1612,6 @@
  	    }
  	}
      }
@@ -25,7 +25,7 @@
      return FALSE;
  }
  
-@@ -1691,3 +1693,5 @@
+@@ -1807,3 +1809,5 @@
  
      return success;
  }

Deleted: 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	2010-08-23 09:56:25 UTC (rev 70848)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr.c.diff	2010-08-23 09:57:43 UTC (rev 70849)
@@ -1,28 +0,0 @@
---- 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>
-+#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
- 
- #include "private.h"
- #include "gnome-rr-private.h"
- 
-+#ifndef GDK_WINDOWING_QUARTZ
- #define DISPLAY(o) ((o)->info->screen->xdisplay)
- 
- struct GnomeRROutput
-@@ -1367,3 +1371,4 @@
-     g_free (mode->name);
-     g_free (mode);
- }
-+#endif

    

devans＠macports.org

tags

participants (1)