summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2024-05-15 09:44:57 +0200
committer Matteo Bernardini2024-05-25 07:15:15 +0200
commitcd8626413df180ab7e63d6d6f97578154fb04f68 (patch)
tree81a6dc664dbcab74cc4290f7c1026a80c8aac985
parentbecba3971a51ea467b5e557a19138ec49f667eed (diff)
downloadslackbuilds-lxterminal.tar.gz
system/lxterminal: Updated for version 20230917_9b4299c.lxterminal
Patch for gcc >= 14.x Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--system/lxterminal/gcc14.patch49
-rw-r--r--system/lxterminal/lxterminal.SlackBuild8
-rw-r--r--system/lxterminal/lxterminal.info6
3 files changed, 58 insertions, 5 deletions
diff --git a/system/lxterminal/gcc14.patch b/system/lxterminal/gcc14.patch
new file mode 100644
index 0000000000..5eecd92e74
--- /dev/null
+++ b/system/lxterminal/gcc14.patch
@@ -0,0 +1,49 @@
+From c947b9065b470c24064ac1b1c4935e8093970531 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@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.
+
+* Add GTK cast for GTK_STYLE_PROVIDER
+* 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
+@@ -1208,7 +1208,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+ GtkStyleContext* box_style_ctx =
+ gtk_widget_get_style_context(GTK_WIDGET(terminal->box));
+ gtk_style_context_add_provider(
+- box_style_ctx, box_css_provider,
++ box_style_ctx, GTK_STYLE_PROVIDER(box_css_provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ #endif
+
+@@ -1232,6 +1232,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+ vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+ ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0);
+ vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
++ 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_name(VTE_TERMINAL(term->vte), ret, "pointer");
+ ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0);
+ vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+-#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/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild
index 6f4515229e..4a04a1d835 100644
--- a/system/lxterminal/lxterminal.SlackBuild
+++ b/system/lxterminal/lxterminal.SlackBuild
@@ -71,6 +71,8 @@
# * Update.
# 0.4.0-2: 24/apr/2024 by Matteo Bernardini <ponce@slackbuilds.org>
# * Switch to gtk+3.
+# 20230917_9b4299c: 15/may/2024 by Matteo Bernardini <ponce@slackbuilds.org>
+# * Fix building with gcc14.
#
# Run 'sh lxterminal.SlackBuild' to build a Slackware package.
# The package is created in /tmp .
@@ -81,8 +83,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=lxterminal
-VERSION=${VERSION:-0.4.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20230917_9b4299c}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -136,6 +138,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/gcc14.patch
+
sh autogen.sh || true
CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index d8fecdbf39..b724fc5081 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -1,8 +1,8 @@
PRGNAM="lxterminal"
-VERSION="0.4.0"
+VERSION="20230917_9b4299c"
HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz"
-MD5SUM="7938dbd50e3826c11f4735a742b278d3"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxterminal-20230917_9b4299c.tar.xz"
+MD5SUM="d10f0f84b2a5c44eaa338d3b6cf6cfdb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""