janneke pushed a commit to branch core-packages-team-old in repository guix.
commit 95b9548d195915d6225b5f45de152624eef014ff Author: Janneke Nieuwenhuizen <[email protected]> AuthorDate: Tue Dec 31 22:22:24 2024 +0100 gnu: zxing-cpp-1-2.0: Fix build with gcc-14. * gnu/packages/patches/zxing-cpp-1.2.0-gcc-14.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/aidc.scm (zxing-cpp-1.2)[source]: Use it. Change-Id: I6a007ac9728d8ed16ddeef425cc544e7f0d861c1 --- gnu/local.mk | 3 ++- gnu/packages/aidc.scm | 2 ++ gnu/packages/patches/zxing-cpp-1.2.0-gcc-14.patch | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index 2e70993008..fd39029c7d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2458,7 +2458,8 @@ dist_patch_DATA = \ %D%/packages/patches/zig-0.13-build-respect-PKG_CONFIG-env-var.patch \ %D%/packages/patches/zig-0.13-fix-runpath.patch \ %D%/packages/patches/zsh-egrep-failing-test.patch \ - %D%/packages/patches/zuo-bin-sh.patch + %D%/packages/patches/zuo-bin-sh.patch \ + %D%/packages/patches/zxing-cpp-1.2.0-gcc-14.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index bc9c47a480..db0330adf1 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019, 2022 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2019 Guillaume Le Vaillant <[email protected]> ;;; Copyright © 2020 Leo Famulari <[email protected]> +;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ (url "https://github.com/nu-book/zxing-cpp";) (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "zxing-cpp-1.2.0-gcc-14.patch")) (sha256 (base32 "1gjj9c7h634rrmmgzbc7cxjqsxdq0paj6113k02ncjm1s9abk7ik")))) diff --git a/gnu/packages/patches/zxing-cpp-1.2.0-gcc-14.patch b/gnu/packages/patches/zxing-cpp-1.2.0-gcc-14.patch new file mode 100644 index 0000000000..466969ee00 --- /dev/null +++ b/gnu/packages/patches/zxing-cpp-1.2.0-gcc-14.patch @@ -0,0 +1,13 @@ +Upstream-status: Not presented upstream. + +--- source/core/src/textcodec/JPTextEncoder.cpp.orig 2024-12-31 22:18:42.612859809 +0100 ++++ source/core/src/textcodec/JPTextEncoder.cpp 2024-12-31 22:19:21.637235909 +0100 +@@ -37,6 +37,8 @@ + + #include "JPTextEncoder.h" + ++#include <cstdint> ++ + /* + * This data is derived from Unicode 1.1, + * JIS X 0208 (1990) to Unicode mapping table version 0.9 .
