guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

53/71: gnu: slim: Fix build with gcc-14.


From: guix-commits
Subject: 53/71: gnu: slim: Fix build with gcc-14.
Date: Sun, 15 Dec 2024 03:42:59 -0500 (EST)

janneke pushed a commit to branch core-packages-team
in repository guix.

commit 5ea981e6b160f8dc677e073df31035cbb90090c1
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Dec 12 09:25:14 2024 +0100

    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(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 5bbeaf624a..55cd6f42c6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2195,6 +2195,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 5152eb6479..e77104333c 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -545,7 +546,8 @@ GTK+, lets you select a desktop session and log in to it.")
         (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 0000000000..162b630adf
--- /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 <fstream>
++#include "PAM.h"
+ 
+ using namespace std;
+ 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]