5 files changed, 64 insertions, 27 deletions
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 8a75a41c9d78..bf417574abd2 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,5 +1,5 @@
-DIST zxing-cpp-2.1.0.tar.gz 866787 BLAKE2B 2589862e790bac85cee92818381b4ec3f9eeb5ac1dc2a78babf372ad7672bfe1a43ac7cfe4cc228eabed8a6c013f835c7e3e1948137d61edf1056906a149df80 SHA512 a00778c1fb7bb664176f7035aa96db4bab3e7ca28b5be2862182cb591d18edd4c3dfcbd34b4af08e0797bb4af893299d523f98aa84d266b68e4c766410e2e26d
+AUX zxing-cpp-2.2.1-cmake.patch 842 BLAKE2B edcda3cda092597c54cdb1873ccd5b5187817f08d58a78a18415943756e7f432b54bf012e009626ceb7873d459b51970d9bd2c75a08424ab2ca17e169aa973cd SHA512 fb37b4ee81538f4ea524bfe274440c43c06365cbe8e6db2284ef4bb1f005b6ff61cc357d19b049c7ebba6e9afd363585932ae462680648aab6c1ed96d6d0e6b7
+AUX zxing-cpp-2.2.1-cxx20.patch 1033 BLAKE2B 47866787c62a18fa7424a70775ccf184432aa3cf49f8cd3db83b6974eadd498fa6b2831c6aa4d3f12134f9e8dd84010faee45943dfdccff8e88535034b9aab6a SHA512 90d2f6e41607f016e95e7e7f66251507c909e58dc3f589115244253276d8dd7607989c60f80ea7441f0b91e47fca383ba851922d96300a322feb3163fbac2e4c
 DIST zxing-cpp-2.2.1.tar.gz 891055 BLAKE2B c6a3343cd0389d930e83dd9db4d6aeca6d4dda715c22c0b10dd76460e9d55bdd8e994c2ac24ba5d5a4f5e2069fcb035b2e4651a380b6b39bcce4b90d0c754df8 SHA512 f1de8df783061a152a18cd9102ac0c579c40c76ab4a5ba9f30bcb8ddb532f3fac08736840a631adbf7c30a7fa00ce8d65625c8cd695288620601708e8f256a53
-EBUILD zxing-cpp-2.1.0.ebuild 676 BLAKE2B ccb737a5d37d63a7e22f4c1b0f5b802c40c869bbe177a885ab309de10b7a9cfb4de3023a603263d2328fbde221ffb31d1270348dcc970b0dd03eab882ac267f0 SHA512 6534891dc23c79e264119861452791ebe1af39e7e7722fd86e95bb4c3847f3a7260871123fb0bc50de35f9e5c5cc79af169a09f9565fdfb75357fa4e24f00fdb
-EBUILD zxing-cpp-2.2.1.ebuild 675 BLAKE2B 59963c6847396675c94deddd29e84366bca5bd44ad95d62512d7fdcbabd51c1b294ea9f1e1aae37082c864896729d74e072d564b091754bb06898dfcac63ec68 SHA512 9c7ce6820eaee9c4573449b97c37b83cb620c0965d3f8d17bce5139231c256eb9e357b53b3298ac7a354f615102591186d87bb59df22c04fcf2792b05bf4977d
+EBUILD zxing-cpp-2.2.1.ebuild 765 BLAKE2B 6d4754e55c03051d507b124d36a52adfbce81d7aa0d1c477ad4a5ed0a5694d0b43a4fcc6c932bd6086a3080a4cbf1114b4743996f48925861ea688934b919fcf SHA512 31218574b93f51eb72d471b312a1b321d632a0d2de1d38094e314d1d4e65f0ce8ba92cbdd56e0a5334a209242091c3a790f29b10b233f7d296e117325f3676e2
 MISC metadata.xml 334 BLAKE2B a835ff2824bdf38aa06708b2f5e61bb22998a63855b7095e95474320717ed3e8f0ec753a324fefc5df0c83564a8f52c9660ac07bd1d37e33e95572a3fb2cac66 SHA512 bf2898872ed6586bb33a62f9f76be56f58c5e71b1b1a1414d5fc4e3629f1b0428b20bd864bc8c436b95b4b9e190d8103aa6ea74bc082a2d1cb65051f69bf812d
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
new file mode 100644
index 000000000000..58bffda307a6
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch
@@ -0,0 +1,27 @@
+From 77475338af4920fe2568d69b2318a0d5e9be77ce Mon Sep 17 00:00:00 2001
+From: axxel <awagger@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
new file mode 100644
index 000000000000..9d89c9a8b38f
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch
@@ -0,0 +1,29 @@
+From d98739ceaac1c477879b9c4fba89ea76dba2d539 Mon Sep 17 00:00:00 2001
+From: axxel <awagger@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.1.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-2.1.0.ebuild
deleted file mode 100644
index 838aec5f74e3..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-2.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 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/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/3"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-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
-}
diff --git a/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild
index 1fac2dd0fe8e..e1dcb9341fc3 100644
--- a/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild
@@ -14,6 +14,11 @@ 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