commit: ae92b31796b80cc3e2b8e10f12e3d7118f5716ee
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 5 12:31:41 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 5 17:51:49 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae92b317
media-libs/zxing-cpp: drop 2.2.1, 2.2.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/zxing-cpp/Manifest | 2 -
.../zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch | 27 ------------
.../zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch | 29 -------------
media-libs/zxing-cpp/zxing-cpp-2.2.1-r1.ebuild | 50 ----------------------
media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild | 29 -------------
5 files changed, 137 deletions(-)
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index ac9ae2e59381..88f09c12f83d 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,4 +1,2 @@
-DIST zxing-cpp-2.2.1-test-samples.tar.gz 97082308 BLAKE2B
bcea839f766e5696bcaab58d1483e43ef3d4b504979ea4db3114236853db92c64f7079ed91977a158cda745d8a08c0c249bf1b10382daf5a9816bf4280b95092
SHA512
4de268d36a337d233a60eed477e8421294d42f357534f21aba9574ec929809a4666fe7a55e3b3ac1518460aedfbb0d615659cc0a170e3685790745066339b064
-DIST zxing-cpp-2.2.1.tar.gz 891055 BLAKE2B
c6a3343cd0389d930e83dd9db4d6aeca6d4dda715c22c0b10dd76460e9d55bdd8e994c2ac24ba5d5a4f5e2069fcb035b2e4651a380b6b39bcce4b90d0c754df8
SHA512
f1de8df783061a152a18cd9102ac0c579c40c76ab4a5ba9f30bcb8ddb532f3fac08736840a631adbf7c30a7fa00ce8d65625c8cd695288620601708e8f256a53
DIST zxing-cpp-2.3.0-test-samples.tar.gz 97053504 BLAKE2B
f8b3ca418885731bbd0c551b7c061e9ff8d7ac20cb4464abb0c2496f1235fed78826420f139666e73af53612ab87dc551f228e1e05c934b4a08a22c3da069def
SHA512
6c2bbad7a6229075f9cb0ccaa4f2bcddbf586baf15a2fb71a10fbddc6e591a33d08c737149c0688dd64c5b0fff1328bbd4975eba0e6ffd56b12d61f47469ae4a
DIST zxing-cpp-2.3.0.tar.gz 1008541 BLAKE2B
a0c94e1c276759e032695918f1d177e32b3ac4d1c60085872210ef9c97f2cc0c95a54972d18ec971bc6733ea9531be15d5155011ff8893e39706acd8d5c9a7bd
SHA512
be1c60a6b433c18f8dab56619553023370bfd3eddf49b0e16548466e1ebc2f1f37b48e0b36c2e74296a7274c4f0117d7052f1ffd7d1223d23e493451a11b4a80
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch
b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch
deleted file mode 100644
index 58bffda307a6..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 77475338af4920fe2568d69b2318a0d5e9be77ce Mon Sep 17 00:00:00 2001
-From: axxel <awag...@gmail.com>
-Date: Fri, 15 Mar 2024 22:23:17 +0100
-Subject: [PATCH] cmake: if (NOT CMAKE_CXX...) should have been if (NOT DEFINED
- CMAKE_CXX...)
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 678fa6b62b..d7a1d81c85 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,10 +61,10 @@ if(NOT BUILD_DEPENDENCIES IN_LIST BUILD_DEPENDENCIES_LIST)
- message(FATAL_ERROR "BUILD_DEPENDENCIES must be one of
${BUILD_DEPENDENCIES_LIST}")
- endif()
-
--if (NOT CMAKE_CXX_STANDARD)
-+if (NOT DEFINED CMAKE_CXX_STANDARD)
- set (CMAKE_CXX_STANDARD 17)
- endif()
--if (NOT CMAKE_CXX_EXTENSIONS)
-+if (NOT DEFINED CMAKE_CXX_EXTENSIONS)
- set (CMAKE_CXX_EXTENSIONS OFF)
- endif()
-
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch
b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch
deleted file mode 100644
index 9d89c9a8b38f..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98739ceaac1c477879b9c4fba89ea76dba2d539 Mon Sep 17 00:00:00 2001
-From: axxel <awag...@gmail.com>
-Date: Sun, 22 Sep 2024 22:39:11 +0200
-Subject: [PATCH] cmake: switch to c++-20 by default for the core library
-
-I finally accept the incurred performance penalty from the position
-independent DataMatrix detection by default.
-
-This is finally fixing #386. It also (sufficiently) fixes #822 and thereby
-supersedes #836.
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b602712d79..fee4c68cdc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,9 @@ if(NOT ZXING_DEPENDENCIES IN_LIST ZXING_DEPENDENCIES_LIST)
- endif()
-
- if (NOT DEFINED CMAKE_CXX_STANDARD)
-- set (CMAKE_CXX_STANDARD 17)
-+ set (CMAKE_CXX_STANDARD 20)
-+ # Allow the fallback to earlier versions if the compiler does not support
it.
-+ set(CMAKE_CXX_STANDARD_REQUIRED OFF)
- endif()
- if (NOT DEFINED CMAKE_CXX_EXTENSIONS)
- set (CMAKE_CXX_EXTENSIONS OFF)
diff --git a/media-libs/zxing-cpp/zxing-cpp-2.2.1-r1.ebuild
b/media-libs/zxing-cpp/zxing-cpp-2.2.1-r1.ebuild
deleted file mode 100644
index ec4caae53536..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
-HOMEPAGE="https://github.com/zxing-cpp/zxing-cpp";
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? (
https://github.com/zxing-cpp/zxing-cpp/releases/download/v${PV}/test_samples.tar.gz
-> ${P}-test-samples.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-cpp/gtest
- dev-libs/libfmt
- dev-libs/stb
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-cxx20.patch" # bug 939897
-)
-
-src_prepare() {
- if use test ; then
- ln -s "${WORKDIR}"/test/samples "${S}"/test/samples || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_EXAMPLES=OFF # nothing is installed
- -DBUILD_BLACKBOX_TESTS=$(usex test)
- -DBUILD_UNIT_TESTS=$(usex test)
- -DBUILD_DEPENDENCIES=LOCAL # force find_package as REQUIRED
- )
- cmake_src_configure
-}
diff --git a/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild
b/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild
deleted file mode 100644
index e1dcb9341fc3..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
-HOMEPAGE="https://github.com/zxing-cpp/zxing-cpp";
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-cxx20.patch" # bug 939897
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_EXAMPLES=OFF # nothing is installed
- -DBUILD_BLACKBOX_TESTS=OFF # FIXME: FetchContent.cmake module
usage
- -DBUILD_UNIT_TESTS=OFF # for both tests options. no thanks. bug
#793173
- )
- cmake_src_configure
-}
