[126174] trunk/dports/gnome/vte

[devans at macports.org]

Revision: 126174
          https://trac.macports.org/changeset/126174
Author:   devans at macports.org
Date:     2014-10-04 18:31:34 -0700 (Sat, 04 Oct 2014)
Log Message:
-----------
vte: update to version 0.38.0, API version 2.91.

Modified Paths:
--------------
    trunk/dports/gnome/vte/Portfile
    trunk/dports/gnome/vte/files/patch-src-vteutils.c.diff

Added Paths:
-----------
    trunk/dports/gnome/vte/files/patch-gcc-4.2.diff

Property Changed:
----------------
    trunk/dports/gnome/vte/


Property changes on: trunk/dports/gnome/vte
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/vte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/vte:108269-122151
/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
/users/devans/GNOME-3/stable/dports/gnome/vte:108269-126096
/users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154,119539-125568
/users/rmstonecipher/gnome/vte:102363-103172

Modified: trunk/dports/gnome/vte/Portfile
===================================================================
--- trunk/dports/gnome/vte/Portfile	2014-10-05 00:38:49 UTC (rev 126173)
+++ trunk/dports/gnome/vte/Portfile	2014-10-05 01:31:34 UTC (rev 126174)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                vte
-version             0.36.3
+version             0.38.0
 set branch          [join [lrange [split $version .] 0 1] .]
 maintainers         devans openmaintainer
 categories          gnome
@@ -22,26 +22,33 @@
 
 use_xz              yes
 
-checksums           rmd160  0f948d580cf9cdd040c881c26230198b4c85aff5 \
-                    sha256  54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c
+checksums           rmd160  a463127f290f2d526ee6aab27df86e2947d94584 \
+                    sha256  5cfff28dc9364e82f51293796d541c9229299766283283da06c3d82b6d178fd2
 
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:gtk-doc
 
 depends_lib         port:gtk3 \
-                    port:gobject-introspection
+                    port:gobject-introspection \
+                    port:vala
 
-patchfiles          patch-src-vteutils.c.diff
+patchfiles          patch-src-vteutils.c.diff \
+                    patch-gcc-4.2.diff
 
-# autoreconf with our intltool.m4
+# update m4/intltool.m4 and autoreconf
 
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
 use_autoreconf      yes
 autoreconf.args     -fvi
 
 configure.args      --enable-glade-catalogue=no \
                     --disable-Bsymbolic \
-                    --enable-introspection=yes
+                    --enable-introspection=yes \
+                    --enable-vala=yes
 
 configure.cflags-append -fstrict-aliasing
 
@@ -55,7 +62,7 @@
 post-destroot {
     if {[variant_isset glade]} {
         set libdir ${prefix}/lib
-        ln -s ${libdir}/libvte2_90.dylib ${destroot}${libdir}/libvte2_90.so
+        ln -s ${libdir}/libvte-2.91.dylib ${destroot}${libdir}/libvte-2.91.so
     }
 }
 

Copied: trunk/dports/gnome/vte/files/patch-gcc-4.2.diff (from rev 126096, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-gcc-4.2.diff)
===================================================================
--- trunk/dports/gnome/vte/files/patch-gcc-4.2.diff	                        (rev 0)
+++ trunk/dports/gnome/vte/files/patch-gcc-4.2.diff	2014-10-05 01:31:34 UTC (rev 126174)
@@ -0,0 +1,21 @@
+From 45deae03e8d0d53de82de14fbe189930d7133592 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper at humppa.nl>
+Date: Mon, 15 Sep 2014 09:01:47 +0200
+Subject: Prevent redefinition of VteCharAttributes as that breaks GCC 4.2
+
+
+diff --git a/src/vteterminal.h b/src/vteterminal.h
+index d5dc089..88e21b8 100644
+--- src/vteterminal.h
++++ src/vteterminal.h
+@@ -111,7 +111,6 @@ struct _VteTerminalClass {
+ };
+ 
+ /* The structure we return as the supplemental attributes for strings. */
+-typedef struct _VteCharAttributes VteCharAttributes;
+ struct _VteCharAttributes {
+         /*< private >*/
+ 	long row, column;
+-- 
+cgit v0.10.1
+

Modified: trunk/dports/gnome/vte/files/patch-src-vteutils.c.diff
===================================================================
--- trunk/dports/gnome/vte/files/patch-src-vteutils.c.diff	2014-10-05 00:38:49 UTC (rev 126173)
+++ trunk/dports/gnome/vte/files/patch-src-vteutils.c.diff	2014-10-05 01:31:34 UTC (rev 126174)
@@ -1,5 +1,5 @@
---- src/vteutils.c.orig	2014-06-23 10:27:08.000000000 -0700
-+++ src/vteutils.c	2014-06-23 16:01:02.000000000 -0700
+--- src/vteutils.c.orig	2014-06-15 01:28:20.000000000 -0700
++++ src/vteutils.c	2014-06-24 13:11:59.000000000 -0700
 @@ -45,6 +45,10 @@
  
  #endif /* __linux__ */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141004/b7e07a61/attachment.html>