From 8f33d1f091f6077276e0768dc4f88752f3ac61e1 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Tue, 11 Jun 2024 23:38:48 +0700 Subject: [PATCH] cinnamon-settings-daemon: Fix build with GCC 14. Signed-off-by: Willy Sudiarto Raharjo --- cinnamon-session/cinnamon-session.SlackBuild | 4 +-- ...3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch | 28 +++++++++++++++++++ .../cinnamon-settings-daemon.SlackBuild | 6 ++-- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 cinnamon-settings-daemon/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch diff --git a/cinnamon-session/cinnamon-session.SlackBuild b/cinnamon-session/cinnamon-session.SlackBuild index d5bcb80..1771c08 100644 --- a/cinnamon-session/cinnamon-session.SlackBuild +++ b/cinnamon-session/cinnamon-session.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cinnamon-session -# Copyright 2014-2023 Willy Sudiarto Raharjo +# Copyright 2014-2024 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cinnamon-session -VERSION=${VERSION:-6.0.1} +VERSION=${VERSION:-6.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_csb} diff --git a/cinnamon-settings-daemon/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch b/cinnamon-settings-daemon/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch new file mode 100644 index 0000000..8433e93 --- /dev/null +++ b/cinnamon-settings-daemon/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch @@ -0,0 +1,28 @@ +From 48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc Mon Sep 17 00:00:00 2001 +From: Leigh Scott +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; + } diff --git a/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild b/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild index c807568..dee28db 100644 --- a/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild +++ b/cinnamon-settings-daemon/cinnamon-settings-daemon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cinnamon-settings-daemon -# Copyright 2014-2023 Willy Sudiarto Raharjo +# Copyright 2014-2024 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=cinnamon-settings-daemon VERSION=${VERSION:-6.0.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_csb} if [ -z "$ARCH" ]; then @@ -74,6 +74,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/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \