Miroirs/csb
1
0
Fork 0
mirror of https://gitlab.com/CinnamonSlackBuilds/csb.git synced 2024-12-26 21:59:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cinnamon-settings-daemon: Fix build with GCC 14.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2024-06-11 23:38:48 +07:00
parent 01d7a8ee57
commit 8f33d1f091
3 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cinnamon-session/cinnamon-session.SlackBuild
View file

@ -2,7 +2,7 @@
# Slackware build script for cinnamon-session # Slackware build script for cinnamon-session
# Copyright 2014-2023 Willy Sudiarto Raharjo <willysr@slackware-id.org> # Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackware-id.org>
# All rights reserved. # All rights reserved.
# #
# Redistribution and use of this script, with or without modification, is # Redistribution and use of this script, with or without modification, is
@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cinnamon-session PRGNAM=cinnamon-session
VERSION=${VERSION:-6.0.1} VERSION=${VERSION:-6.0.4}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_csb} TAG=${TAG:-_csb}

28
cinnamon-settings-daemon/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch Normal file
View file

@ -0,0 +1,28 @@
From 48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Mon, 5 Feb 2024 16:07:03 +0000
Subject: [PATCH] Fix compile issue (#386)
(Warning becomes an error due to gcc 14 changes)
---
plugins/keyboard/gkbd-configuration.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/keyboard/gkbd-configuration.c b/plugins/keyboard/gkbd-configuration.c
index ca394922..6d8e6829 100644
--- a/plugins/keyboard/gkbd-configuration.c
+++ b/plugins/keyboard/gkbd-configuration.c
@@ -340,11 +340,11 @@ gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration)
const char * const *
gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
{
- return configuration->priv->full_group_names;
+ return (const char * const *)configuration->priv->full_group_names;
}
const char * const *
gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
{
- return configuration->priv->short_group_names;
+ return (const char * const *)configuration->priv->short_group_names;
}

6
cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild
View file

@ -2,7 +2,7 @@
# Slackware build script for cinnamon-settings-daemon # Slackware build script for cinnamon-settings-daemon
# Copyright 2014-2023 Willy Sudiarto Raharjo <willysr@slackware-id.org> # Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackware-id.org>
# All rights reserved. # All rights reserved.
# #
# Redistribution and use of this script, with or without modification, is # Redistribution and use of this script, with or without modification, is
@ -24,7 +24,7 @@
PRGNAM=cinnamon-settings-daemon PRGNAM=cinnamon-settings-daemon
VERSION=${VERSION:-6.0.0} VERSION=${VERSION:-6.0.0}
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_csb} TAG=${TAG:-_csb}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -74,6 +74,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch
mkdir build mkdir build
cd build cd build
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \