Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Sat, 04 Mar 2017 22:54:15 UTC Commit: 4ad71beddd0552ab2ea8eddcfa838b50f2578466 https://github.com/geany/geany-osx/commit/4ad71beddd0552ab2ea8eddcfa838b50f2...

Log Message: ----------- Use VTE 0.40.3 for GTK 3 build

VTE API 2.91 is now supported by Geany.

Modified Paths: -------------- geany.modules patches/03-vte_0.34_noatime.diff patches/03-vte_0.40_bsdpty.diff patches/04-vte_0.40_relpath.diff

Modified: geany.modules 22 lines changed, 14 insertions(+), 8 deletions(-) =================================================================== @@ -39,17 +39,23 @@ </branch> </autotools>

- <!-- The last version supported by Geany for GTK 3 --> - <autotools id="vte34" + <!-- VTE 2.91 API for GTK 3: 0.40 is the last version using C - there are some + problems with C++ because of two C++ libraries used by Xcode - the old + libstdc++ and the new libc++. The new one which would work is only + available since OS X 10.9 but we target 10.6 at the moment. --> + <autotools id="vte291" autogenargs="--disable-Bsymbolic" autogen-sh="configure"> - <branch module="vte/0.34/vte-0.34.9.tar.xz" - version="0.34.9"> - <!-- Don't use O_NOATIME --> - <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_0.34_noatime.diff" strip="1" /> + <branch module="vte/0.40/vte-0.40.3.tar.xz" + version="0.40.3"> + <!-- Use BSD pty code --> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_0.40_bsdpty.diff" strip="1" /> <!-- Make paths relative to bundle (fallback to system paths if not found) --> - <patch file="https://github.com/geany/geany-osx/raw/master/patches/04-vte_0.34_relpath.diff" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/04-vte_0.40_relpath.diff" strip="1" /> </branch> + <dependencies> + <dep package="gnutls" /> + </dependencies> </autotools>

<!-- Needed by the used theme --> @@ -102,7 +108,7 @@

<metamodule id="geany-deps-gtk3"> <dependencies> - <dep package="vte34" /> + <dep package="vte291" /> <dep package="docutils" /> <dep package="gtk-mac-bundler" /> <dep package="gtk-mac-integration-fixed" />

Modified: patches/03-vte_0.34_noatime.diff 34 lines changed, 0 insertions(+), 34 deletions(-) =================================================================== @@ -1,34 +0,0 @@ -From b5c8bf99d6bac7617c5eea557fafebb2b4e7eb39 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com -Date: Sat, 21 May 2016 20:16:58 +0200 -Subject: [PATCH] Don't use O_NOATIME as it doesn't exist on OS X - ---- - src/vteutils.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/vteutils.c b/src/vteutils.c -index 1371cb2..c552ada 100644 ---- a/src/vteutils.c -+++ b/src/vteutils.c -@@ -48,7 +48,7 @@ _vte_mkstemp (void) - - #ifdef O_TMPFILE - fd = open (g_get_tmp_dir (), -- O_TMPFILE | O_EXCL | O_RDWR | O_NOATIME, -+ O_TMPFILE | O_EXCL | O_RDWR, - 0600); - if (fd != -1) - goto done; -@@ -63,8 +63,6 @@ _vte_mkstemp (void) - unlink (file_name); - g_free (file_name); - -- do { } while (fcntl (fd, F_SETFL, O_NOATIME) == -1 && errno == EINTR); -- - #ifdef O_TMPFILE - done: - #endif --- -2.8.1 -

Modified: patches/03-vte_0.40_bsdpty.diff 34 lines changed, 34 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,34 @@ +From 50e80f6ccb289c4d06f7f68b2bf97bfa7aff12ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com +Date: Sat, 4 Mar 2017 21:23:10 +0100 +Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20=E2=80=9CUNIX98=20PTY?= + =?UTF-8?q?=E2=80=9D?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It doesn’t work on OS X and because it’s preferred in the code over BSD +terminal, it makes the terminal non-functional. +--- + src/pty.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/pty.c b/src/pty.c +index fb8e869..3da1bc0 100644 +--- a/src/pty.c ++++ b/src/pty.c +@@ -84,11 +84,7 @@ static pid_t _vte_pty_helper_pid = -1; + static int _vte_pty_helper_tunnel = -1; + #endif + +-#if defined(HAVE_PTSNAME_R) || defined(HAVE_PTSNAME) || defined(TIOCGPTN) +-#define HAVE_UNIX98_PTY +-#else + #undef HAVE_UNIX98_PTY +-#endif + + #define VTE_VERSION_NUMERIC ((VTE_MAJOR_VERSION) * 10000 + (VTE_MINOR_VERSION) * 100 + (VTE_MICRO_VERSION)) + +-- +2.8.1 +

Modified: patches/04-vte_0.40_relpath.diff 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -From b6b98bc5860f7c02f77d9584e00681089af67485 Mon Sep 17 00:00:00 2001 +From 090e746ef7f49ead46f4b9b5f90b99e428d908a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com Date: Sat, 21 May 2016 20:42:30 +0200 Subject: [PATCH] Make VTE independent of installation path when bundling @@ -12,10 +12,10 @@ in the source. 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/pty.c b/src/pty.c -index 5c6afd5..f9d9c36 100644 +index 3da1bc0..669c160 100644 --- a/src/pty.c +++ b/src/pty.c -@@ -1265,8 +1265,17 @@ _vte_pty_start_helper(GError **error) +@@ -1139,8 +1139,17 @@ _vte_pty_start_helper(GError **error) close(tunnel); close(_vte_pty_helper_tunnel); /* Exec our helper. */ @@ -36,10 +36,10 @@ index 5c6afd5..f9d9c36 100644 _exit(1); } diff --git a/src/vte.c b/src/vte.c -index 3227b07..b2b2e4e 100644 +index 3c33e76..0134ea2 100644 --- a/src/vte.c +++ b/src/vte.c -@@ -11761,7 +11761,17 @@ vte_terminal_class_init(VteTerminalClass *klass) +@@ -10345,7 +10345,17 @@ vte_terminal_class_init(VteTerminalClass *klass) } #endif

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).