Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
Date: Sun, 02 May 2021 07:29:11
Message-Id: 1619940535.2a78e7f1bfd34a0f1ac7710725077999c06805e0.asturm@gentoo
1 commit: 2a78e7f1bfd34a0f1ac7710725077999c06805e0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 2 07:28:41 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun May 2 07:28:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a78e7f1
7
8 media-libs/zxing-cpp: Fix build with GCC-11
9
10 Closes: https://bugs.gentoo.org/787560
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch | 22 ++++++++++++++++++++++
15 media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild | 4 +++-
16 2 files changed, 25 insertions(+), 1 deletion(-)
17
18 diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch
19 new file mode 100644
20 index 00000000000..13adad906c0
21 --- /dev/null
22 +++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch
23 @@ -0,0 +1,22 @@
24 +From 427e814ebcfd2e55e1c18531b7e4aa9d6a1ca6fc Mon Sep 17 00:00:00 2001
25 +From: Christophe Giboudeaux <christophe@××××.fr>
26 +Date: Tue, 9 Feb 2021 09:28:23 +0100
27 +Subject: [PATCH] Fix build with GCC 11
28 +
29 +Starting with GCC 11, the 'limits' header is not included transitively anymore.
30 +---
31 + core/src/Pattern.h | 1 +
32 + 1 file changed, 1 insertion(+)
33 +
34 +diff --git a/core/src/Pattern.h b/core/src/Pattern.h
35 +index 4bbe6d26..c4a3f7c5 100644
36 +--- a/core/src/Pattern.h
37 ++++ b/core/src/Pattern.h
38 +@@ -22,6 +22,7 @@
39 + #include <cmath>
40 + #include <cstddef>
41 + #include <cstdint>
42 ++#include <limits>
43 + #include <numeric>
44 + #include <vector>
45 +
46
47 diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
48 index a43d3881a65..3b38eb67cad 100644
49 --- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
50 +++ b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
51 @@ -1,4 +1,4 @@
52 -# Copyright 1999-2020 Gentoo Authors
53 +# Copyright 1999-2021 Gentoo Authors
54 # Distributed under the terms of the GNU General Public License v2
55
56 EAPI=7
57 @@ -16,6 +16,8 @@ IUSE="test"
58
59 RESTRICT="!test? ( test )"
60
61 +PATCHES=( "${FILESDIR}/${P}-gcc11.patch" )
62 +
63 src_configure() {
64 local mycmakeargs=(
65 -DBUILD_EXAMPLES=OFF # nothing is installed