1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 03:51:53 +02:00

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
This commit is contained in:
Janneke Nieuwenhuizen
2024-12-31 22:22:24 +01:00
committed by Andreas Enge
parent 2a05c9855a
commit a396a796a9
3 changed files with 17 additions and 1 deletions
+2 -1
View File
@@ -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-baseline-cpu-by-default.patch \
%D%/packages/patches/zig-0.14-use-system-paths.patch \ %D%/packages/patches/zig-0.14-use-system-paths.patch \
%D%/packages/patches/zsh-egrep-failing-test.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 = \ MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in %D%/packages/ld-wrapper.in
+2
View File
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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") (url "https://github.com/zxing-cpp/zxing-cpp")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "zxing-cpp-1.2.0-gcc-14.patch"))
(sha256 (sha256
(base32 (base32
"1gjj9c7h634rrmmgzbc7cxjqsxdq0paj6113k02ncjm1s9abk7ik")))) "1gjj9c7h634rrmmgzbc7cxjqsxdq0paj6113k02ncjm1s9abk7ik"))))
@@ -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 .