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: Tue, 13 Jul 2021 05:55:30
Message-Id: 1626155695.eb1e2e61d52731cbf4ee60f2b85ce053663cd0d8.asturm@gentoo
1 commit: eb1e2e61d52731cbf4ee60f2b85ce053663cd0d8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 13 05:43:36 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 13 05:54:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1e2e61
7
8 media-libs/zxing-cpp: Drop 1.1.1
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-libs/zxing-cpp/Manifest | 1 -
14 .../zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch | 22 ------------------
15 media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild | 27 ----------------------
16 3 files changed, 50 deletions(-)
17
18 diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
19 index 833baebc4c5..376361ba89e 100644
20 --- a/media-libs/zxing-cpp/Manifest
21 +++ b/media-libs/zxing-cpp/Manifest
22 @@ -1,2 +1 @@
23 -DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7
24 DIST zxing-cpp-1.2.0.tar.gz 97942494 BLAKE2B dc220783fe8a9c1ea321ad5b7835553985a06318f909af1574131b55f3a4bb71f8cf90f56925dfe8338df5cc24f91d93d8a7626cd8d2c01473b1ccce09bad8b0 SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487
25
26 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
27 deleted file mode 100644
28 index 13adad906c0..00000000000
29 --- a/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch
30 +++ /dev/null
31 @@ -1,22 +0,0 @@
32 -From 427e814ebcfd2e55e1c18531b7e4aa9d6a1ca6fc Mon Sep 17 00:00:00 2001
33 -From: Christophe Giboudeaux <christophe@××××.fr>
34 -Date: Tue, 9 Feb 2021 09:28:23 +0100
35 -Subject: [PATCH] Fix build with GCC 11
36 -
37 -Starting with GCC 11, the 'limits' header is not included transitively anymore.
38 ----
39 - core/src/Pattern.h | 1 +
40 - 1 file changed, 1 insertion(+)
41 -
42 -diff --git a/core/src/Pattern.h b/core/src/Pattern.h
43 -index 4bbe6d26..c4a3f7c5 100644
44 ---- a/core/src/Pattern.h
45 -+++ b/core/src/Pattern.h
46 -@@ -22,6 +22,7 @@
47 - #include <cmath>
48 - #include <cstddef>
49 - #include <cstdint>
50 -+#include <limits>
51 - #include <numeric>
52 - #include <vector>
53 -
54
55 diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
56 deleted file mode 100644
57 index 3b38eb67cad..00000000000
58 --- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
59 +++ /dev/null
60 @@ -1,27 +0,0 @@
61 -# Copyright 1999-2021 Gentoo Authors
62 -# Distributed under the terms of the GNU General Public License v2
63 -
64 -EAPI=7
65 -
66 -inherit cmake
67 -
68 -DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
69 -HOMEPAGE="https://github.com/nu-book/zxing-cpp"
70 -SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
71 -
72 -LICENSE="Apache-2.0"
73 -SLOT="0"
74 -KEYWORDS="amd64 arm64 ~ppc64 x86"
75 -IUSE="test"
76 -
77 -RESTRICT="!test? ( test )"
78 -
79 -PATCHES=( "${FILESDIR}/${P}-gcc11.patch" )
80 -
81 -src_configure() {
82 - local mycmakeargs=(
83 - -DBUILD_EXAMPLES=OFF # nothing is installed
84 - -DBUILD_BLACKBOX_TESTS=$(usex test)
85 - )
86 - cmake_src_configure
87 -}