Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Sun, 15 Oct 2017 20:29:37 UTC Commit: b4f92c73784a1c59290867bb94e48676b7343f25 https://github.com/geany/geany-osx/commit/b4f92c73784a1c59290867bb94e48676b7...

Log Message: ----------- Update VTE 2.91 to the latest working version

Fix to build VTE from master has been submitted upstream.

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

Modified: geany.modules 24 lines changed, 14 insertions(+), 10 deletions(-) =================================================================== @@ -12,6 +12,8 @@ href="http://downloads.sourceforge.net/sourceforge/%22/%3E <repository type="git" name="git.gnome.org" href="git://git.gnome.org/"/> + <repository type="tarball" name="pcre" + href="https://ftp.pcre.org/pub/pcre/%22/%3E <repository type="tarball" name="download.github.com" href="https://github.com/"/> <repository type="tarball" name="download.geany.org" @@ -26,6 +28,14 @@ version="0.12"/> </distutils>

+ <!-- Needed by VTE 2.91 --> + <autotools id="pcre2" + autogenargs="--enable-jit --enable-pcre2-8"> + <branch repo="pcre" + module="pcre2-10.30.tar.bz2" + version="10.30"/> + </autotools> + <!-- The last version which works with GTK 2 --> <autotools id="vte28" autogenargs="--disable-Bsymbolic" @@ -39,24 +49,18 @@ </branch> </autotools>

- <!-- 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.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" /> + <branch module="vte/0.48/vte-0.48.4.tar.xz" + version="0.48.4"> <!-- 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.40_relpath.diff" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_2.91_relpath.diff" strip="1" /> </branch> <dependencies> <dep package="gnutls" /> - <!-- There seems to be a problem that VTE build fails when vala is not installed --> <dep package="vala" /> + <dep package="pcre2" /> </dependencies> </autotools>

Modified: patches/03-vte_0.40_bsdpty.diff 34 lines changed, 0 insertions(+), 34 deletions(-) =================================================================== @@ -1,34 +0,0 @@ -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/03-vte_2.91_relpath.diff 60 lines changed, 60 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,60 @@ +From 0b83d3b8c0e1fcf8e29c0d114d1bf2dc484eb163 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com +Date: Sun, 15 Oct 2017 21:56:57 +0200 +Subject: [PATCH] VTE 3.91 relative path + +Use path relative to app bundle for gettext. +--- + src/app/app.cc | 12 +++++++++++- + src/vtegtk.cc | 12 +++++++++++- + 2 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/src/app/app.cc b/src/app/app.cc +index bc66cd9c..d47e673a 100644 +--- a/src/app/app.cc ++++ b/src/app/app.cc +@@ -1903,7 +1903,17 @@ main(int argc, + { + setlocale(LC_ALL, ""); + +- bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); ++ gchar *localedir = g_build_filename(g_getenv("GTK_PATH"), ++ "share", ++ "locale", ++ NULL); ++ if (!g_file_test(localedir, G_FILE_TEST_IS_DIR)) ++ { ++ g_free(localedir); ++ localedir = g_strdup(LOCALEDIR); ++ } ++ bindtextdomain(GETTEXT_PACKAGE, localedir); ++ g_free(localedir); + #ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + #endif +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index d671957a..0ff936a6 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -631,7 +631,17 @@ vte_terminal_class_init(VteTerminalClass *klass) + + _VTE_DEBUG_IF (VTE_DEBUG_UPDATES) gdk_window_set_debug_updates(TRUE); + +- bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); ++ gchar *localedir = g_build_filename(g_getenv("GTK_PATH"), ++ "share", ++ "locale", ++ NULL); ++ if (!g_file_test(localedir, G_FILE_TEST_IS_DIR)) ++ { ++ g_free(localedir); ++ localedir = g_strdup(LOCALEDIR); ++ } ++ bindtextdomain(GETTEXT_PACKAGE, localedir); ++ g_free(localedir); + #ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + #endif +-- +2.13.5 (Apple Git-94) +

Modified: patches/04-vte_0.40_relpath.diff 63 lines changed, 0 insertions(+), 63 deletions(-) =================================================================== @@ -1,63 +0,0 @@ -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 - -The wrapper shell script defines the GTK_PATH to point to -the resources directory - use this path to avoid absolute paths -in the source. ---- - src/pty.c | 13 +++++++++++-- - src/vte.c | 12 +++++++++++- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/src/pty.c b/src/pty.c -index 3da1bc0..669c160 100644 ---- a/src/pty.c -+++ b/src/pty.c -@@ -1139,8 +1139,17 @@ _vte_pty_start_helper(GError **error) - close(tunnel); - close(_vte_pty_helper_tunnel); - /* Exec our helper. */ -- execl(LIBEXECDIR "/gnome-pty-helper", -- "gnome-pty-helper", NULL); -+ gchar *path = g_build_filename(g_getenv("GTK_PATH"), -+ "libexec", -+ "gnome-pty-helper", -+ NULL); -+ if (!g_file_test(path, G_FILE_TEST_EXISTS)) -+ { -+ g_free(path); -+ path = g_strdup(LIBEXECDIR "/gnome-pty-helper"); -+ } -+ execl(path, "gnome-pty-helper", NULL); -+ g_free(path); - /* Bail. */ - _exit(1); - } -diff --git a/src/vte.c b/src/vte.c -index 3c33e76..0134ea2 100644 ---- a/src/vte.c -+++ b/src/vte.c -@@ -10345,7 +10345,17 @@ vte_terminal_class_init(VteTerminalClass *klass) - } - #endif - -- bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); -+ gchar *localedir = g_build_filename(g_getenv("GTK_PATH"), -+ "share", -+ "locale", -+ NULL); -+ if (!g_file_test(localedir, G_FILE_TEST_IS_DIR)) -+ { -+ g_free(localedir); -+ localedir = g_strdup(LOCALEDIR); -+ } -+ bindtextdomain(GETTEXT_PACKAGE, localedir); -+ g_free(localedir); - #ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - #endif --- -2.8.1 -

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