Revision
119575
Author
devans@macports.org
Date
2014-04-30 18:52:22 -0700 (Wed, 30 Apr 2014)

Log Message

GNOME-3/stable: sync with trunk.

Modified Paths

Added Paths

Removed Paths

Property Changed

Diff

Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center


Modified: svn:mergeinfo

/trunk/dports/gnome/gnome-control-center:108265-119520 /users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152 /users/rmstonecipher/gnome/gnome-control-center:102363-103172 + /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/gnome-control-center:108265-119561 /users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152 /users/rmstonecipher/gnome/gnome-control-center:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile (119574 => 119575)


--- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile	2014-04-30 23:17:58 UTC (rev 119574)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile	2014-05-01 01:52:22 UTC (rev 119575)
@@ -9,12 +9,13 @@
 
 set mavericks_or_better yes
 version 3.12.1
+revision 1
 
 } else {
 
 set mavericks_or_better no
 version 3.8.6
-revision 2
+revision 3
 
 }
 

Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor


Modified: svn:mergeinfo

/trunk/dports/gnome/gnome-system-monitor:108271-119038 /users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor:114069-118154 /users/rmstonecipher/gnome/gnome-system-monitor:102363-103172 + /branches/mld-qt-481/dports/gnome/gnome-system-monitor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/gnome-system-monitor:108271-119562 /users/devans/GNOME-3/unstable/dports/gnome/gnome-system-monitor:114069-118154 /users/rmstonecipher/gnome/gnome-system-monitor:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile (119574 => 119575)


--- users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile	2014-04-30 23:17:58 UTC (rev 119574)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile	2014-05-01 01:52:22 UTC (rev 119575)
@@ -5,6 +5,7 @@
 
 name            gnome-system-monitor
 version         3.12.1
+revision        1
 license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     A system monitor.

Property changes: users/devans/GNOME-3/stable/dports/gnome/libpeas


Modified: svn:mergeinfo

/users/rmstonecipher/gnome/libpeas:102363-103172 + /branches/mld-qt-481/dports/gnome/libpeas:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/libpeas:117822-119561 /users/rmstonecipher/gnome/libpeas:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/libpeas/Portfile (119574 => 119575)


--- users/devans/GNOME-3/stable/dports/gnome/libpeas/Portfile	2014-04-30 23:17:58 UTC (rev 119574)
+++ users/devans/GNOME-3/stable/dports/gnome/libpeas/Portfile	2014-05-01 01:52:22 UTC (rev 119575)
@@ -5,6 +5,7 @@
 
 name                libpeas
 version             1.10.0
+revision            1
 license             LGPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         libpeas is a GObject-based plugins engine
@@ -98,6 +99,15 @@
     default_variants +python33
 }
 
+# glade expects catalog modules and libraries to have a .so suffix
+
+post-destroot {
+    if {[variant_isset glade]} {
+        set libdir ${prefix}/lib
+        ln -s ${libdir}/libpeas-gtk-1.0.dylib ${destroot}${libdir}/libpeas-gtk-1.0.so
+    }
+}
+
 post-activate {
     system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
 }

Property changes: users/devans/GNOME-3/stable/dports/gnome/vte


Modified: svn:mergeinfo

/users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154 /users/rmstonecipher/gnome/vte:102363-103172 + /branches/mld-qt-481/dports/gnome/vte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/vte:108265-119561 /users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154 /users/rmstonecipher/gnome/vte:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/vte/Portfile (119574 => 119575)


--- users/devans/GNOME-3/stable/dports/gnome/vte/Portfile	2014-04-30 23:17:58 UTC (rev 119574)
+++ users/devans/GNOME-3/stable/dports/gnome/vte/Portfile	2014-05-01 01:52:22 UTC (rev 119575)
@@ -5,6 +5,7 @@
 
 name                vte
 version             0.36.1
+revision            1
 set branch          [join [lrange [split $version .] 0 1] .]
 maintainers         nomaintainer
 categories          gnome
@@ -39,7 +40,7 @@
 use_autoreconf      yes
 autoreconf.args     -fvi
 
-configure.args      --disable-glade \
+configure.args      --enable-glade-catalogue=no \
                     --disable-Bsymbolic \
                     --enable-introspection=yes
 
@@ -47,7 +48,16 @@
 
 variant glade description {Enable building of glade catalog items} {
     depends_lib-append  port:glade
-    configure.args-delete --disable-glade
+    configure.args-replace --enable-glade-catalogue=no --enable-glade-catalogue=yes
 }
 
+# glade expects catalog modules and libraries to have a .so suffix
+
+post-destroot {
+    if {[variant_isset glade]} {
+        set libdir ${prefix}/lib
+        ln -s ${libdir}/libvte2_90.dylib ${destroot}${libdir}/libvte2_90.so
+    }
+}
+
 livecheck.type      gnome

Deleted: users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.c.diff (119574 => 119575)


--- users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.c.diff	2014-04-30 23:17:58 UTC (rev 119574)
+++ users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.c.diff	2014-05-01 01:52:22 UTC (rev 119575)
@@ -1,13 +0,0 @@
---- src/vteutils.c.orig	2013-11-25 18:40:32.000000000 -0800
-+++ src/vteutils.c	2013-11-25 18:45:25.000000000 -0800
-@@ -40,6 +40,10 @@
- #endif
- #endif
- 
-+#ifndef O_NOATIME
-+#define O_NOATIME 0
-+#endif
-+
- int
- _vte_mkstemp (void)
- {

Copied: users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.c.diff (from rev 119561, trunk/dports/gnome/vte/files/patch-src-vteutils.c.diff) (0 => 119575)


--- users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.c.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.c.diff	2014-05-01 01:52:22 UTC (rev 119575)
@@ -0,0 +1,13 @@
+--- src/vteutils.c.orig	2013-11-25 18:40:32.000000000 -0800
++++ src/vteutils.c	2013-11-25 18:45:25.000000000 -0800
+@@ -40,6 +40,10 @@
+ #endif
+ #endif
+ 
++#ifndef O_NOATIME
++#define O_NOATIME 0
++#endif
++
+ int
+ _vte_mkstemp (void)
+ {