From 59fb60572b18e97b3c62d97214fbbe5446c868d4 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Thu, 12 Dec 2024 09:25:14 +0100 Subject: [PATCH] gnu: slim: Fix build with gcc-14. * gnu/packages/patches/slim-gcc-14.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/display-managers.scm (slim)[source]: Use it. Change-Id: Ie5bd02ad047f5b6d1c185a53c2c0b1456ef941a0 --- gnu/local.mk | 1 + gnu/packages/display-managers.scm | 4 +++- gnu/packages/patches/slim-gcc-14.patch | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/slim-gcc-14.patch diff --git a/gnu/local.mk b/gnu/local.mk index 395c588ca03..707876b3057 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2295,6 +2295,7 @@ dist_patch_DATA = \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/sipwitch-fix-build-with-exosip5.patch \ %D%/packages/patches/slim-config.patch \ + %D%/packages/patches/slim-gcc-14.patch \ %D%/packages/patches/slim-login.patch \ %D%/packages/patches/slim-display.patch \ %D%/packages/patches/slurm-23-salloc-fallback-shell.patch \ diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 726d277f292..2ec3cb70e1c 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021-2023 Efraim Flashner ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -712,7 +713,8 @@ in config.h of lightdm-tiny-greeter." (base32 "06r47ypf9lsy76jikrvihw8ka9j2wbrnn8g3sbxp819hcbqxg22z")) (patches (search-patches "slim-config.patch" "slim-login.patch" - "slim-display.patch")))) + "slim-display.patch" + "slim-gcc-14.patch")))) (build-system cmake-build-system) (inputs (list fontconfig freeglut diff --git a/gnu/packages/patches/slim-gcc-14.patch b/gnu/packages/patches/slim-gcc-14.patch new file mode 100644 index 00000000000..162b630adf9 --- /dev/null +++ b/gnu/packages/patches/slim-gcc-14.patch @@ -0,0 +1,12 @@ +Upstream status: Not presented upstream. + +--- slim-1.4.1/log.h.orig 2024-12-12 09:22:50.701696122 +0100 ++++ slim-1.4.1/log.h 2024-12-12 09:22:20.673689802 +0100 +@@ -14,6 +14,7 @@ + #define _LOG_H_ + + #include ++#include "PAM.h" + + using namespace std; +