[115761] trunk/dports/gnome/gnome-session

devans at macports.org devans at macports.org
Fri Jan 10 14:05:16 PST 2014 

Revision: 115761
          https://trac.macports.org/changeset/115761
Author:   devans at macports.org
Date:     2014-01-10 14:05:16 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
gnome-session: merge version 3.10.1 from GNOME-3 stable test branch.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-session/Portfile
    trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
    trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff

Property Changed:
----------------
    trunk/dports/gnome/gnome-session/
    trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
    trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff


Property changes on: trunk/dports/gnome/gnome-session
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gnome-session:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session:108269-113174
/users/rmstonecipher/gnome/gnome-session:102363-103172
   + /branches/mld-qt-481/dports/gnome/gnome-session:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session:108269-115753
/users/rmstonecipher/gnome/gnome-session:102363-103172

Modified: trunk/dports/gnome/gnome-session/Portfile
===================================================================
--- trunk/dports/gnome/gnome-session/Portfile	2014-01-10 22:04:07 UTC (rev 115760)
+++ trunk/dports/gnome/gnome-session/Portfile	2014-01-10 22:05:16 UTC (rev 115761)
@@ -1,11 +1,10 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
 
 name                gnome-session
-version             3.8.4
-revision            2
+version             3.10.1
 license             LGPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Session component for the GNOME 3 desktop.
@@ -19,8 +18,8 @@
 
 use_xz              yes
 
-checksums           rmd160  25fdbef1ec1546d747b649e5aee4d1ae28f9bfcb \
-                    sha256  e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1
+checksums           rmd160  5aa9deb26cdab3cd056a9cb25db651fe24e6a131 \
+                    sha256  f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc
 
 depends_build       port:pkgconfig \
                     port:intltool \

Modified: trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
===================================================================
--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff	2014-01-10 22:04:07 UTC (rev 115760)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff	2014-01-10 22:05:16 UTC (rev 115761)
@@ -1,9 +1,9 @@
---- tools/gnome-session-check-accelerated-helper.c.orig	2013-03-05 19:59:51.000000000 -0800
-+++ tools/gnome-session-check-accelerated-helper.c	2013-12-17 10:03:36.000000000 -0800
-@@ -84,6 +84,75 @@
- #include <GL/gl.h>
- #include <GL/glx.h>
+--- tools/gnome-session-check-accelerated-helper.c.orig	2013-10-04 19:29:25.000000000 -0700
++++ tools/gnome-session-check-accelerated-helper.c	2013-12-20 12:45:20.000000000 -0800
+@@ -86,6 +86,75 @@
  
+ #include "gnome-session-check-accelerated-common.h"
+ 
 +#ifdef __APPLE__
 +#include <Availability.h>
 +#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
@@ -76,7 +76,7 @@
  #define SIZE_UNSET 0
  #define SIZE_ERROR -1
  static int max_texture_size = SIZE_UNSET;
-@@ -422,24 +491,41 @@
+@@ -427,24 +496,41 @@
                  goto out;
          }
  
@@ -117,4 +117,4 @@
 +#endif
          }
  
-         ret = 0;
+         if (has_llvmpipe) {


Property changes on: trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff:108269-113174
/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff:102363-103172

Modified: trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
===================================================================
--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff	2014-01-10 22:04:07 UTC (rev 115760)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff	2014-01-10 22:05:16 UTC (rev 115761)
@@ -1,6 +1,17 @@
---- gnome-session/main.c.orig	2013-07-30 12:11:51.000000000 -0700
-+++ gnome-session/main.c	2013-12-04 15:19:00.000000000 -0800
-@@ -226,6 +226,14 @@
+--- gnome-session/main.c.orig	2013-10-04 19:29:25.000000000 -0700
++++ gnome-session/main.c	2013-12-13 12:39:51.000000000 -0800
+@@ -33,6 +33,10 @@
+ 
+ #include <glib-unix.h>
+ 
++#ifdef __APPLE__
++#include <gio/gio.h>
++#endif
++
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-bindings.h>
+@@ -242,6 +246,14 @@
          if (g_getenv ("DBUS_SESSION_BUS_ADDRESS"))
                  return TRUE;
  
@@ -15,7 +26,7 @@
          /* Just a sanity check to prevent infinite recursion if
           * dbus-launch fails to set DBUS_SESSION_BUS_ADDRESS 
           */
-@@ -250,6 +258,7 @@
+@@ -266,6 +278,7 @@
                               g_strerror (errno));
                  return FALSE;
          }


Property changes on: trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:108269-113174
/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-main.c.diff:102363-103172
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140110/cee99382/attachment.html>

More information about the macports-changes mailing list