diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-31 22:22:24 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:18 +0200 |
| commit | a396a796a98fc1bf4dd397f4ca26b7fb3f021dbe (patch) | |
| tree | 968615f0ac2dca69cc0f39ba58ad1e9aba9c6249 | |
| parent | 2a05c9855a20e4eb329c676f80092a2e6d4ec193 (diff) | |
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
| -rw-r--r-- | gnu/local.mk | 3 | ||||
| -rw-r--r-- | gnu/packages/aidc.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/zxing-cpp-1.2.0-gcc-14.patch | 13 |
3 files changed, 17 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 1377f96fc6..745521b069 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2502,7 +2502,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 bd55ce74ff..b8bdc07e45 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> +;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -154,6 +155,7 @@ integration of this capability into your own programs.") (url "https://github.com/zxing-cpp/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 . |