From 2c5332067c06fee7653f9c4cdf9d789b9f05a306 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 8 Jan 2025 01:31:47 +0100 Subject: [PATCH] lxterminal: unbreak with patch adapted from upstream --- .../lx/lxterminal/fix-gcc14-pr122.patch | 24 +++++++++++++++++++ pkgs/by-name/lx/lxterminal/package.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch diff --git a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch b/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch new file mode 100644 index 000000000000..57c58ac9255f --- /dev/null +++ b/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch @@ -0,0 +1,24 @@ +diff --git a/src/lxterminal.c b/src/lxterminal.c +index 015f5e4..32e3b68 100644 +--- a/src/lxterminal.c ++++ b/src/lxterminal.c +@@ -1210,6 +1210,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + 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); ++ vte_regex_unref(dingus1); ++ vte_regex_unref(dingus2); + #else + GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL); + GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL); +@@ -1217,9 +1219,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + 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); ++#endif + + /* Create a horizontal box inside an event box as the toplevel for the tab label. */ + term->tab = gtk_event_box_new(); diff --git a/pkgs/by-name/lx/lxterminal/package.nix b/pkgs/by-name/lx/lxterminal/package.nix index 3643e58d1447..956d3e3b121a 100644 --- a/pkgs/by-name/lx/lxterminal/package.nix +++ b/pkgs/by-name/lx/lxterminal/package.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { ]; patches = [ + ./fix-gcc14-pr122.patch # manual port of https://github.com/lxde/lxterminal/pull/122 ./respect-xml-catalog-files-var.patch ];