Revision: 145301 https://trac.macports.org/changeset/145301 Author: devans@macports.org Date: 2016-01-30 21:04:38 -0800 (Sat, 30 Jan 2016) Log Message: ----------- GNOME-3/unstable: vte, merge version 0.43.2 from stable. Modified Paths: -------------- users/devans/GNOME-3/unstable/dports/gnome/vte/Portfile users/devans/GNOME-3/unstable/dports/gnome/vte/files/autogen.sh users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am.diff Added Paths: ----------- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff Removed Paths: ------------- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff Property Changed: ---------------- users/devans/GNOME-3/unstable/dports/gnome/vte/ Property changes on: users/devans/GNOME-3/unstable/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 /trunk/dports/gnome/vte:108265-141354 /users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154,119539-125568,128864-134540,139564-140527 /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-141354 /users/devans/GNOME-3/stable/dports/gnome/vte:141637-145300 /users/devans/GNOME-3/unstable/dports/gnome/vte:116416-118154,119539-125568,128864-134540,139564-140527 /users/rmstonecipher/gnome/vte:102363-103172 Modified: users/devans/GNOME-3/unstable/dports/gnome/vte/Portfile =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/Portfile 2016-01-31 04:58:41 UTC (rev 145300) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/Portfile 2016-01-31 05:04:38 UTC (rev 145301) @@ -6,8 +6,7 @@ PortGroup compiler_blacklist_versions 1.0 name vte -version 0.43.0 -revision 1 +version 0.43.2 set branch [join [lrange [split $version .] 0 1] .] maintainers devans openmaintainer categories gnome @@ -25,8 +24,8 @@ use_xz yes -checksums rmd160 d9a1eb6d6d5cbb39e04f625d22e43315500750b8 \ - sha256 2f10ae4148633e9ee458639f72cf2929703d413b95eee416fd6f03db8c4d4ab9 +checksums rmd160 b980f9b462335a329a679e77852c241c0351d753 \ + sha256 1c133253d1a6b90df8b0042c96c141959484225f449678d3841f125e574e2c36 depends_build port:pkgconfig \ port:intltool \ @@ -60,22 +59,18 @@ configure.cmd ./autogen.sh -configure.args --disable-glade \ - --disable-Bsymbolic \ +configure.args --disable-Bsymbolic \ + --disable-silent-rules \ --with-pcre2 \ --enable-vala=yes configure.cflags-append -fstrict-aliasing variant glade description {Enable building of glade catalog items} { - depends_lib-append port:glade - configure.args-delete --disable-glade + depends_lib-append port:glade + configure.args-append --enable-glade-catalogue } -variant debug description {Enable building with debug support} { - configure.args-append --enable-debug -} - # glade expects catalog modules and libraries to have a .so suffix post-destroot { @@ -85,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 + } +} Modified: users/devans/GNOME-3/unstable/dports/gnome/vte/files/autogen.sh =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/files/autogen.sh 2016-01-31 04:58:41 UTC (rev 145300) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/files/autogen.sh 2016-01-31 05:04:38 UTC (rev 145301) @@ -9,8 +9,8 @@ cd "$srcdir" mkdir -p m4 >/dev/null 2>&1 || true gtkdocize --copy --flavour no-tmpl +intltoolize --force --copy autoreconf --verbose --force --install -intltoolize --force cd - test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" Copied: users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff (from rev 145300, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff) =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am-0.43.0.diff 2016-01-31 05:04:38 UTC (rev 145301) @@ -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) Modified: users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am.diff 2016-01-31 04:58:41 UTC (rev 145300) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-Makefile.am.diff 2016-01-31 05:04:38 UTC (rev 145301) @@ -1,6 +1,6 @@ --- 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 @@ +@@ -286,8 +286,6 @@ $(NULL) vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CFLAGS = \ Copied: users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff (from rev 145300, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff) =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc-0.43.0.diff 2016-01-31 05:04:38 UTC (rev 145301) @@ -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, Deleted: users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff 2016-01-31 04:58:41 UTC (rev 145300) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff 2016-01-31 05:04:38 UTC (rev 145301) @@ -1,11 +0,0 @@ ---- 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: users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff (from rev 145300, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-pty.cc.diff) =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-pty.cc.diff 2016-01-31 05:04:38 UTC (rev 145301) @@ -0,0 +1,14 @@ +--- src/pty.cc.orig 2016-01-30 10:31:41.000000000 -0800 ++++ src/pty.cc 2016-01-30 10:33:32.000000000 -0800 +@@ -59,6 +59,11 @@ + #ifdef HAVE_PTY_H + #include <pty.h> + #endif ++ ++#ifndef O_CLOEXEC ++#define O_CLOEXEC 0 ++#endif ++ + #if defined(__sun) && defined(HAVE_STROPTS_H) + #include <stropts.h> + #endif Copied: users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff (from rev 145300, users/devans/GNOME-3/stable/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff) =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/vte/files/patch-src-vteutils.cc-0.43.0.diff 2016-01-31 05:04:38 UTC (rev 145301) @@ -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) + {
participants (1)
-
devans@macports.org