Skip to content

Commit ae5d2be

Browse files
authored
lxterminal: unbreak with patch adapted from upstream (NixOS#371963)
2 parents a04634d + 2c53320 commit ae5d2be

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/src/lxterminal.c b/src/lxterminal.c
2+
index 015f5e4..32e3b68 100644
3+
--- a/src/lxterminal.c
4+
+++ b/src/lxterminal.c
5+
@@ -1210,6 +1210,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
6+
vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
7+
ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0);
8+
vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
9+
+ vte_regex_unref(dingus1);
10+
+ vte_regex_unref(dingus2);
11+
#else
12+
GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL);
13+
GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL);
14+
@@ -1217,9 +1219,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
15+
vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
16+
ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0);
17+
vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
18+
-#endif
19+
g_regex_unref(dingus1);
20+
g_regex_unref(dingus2);
21+
+#endif
22+
23+
/* Create a horizontal box inside an event box as the toplevel for the tab label. */
24+
term->tab = gtk_event_box_new();

pkgs/by-name/lx/lxterminal/package.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
5454
];
5555

5656
patches = [
57+
./fix-gcc14-pr122.patch # manual port of https://github.com/lxde/lxterminal/pull/122
5758
./respect-xml-catalog-files-var.patch
5859
];
5960

0 commit comments

Comments
 (0)