3 files changed, 40 insertions(+), 2 deletions(-)

M gnu/local.mk
A gnu/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch
M gnu/packages/wm.scm

@@ 1593,6 1593,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/hurd-rumpdisk-no-hd.patch		\
   %D%/packages/patches/hurd-startup.patch			\
   %D%/packages/patches/hwloc-1-test-btrfs.patch			\
+  %D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch	\
   %D%/packages/patches/i7z-gcc-10.patch				\
   %D%/packages/patches/icecat-adjust-mozilla-desktop.patch      \
   %D%/packages/patches/icecat-makeicecat.patch			\

@@ 0,0 1,31 @@
+From ec8fe0e7f7d78bf445602ed517efd5c324bb32f7 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 15 May 2022 10:36:29 +0100
+Subject: [PATCH] fix build on gcc-10 (-fno-common)
+
+gcc-10 changed the default from -fcommon to fno-common:
+  https://gcc.gnu.org/PR85678
+
+As a result build fails as:
+
+    ld: i3lock-unlock_indicator.o:(.bss+0xc): multiple definition of
+      `input_position'; i3lock-i3lock.o:(.bss+0x3c): first defined here
+
+The change turned one of definitions into declaration.
+---
+ unlock_indicator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unlock_indicator.c b/unlock_indicator.c
+index 9ef0b48..34e151b 100644
+--- a/unlock_indicator.c
++++ b/unlock_indicator.c
+@@ -36,7 +36,7 @@ extern bool debug_mode;
+ 
+ /* The current position in the input buffer. Useful to determine if any
+  * characters of the password have already been entered or not. */
+-int input_position;
++extern int input_position;
+ 
+ /* The lock window. */
+ extern xcb_window_t win;

@@ 83,6 83,7 @@
 ;;; Copyright © 2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2025 Hugo Buddelmeijer <hugo@buddelmeijer.nl>
+;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 719,10 720,15 @@ Despite the name it should work with any X11 window manager.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1bd5nrlga5g1sz1f64gnc3dqy8yfrr4q1ss59krymbpxa1hhf55c"))))
+                "1bd5nrlga5g1sz1f64gnc3dqy8yfrr4q1ss59krymbpxa1hhf55c"))
+              (patches
+               ;; Pull patch pending upstream inclusion for "-fno-common"
+               ;; toolchain support:
+               ;; <https://github.com/karulont/i3lock-blur/pull/22>
+               (search-patches "i3lock-blur-fix-build-on-gcc-10.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list pkg-config automake autoconf))
+     (list pkg-config automake-1.16.5 autoconf))
     (inputs
      (list cairo
            mesa