summaryrefslogtreecommitdiff
path: root/media-libs/zxing-cpp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-07-17 19:04:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-07-17 19:04:28 +0100
commit514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /media-libs/zxing-cpp
parent4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)
gentoo resync : 17.07.2021
Diffstat (limited to 'media-libs/zxing-cpp')
-rw-r--r--media-libs/zxing-cpp/Manifest5
-rw-r--r--media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch22
-rw-r--r--media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild27
-rw-r--r--media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild2
4 files changed, 2 insertions, 54 deletions
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index a74a61d2edcc..1a8b80285788 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,6 +1,3 @@
-AUX zxing-cpp-1.1.1-gcc11.patch 612 BLAKE2B 661ce79b9d44667225b33480c2dcabeaa771acb35a8b908c76ca78571f360576c36889c1629a3eb22af316fcedbaece3a68713a39f3d6a8ec17f34d09ec19b0f SHA512 647f862468764b902fe7204c304e1e2d838efcfa226468027662942a7a6286dfdf5884bfae6d4f14e325d13ba40a20671a3ba72ec46db4417b451654c2806a09
-DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7
DIST zxing-cpp-1.2.0.tar.gz 97942494 BLAKE2B dc220783fe8a9c1ea321ad5b7835553985a06318f909af1574131b55f3a4bb71f8cf90f56925dfe8338df5cc24f91d93d8a7626cd8d2c01473b1ccce09bad8b0 SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487
-EBUILD zxing-cpp-1.1.1.ebuild 625 BLAKE2B 460b22d28d1458b4affdb2be9e4b5cd71b849eabecbd05fbb0c486117bc5836fa73e05ee2895b701c2775155f9d1746085f522ced874f1f9c5a55a3fe650bc6a SHA512 73532b0a7fe4f8dc31b24d45cf173de9284c92344dae15981fdb9c0575acdb8f7da42cd640323a56f38ed3a27dd9012118d88b3bfa2a08782a35d3ab0044bd4a
-EBUILD zxing-cpp-1.2.0.ebuild 656 BLAKE2B b8b019f02528ab389c6c1b0fbc55675f7ed40f6fda5ce4c22907a7fc618e58c7671ca7f4a6fac5b7448b05137c8038e9b9ca377a90bb772599c91f65dc37d000 SHA512 5607c41a5be2345e134551c1b0f391a157f56c604ac8b67d8a05e79695b0e938fff0ec872a78aef480d62fb8a41ef82062ba1b5a3139fa669c9f52542bbbc13c
+EBUILD zxing-cpp-1.2.0.ebuild 655 BLAKE2B c7ab1c495e4acedcac7d7fcdff92bb9e0d6e763c5d0b317d694223f7bec1ba93cf8efbd5bf8ae8899c8b729c071db05c61fe75518d5697245ca8e8ebb8ec79c1 SHA512 c8367a8e389afc4775cd4204968e3f4a3f6833c9eecbadee443d7cacfdaa096bf7bf7155e98ada4c46075cf68b829499642c674a026a8630e51317911be21998
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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
deleted file mode 100644
index 13adad906c0d..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 427e814ebcfd2e55e1c18531b7e4aa9d6a1ca6fc Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Tue, 9 Feb 2021 09:28:23 +0100
-Subject: [PATCH] Fix build with GCC 11
-
-Starting with GCC 11, the 'limits' header is not included transitively anymore.
----
- core/src/Pattern.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/src/Pattern.h b/core/src/Pattern.h
-index 4bbe6d26..c4a3f7c5 100644
---- a/core/src/Pattern.h
-+++ b/core/src/Pattern.h
-@@ -22,6 +22,7 @@
- #include <cmath>
- #include <cstddef>
- #include <cstdint>
-+#include <limits>
- #include <numeric>
- #include <vector>
-
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
deleted file mode 100644
index 3b38eb67cad9..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
-HOMEPAGE="https://github.com/nu-book/zxing-cpp"
-SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc11.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_EXAMPLES=OFF # nothing is installed
- -DBUILD_BLACKBOX_TESTS=$(usex test)
- )
- cmake_src_configure
-}
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
index 05094ad0df2d..93fb973a3c16 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
src_configure() {