From: David Mohammed Date: Tue, 18 Jul 2017 20:47:21 +0100 Subject: bump VTE Version number Ubuntu has a patched VTE that removes PCRE2. This patch bumps the expected version number check so that PCRE2 capability is not invoked. This stops Tilix from crashing on startup. . https://github.com/gnunn1/tilix/issues/916 Forwarded: N/A Origin: Other --- source/gx/tilix/terminal/regex.d | 2 +- source/gx/tilix/terminal/search.d | 4 ++-- source/gx/tilix/terminal/terminal.d | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) --- a/source/gx/tilix/terminal/regex.d +++ b/source/gx/tilix/terminal/regex.d @@ -234,7 +234,7 @@ VRegex compileVRegex(TerminalRegex regex static this() { import std.exception : assumeUnique; - if (checkVTEVersionNumber(0, 46)) { + if (checkVTEVersionNumber(0, 60)) { VRegex[URL_REGEX_PATTERNS.length] tempRegex; foreach (i, regex; URL_REGEX_PATTERNS) { tempRegex[i] = compileVRegex(regex); --- a/source/gx/tilix/terminal/search.d +++ b/source/gx/tilix/terminal/search.d @@ -199,7 +199,7 @@ private: void setTerminalSearchCriteria() { string text = seSearch.getText(); if (text.length == 0) { - if (checkVTEVersionNumber(0, 46)) { + if (checkVTEVersionNumber(0, 60)) { vte.searchSetRegex(null, 0); } else { vte.searchSetGregex(null, cast(GRegexMatchFlags) 0); @@ -212,7 +212,7 @@ private: text = format("\\b%s\\b", text); try { - if (checkVTEVersionNumber(0, 46)) { + if (checkVTEVersionNumber(0, 60)) { uint flags = PCRE2Flags.UTF | PCRE2Flags.MULTILINE | PCRE2Flags.NO_UTF_CHECK; if (!matchCase) { flags |= PCRE2Flags.CASELESS; --- a/source/gx/tilix/terminal/terminal.d +++ b/source/gx/tilix/terminal/terminal.d @@ -855,7 +855,7 @@ private: } //URL Regex Experessions try { - if (checkVTEVersionNumber(0, 46)) { + if (checkVTEVersionNumber(0, 60)) { foreach (i, regex; compiledVRegex) { int id = vte.matchAddRegex(cast(VRegex) regex, 0); regexTag[id] = URL_REGEX_PATTERNS[i]; @@ -2285,7 +2285,7 @@ private: } TerminalRegex regex = TerminalRegex(value[0], TerminalURLFlavor.CUSTOM, caseInsensitive, value[1]); try { - if (checkVTEVersionNumber(0, 46)) { + if (checkVTEVersionNumber(0, 60)) { VRegex compiledRegex = compileVRegex(regex); if (compiledRegex !is null) { int id = vte.matchAddRegex(compiledRegex, 0);