janneke pushed a commit to branch core-packages-team
in repository guix.
commit 4f50afeadd149102ef1f7426fdef4605f9913496
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 b3d25a50a7..ea125b705a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2475,7 +2475,8 @@ dist_patch_DATA =
\
%D%/packages/patches/zig-0.14-use-baseline-cpu-by-default.patch \
%D%/packages/patches/zig-0.14-use-system-paths.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 2ba6e88412..5359f23ae5 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Guillaume Le Vaillant <[email protected]>
;;; Copyright © 2020 Leo Famulari <[email protected]>
;;; Copyright © 2024 Nicolas Graves <[email protected]>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -86,6 +87,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 .
