janneke pushed a commit to branch core-packages-team
in repository guix.
commit ac6872bcf86d4943eb2c393a2d7e3a7953bf2d08
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Mon Dec 9 10:16:50 2024 +0100
gnu: hplip: Update to 3.24.4 and fix build with gcc-14.
* gnu/packages/cups.scm (hplip): Update to 3.24.4.
[arguments]: Add "set-gcc-14-cflags" phase to relax gcc-14's strictness.
Change-Id: Ie753c9ebb51f08c4683e9a9762e9c269eceb5e22
---
gnu/packages/cups.scm | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index e8ca5efc86..93fa3e698a 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Marius Bakke <[email protected]>
;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <[email protected]>
;;; Copyright © 2023 Zheng Junjie <[email protected]>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -529,14 +530,14 @@ should only be used as part of the Guix cups-pk-helper
service.")
(define-public hplip
(package
(name "hplip")
- (version "3.23.12")
+ (version "3.24.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
- "1vb9irqsm3d4c2qdr4h6ia940x65bb99h4x31mgxn7dkvv42lv57"))
+ "1yzil1fn9ib2hxmqh9in0apmmznvln0xahlxvyny59ck321l6xjx"))
(patches (search-patches "hplip-usb-timeout.patch"))
(modules '((guix build utils)))
(snippet
@@ -599,6 +600,18 @@ should only be used as part of the Guix cups-pk-helper
service.")
"--disable-qt4")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'set-gcc-14-cflags
+ ;; We set CFLAGS here because adding setting it in
+ ;; #:configure-flags or #:make-flags does not work.
+ (lambda _
+ (substitute* "Makefile.in"
+ (("CFLAGS = @CFLAGS@" all)
+ (string-append all
+ " -Wno-error=attributes"
+ " -Wno-error=implicit-function-declaration"
+ " -Wno-error=implicit-int"
+ " -Wno-error=incompatible-pointer-types"
+ " -Wno-error=return-mismatch")))))
(add-after 'unpack 'fix-hard-coded-file-names
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out #$output)
