Control: tags 958169 + patch Control: tags 958169 + pending
Dear maintainer,
I've prepared an NMU for lxterminal (versioned as 0.3.2-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
More about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for lxterminal-0.3.2 lxterminal-0.3.2 changelog | 11 ++++++ lxterminal.prerm | 4 +- patches/fix-non-recognized-URLs.patch | 58 ++++++++++++++++++++++++++++++++++ patches/series | 1 rules | 3 - 5 files changed, 72 insertions(+), 5 deletions(-) diff -Nru lxterminal-0.3.2/debian/changelog lxterminal-0.3.2/debian/changelog --- lxterminal-0.3.2/debian/changelog 2018-09-23 03:07:58.000000000 +0200 +++ lxterminal-0.3.2/debian/changelog 2020-12-03 22:23:21.000000000 +0100 @@ -1,3 +1,14 @@ +lxterminal (0.3.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch from upstream to fix highlighting of URLs that was broken after + VTE 0.60. Closes: #958169 + * Drop --dbgsym-migration option from dh_strip, the migration is long done. + * Remove the alternative only on remove, so not to drop manual selections + users might have set during upgrades. + + -- Mattia Rizzolo <[email protected]> Thu, 03 Dec 2020 22:23:21 +0100 + lxterminal (0.3.2-1) unstable; urgency=medium * New upstream release: diff -Nru lxterminal-0.3.2/debian/lxterminal.prerm lxterminal-0.3.2/debian/lxterminal.prerm --- lxterminal-0.3.2/debian/lxterminal.prerm 2018-09-23 03:07:58.000000000 +0200 +++ lxterminal-0.3.2/debian/lxterminal.prerm 2020-09-05 04:01:34.000000000 +0200 @@ -3,11 +3,11 @@ set -e case "${1}" in - remove|upgrade|deconfigure) + remove) update-alternatives --remove x-terminal-emulator /usr/bin/lxterminal ;; - failed-upgrade) + upgrade|failed-upgrade|deconfigure) ;; diff -Nru lxterminal-0.3.2/debian/patches/fix-non-recognized-URLs.patch lxterminal-0.3.2/debian/patches/fix-non-recognized-URLs.patch --- lxterminal-0.3.2/debian/patches/fix-non-recognized-URLs.patch 1970-01-01 01:00:00.000000000 +0100 +++ lxterminal-0.3.2/debian/patches/fix-non-recognized-URLs.patch 2020-09-05 03:50:25.000000000 +0200 @@ -0,0 +1,58 @@ +From b1e3db193651b33db1e112a71ccc1e9868f37093 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Wed, 11 Mar 2020 10:07:58 -0400 +Subject: [PATCH] Don't use deprecated vte_terminal_match_add_gregex +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The URL highlighting feature of lxterminal breaks after updating vte3 from 0.58.3-1 to 0.60.0-1. +VTE 0.60 removed the implementation for vte_terminal_match_add_gregex, which has been deprecated since VTE 0.46. + +Origin: upstream, https://github.com/lxde/lxterminal/commit/b1e3db193651b33db1e112a71ccc1e9868f37093 +Bug-Debian: https://bugs.debian.org/958169 + +Signed-of-by: Balló György <[email protected]> +Reviewed-by: Jonathan Thibault <[email protected]> +--- + src/lxterminal.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/lxterminal.c b/src/lxterminal.c +index ac7d0fb..394f855 100644 +--- a/src/lxterminal.c ++++ b/src/lxterminal.c +@@ -34,6 +34,11 @@ + #include <sys/stat.h> + #include <pwd.h> + ++#if VTE_CHECK_VERSION (0, 46, 0) ++#define PCRE2_CODE_UNIT_WIDTH 0 ++#include <pcre2.h> ++#endif ++ + #include "lxterminal.h" + #include "setting.h" + #include "preferences.h" +@@ -1168,12 +1173,21 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + + /* steal from tilda-0.09.6/src/tilda_terminal.c:145 */ + /* Match URL's, etc. */ ++#if VTE_CHECK_VERSION (0, 46, 0) ++ VteRegex * dingus1 = vte_regex_new_for_match(DINGUS1, -1, PCRE2_UTF | PCRE2_NO_UTF_CHECK | PCRE2_UCP | PCRE2_MULTILINE, NULL); ++ VteRegex * dingus2 = vte_regex_new_for_match(DINGUS2, -1, PCRE2_UTF | PCRE2_NO_UTF_CHECK | PCRE2_UCP | PCRE2_MULTILINE, NULL); ++ gint ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus1, 0); ++ vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); ++ ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0); ++ vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); ++#else + GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL); + GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL); + gint ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus1, 0); + vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); + ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0); + vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); ++#endif + g_regex_unref(dingus1); + g_regex_unref(dingus2); + diff -Nru lxterminal-0.3.2/debian/patches/series lxterminal-0.3.2/debian/patches/series --- lxterminal-0.3.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ lxterminal-0.3.2/debian/patches/series 2020-09-05 03:49:44.000000000 +0200 @@ -0,0 +1 @@ +fix-non-recognized-URLs.patch diff -Nru lxterminal-0.3.2/debian/rules lxterminal-0.3.2/debian/rules --- lxterminal-0.3.2/debian/rules 2018-09-23 03:07:58.000000000 +0200 +++ lxterminal-0.3.2/debian/rules 2020-09-05 03:50:32.000000000 +0200 @@ -10,6 +10,3 @@ override_dh_auto_configure: dh_auto_configure -- --enable-gtk3 --enable-man - -override_dh_strip: - dh_strip --dbgsym-migration='lxterminal-dbg (<< 0.3.0-3~)'
signature.asc
Description: PGP signature
