Revision: 145277 https://trac.macports.org/changeset/145277 Author: devans@macports.org Date: 2016-01-30 13:45:27 -0800 (Sat, 30 Jan 2016) Log Message: ----------- vte: workaround build failures by restricting version to 0.43.0 on platforms using libstdc++, increment revision on these platforms due to included fix for +glade configuration (#50492). Modified Paths: -------------- trunk/dports/gnome/vte/Portfile Added Paths: ----------- trunk/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff trunk/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff trunk/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.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-145273 /users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154,119539-125568,128864-134540,139564-140527,141712-142477 /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-145276 /users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154,119539-125568,128864-134540,139564-140527,141712-142477 /users/rmstonecipher/gnome/vte:102363-103172 Modified: trunk/dports/gnome/vte/Portfile =================================================================== --- trunk/dports/gnome/vte/Portfile 2016-01-30 21:42:21 UTC (rev 145276) +++ trunk/dports/gnome/vte/Portfile 2016-01-30 21:45:27 UTC (rev 145277) @@ -80,4 +80,18 @@ } } -livecheck.type gnome-with-unstable +platform darwin { + if {${configure.cxx_stdlib} eq "libstdc++"} { + # vte 0.43.1+ build fails on platforms supporting libstdc++ (#50492) + version 0.43.0 + revision 1 + checksums rmd160 d9a1eb6d6d5cbb39e04f625d22e43315500750b8 \ + sha256 2f10ae4148633e9ee458639f72cf2929703d413b95eee416fd6f03db8c4d4ab9 + patchfiles patch-src-Makefile.am-0.43.0.diff \ + patch-src-pty.cc-0.43.0.diff \ + patch-src-vteutils.cc-0.43.0.diff + livecheck.type none + } else { + livecheck.type gnome-with-unstable + } +} Copied: trunk/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff (from rev 145276, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff) =================================================================== --- trunk/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff (rev 0) +++ trunk/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff 2016-01-30 21:45:27 UTC (rev 145277) @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig 2014-11-24 13:16:30.000000000 -0800 ++++ src/Makefile.am 2014-11-28 13:26:58.000000000 -0800 +@@ -293,8 +293,6 @@ + $(NULL) + + vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CFLAGS = \ +- -Wno-unused-variable \ +- -Wno-unused-but-set-variable \ + $(VTE_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) Copied: trunk/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff (from rev 145276, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff) =================================================================== --- trunk/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff (rev 0) +++ trunk/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff 2016-01-30 21:45:27 UTC (rev 145277) @@ -0,0 +1,11 @@ +--- src/pty.cc.orig 2015-10-29 12:42:57.000000000 -0700 ++++ src/pty.cc 2015-10-29 12:43:47.000000000 -0700 +@@ -748,7 +748,7 @@ + /* Set it to blocking. */ + /* FIXMEchpe: why?? vte_terminal_set_pty does the inverse... */ + flags = rv & ~(O_NONBLOCK); +- rv = fcntl(fd, F_SETFL, flags); ++// rv = fcntl(fd, F_SETFL, flags); + if (rv < 0) { + int errsv = errno; + g_set_error(error, VTE_PTY_ERROR, Copied: trunk/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff (from rev 145276, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff) =================================================================== --- trunk/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff (rev 0) +++ trunk/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff 2016-01-30 21:45:27 UTC (rev 145277) @@ -0,0 +1,13 @@ +--- src/vteutils.cc.orig 2016-01-30 13:06:38.000000000 -0800 ++++ src/vteutils.cc 2016-01-30 13:12:54.000000000 -0800 +@@ -45,6 +45,10 @@ + + #endif /* __linux__ */ + ++#ifndef O_CLOEXEC ++#define O_CLOEXEC 0 ++#endif ++ + int + _vte_mkstemp (void) + {