[packages/lxterminal] - gcc14 fix, rel 3
baggins
baggins at pld-linux.org
Fri Aug 2 13:21:23 CEST 2024
commit 4bb5712612cfb314ee5391f8896468cdfab9ee8d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Aug 2 12:27:01 2024 +0200
- gcc14 fix, rel 3
gcc14-incompatible-pointer-types.patch | 39 ++++++++++++++++++++++++++++++++++
lxterminal.spec | 4 +++-
2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/lxterminal.spec b/lxterminal.spec
index 5536a71..a22e38a 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -6,12 +6,13 @@ Summary: LXTerminal - the standard terminal emulator of LXDE
Summary(pl.UTF-8): LXTerminal - standardowy emulator terminala dla LXDE
Name: lxterminal
Version: 0.4.0
-Release: 2
+Release: 3
License: GPL v2
Group: X11/Applications
Source0: https://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.xz
# Source0-md5: 7938dbd50e3826c11f4735a742b278d3
Patch0: wordseps.patch
+Patch1: gcc14-incompatible-pointer-types.patch
URL: http://www.lxde.org/
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1:1.11
@@ -44,6 +45,7 @@ LXTerminal to standardowy emulator terminala dla środowiska LXDE.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac
%build
diff --git a/gcc14-incompatible-pointer-types.patch b/gcc14-incompatible-pointer-types.patch
new file mode 100644
index 0000000..05e26ee
--- /dev/null
+++ b/gcc14-incompatible-pointer-types.patch
@@ -0,0 +1,39 @@
+From c947b9065b470c24064ac1b1c4935e8093970531 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Wed, 21 Feb 2024 17:01:14 +0900
+Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types
+
+gcc14 now defaults to -Werror=incompatible-pointer-types .
+Fix code to support this.
+
+* VteRegex must be deref'ed with vte_regex_unref
+
+Fixes #121 .
+---
+ src/lxterminal.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxterminal.c b/src/lxterminal.c
+index 680e411..dcd7405 100644
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -1232,6 +1232,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);
+@@ -1239,9 +1241,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();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxterminal.git/commitdiff/4bb5712612cfb314ee5391f8896468cdfab9ee8d
More information about the pld-cvs-commit
mailing list