[geany/geany-osx] 847bcd: Fix VTE patch using bundle relative path to apply against tarball release

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Mon, 16 Oct 2017 19:09:14 UTC
Commit:      847bcd65253e5646daa1bdbf994285d8869cb689
             https://github.com/geany/geany-osx/commit/847bcd65253e5646daa1bdbf994285d8869cb689

Log Message:
-----------
Fix VTE patch using bundle relative path to apply against tarball release


Modified Paths:
--------------
    patches/03-vte_2.91_relpath.diff

Modified: patches/03-vte_2.91_relpath.diff
30 lines changed, 3 insertions(+), 27 deletions(-)
===================================================================
@@ -1,37 +1,13 @@
-From 0b83d3b8c0e1fcf8e29c0d114d1bf2dc484eb163 Mon Sep 17 00:00:00 2001
+From 41f97055aeb2e8ef20b32ef8bf27322ac22937d2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet at 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(-)
+ src/vtegtk.cc | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
 
-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



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