summaryrefslogtreecommitdiffstats
path: root/system/lxterminal
diff options
context:
space:
mode:
Diffstat (limited to 'system/lxterminal')
-rw-r--r--system/lxterminal/README7
-rw-r--r--system/lxterminal/gcc14.patch49
-rw-r--r--system/lxterminal/lxterminal.SlackBuild16
-rw-r--r--system/lxterminal/lxterminal.info8
4 files changed, 67 insertions, 13 deletions
diff --git a/system/lxterminal/README b/system/lxterminal/README
index bf0c77122c..e6780940da 100644
--- a/system/lxterminal/README
+++ b/system/lxterminal/README
@@ -2,5 +2,8 @@ LXTerminal is a quick configurable terminal emulator, based on vte libs.
It uses a single process for each window/tab so it's very light on
resources.
-Pass the script the variable GTK3=yes if you want to link this against
-gtk+3 instead of the default gtk+2.
+If you want to build this for gtk+2, pass to the script the switch
+
+ GTK3=no
+
+you will need the additional dependency vte2 in this case
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 8fc4a29be0..4a04a1d835 100644
--- a/system/lxterminal/lxterminal.SlackBuild
+++ b/system/lxterminal/lxterminal.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# $Id: lxterminal.SlackBuild,v 1.6 2009/09/11 10:43:05 root Exp root $
# Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL
-# Copyright (c) 2010-2021 Matteo Bernardini, Pisa, IT
+# Copyright (c) 2010-2024 Matteo Bernardini, Pisa, IT
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -69,6 +69,10 @@
# * Update.
# 0.4.0: 10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org>
# * 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 .
@@ -79,7 +83,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=lxterminal
-VERSION=${VERSION:-0.4.0}
+VERSION=${VERSION:-20230917_9b4299c}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -92,9 +96,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -118,7 +119,7 @@ else
LIBDIRSUFFIX=""
fi
-gtk3="" ; [ "${GTK3:-no}" = "yes" ] && gtk3="--enable-gtk3"
+gtk3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && gtk3=""
DOCS="AUTHORS COPYING ChangeLog NEWS"
@@ -137,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" \
@@ -158,7 +161,6 @@ make install-strip DESTDIR=$PKG
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-# Add documentation:
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index 574b0e866d..b724fc5081 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -1,10 +1,10 @@
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="vte2"
+REQUIRES=""
MAINTAINER="Matteo Bernardini"
EMAIL="ponce@slackbuilds.org"
generated by cgit v1.2.3 (git 2.32.0) at 2024-05-24 05:46:28 +0200