[gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2020-04-09 21:37 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     656577c775a39dc67e2514ada4d4b4f64683463d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 17:20:23 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 21:36:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656577c7

media-libs/zxing-cpp: Fix actual version as well

Bug: https://bugs.gentoo.org/716818
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../zxing-cpp/files/zxing-cpp-1.0.8-version.patch  | 22 ++++++++++++++++++++++
 media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild     |  5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch
new file mode 100644
index 00000000000..12f379e7c7e
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.0.8-version.patch
@@ -0,0 +1,22 @@
+From 66cc26b25633cb7f1e20f2bf7711960c321e3a7b Mon Sep 17 00:00:00 2001
+From: Huy Cuong Nguyen <huycn@users.noreply.github.com>
+Date: Thu, 19 Mar 2020 13:58:48 -0400
+Subject: [PATCH] Pump version to 1.0.8
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d851580..c996e4a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.1.3)
+ 
+ set (ZXING_VERSION_MAJOR 1)
+ set (ZXING_VERSION_MINOR 0)
+-set (ZXING_VERSION_PATCH 7)
++set (ZXING_VERSION_PATCH 8)
+ 
+ project (ZXingCpp VERSION ${ZXING_VERSION_MAJOR}.${ZXING_VERSION_MINOR}.${ZXING_VERSION_PATCH})
+ 

diff --git a/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
index 4d6ad244fdd..fb0c6d9f428 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.0.8-r1.ebuild
@@ -14,4 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
-PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" ) # bug 716818
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig.patch" # bug 716818
+	"${FILESDIR}/${P}-version.patch" # bug 716818
+)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2020-08-18 17:49 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-08-18 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     94410c426fc62c3c827f5845cb02069824424b3e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 15:35:54 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 17:48:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94410c42

media-libs/zxing-cpp: 1.1.0 version bump

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/zxing-cpp/Manifest                        |  1 +
 .../files/zxing-cpp-1.1.0-pkgconfig-libs.patch       | 20 ++++++++++++++++++++
 .../files/zxing-cpp-1.1.0-pkgconfig-version.patch    | 10 ++++++++++
 media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild          | 20 ++++++++++++++++++++
 4 files changed, 51 insertions(+)

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 0389f9931ec..f4278427ebc 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1 +1,2 @@
 DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6
+DIST zxing-cpp-1.1.0.tar.gz 128856890 BLAKE2B 4ef93efc9e5d81c222b008b2dc7991cdb2dd38c297970b7bcaa7095323581445c32890bd20c9a3ad02013b41d0de5aaab6038b8aff892236c327bb27f922dc84 SHA512 8ae6d0c2bd21de0af99c1baa470afcdd8b0375eb1d4166bb20ad67632c39ef63e1ea07b8a691cf0bc076c87d73a8d8b0ca05007c65a09bc79697aa294dc1f44f

diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
new file mode 100644
index 00000000000..48d6e814ad0
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
@@ -0,0 +1,20 @@
+From 877b6db1613ddae58e570801920f089c0f64b97f Mon Sep 17 00:00:00 2001
+From: Axel Waggershauser <awagger@gmail.com>
+Date: Mon, 3 Aug 2020 08:48:58 +0200
+Subject: [PATCH] Fix regression in pkgconfig file generation
+
+---
+ zxing.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zxing.pc.in b/zxing.pc.in
+index b62fd15..3f429f4 100644
+--- a/zxing.pc.in
++++ b/zxing.pc.in
+@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ Name: ZXing
+ Description: ZXing library set
+ Version: @VERSION@
+-Libs: -L${libdir} -l@TARGET_ZXING@ 
++Libs: -L${libdir} -lZXing
+ Cflags: -I${includedir} -I${includedir}/ZXing

diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
new file mode 100644
index 00000000000..c448d00a309
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
@@ -0,0 +1,10 @@
+--- a/zxing.pc.in	2020-04-09 11:43:22.494219440 -0400
++++ b/zxing.pc.in	2020-04-09 11:49:03.884867034 -0400
+@@ -5,6 +5,6 @@
+ 
+ Name: ZXing
+ Description: ZXing library set
+-Version: @VERSION@
++Version: @PROJECT_VERSION@
+ Libs: -L${libdir} -lZXing
+ Cflags: -I${includedir} -I${includedir}/ZXing

diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
new file mode 100644
index 00000000000..3441bcd6009
--- /dev/null
+++ b/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 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 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig-libs.patch" # git master
+	"${FILESDIR}/${P}-pkgconfig-version.patch" # bug 716818
+)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2020-09-13 18:25 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-09-13 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     7efb11ad6134eaa9bba39b44250faafb7e8d7972
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 18:12:30 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 18:25:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efb11ad

media-libs/zxing-cpp: Drop 1.1.0

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/zxing-cpp/Manifest                        |  1 -
 .../files/zxing-cpp-1.1.0-pkgconfig-libs.patch       | 20 --------------------
 .../files/zxing-cpp-1.1.0-pkgconfig-version.patch    | 10 ----------
 media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild          | 20 --------------------
 4 files changed, 51 deletions(-)

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 226e452b517..fe68d42a2f9 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,3 +1,2 @@
 DIST zxing-cpp-1.0.8.tar.gz 128506816 BLAKE2B 5f9e70c5cd123c27ee779a955cc112449094069c5be3defac57a906ea6a301e8f04886c7cb51b79007456e517db06f9f61c39228f8d8bb6a520602cac70aa7a4 SHA512 0749b3bd4d810ef024f2d8045ecf3024bba6d1816be3f5baeb3325724ac5a7359bec72b4070f8e34fbc1bc5ba2636e488b17cc8b35578b0703352d448c9d22f6
-DIST zxing-cpp-1.1.0.tar.gz 128856890 BLAKE2B 4ef93efc9e5d81c222b008b2dc7991cdb2dd38c297970b7bcaa7095323581445c32890bd20c9a3ad02013b41d0de5aaab6038b8aff892236c327bb27f922dc84 SHA512 8ae6d0c2bd21de0af99c1baa470afcdd8b0375eb1d4166bb20ad67632c39ef63e1ea07b8a691cf0bc076c87d73a8d8b0ca05007c65a09bc79697aa294dc1f44f
 DIST zxing-cpp-1.1.1.tar.gz 128925736 BLAKE2B d2d6b4b13c26ee1bf8c9f1188809207f895d9ab4bde83e7e06d85d7105c56021bb9f82f34b9f11e1c8ff5b82825de127d1bc873745fa6ef603a8d206f3eaedec SHA512 c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7

diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
deleted file mode 100644
index 48d6e814ad0..00000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-libs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 877b6db1613ddae58e570801920f089c0f64b97f Mon Sep 17 00:00:00 2001
-From: Axel Waggershauser <awagger@gmail.com>
-Date: Mon, 3 Aug 2020 08:48:58 +0200
-Subject: [PATCH] Fix regression in pkgconfig file generation
-
----
- zxing.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zxing.pc.in b/zxing.pc.in
-index b62fd15..3f429f4 100644
---- a/zxing.pc.in
-+++ b/zxing.pc.in
-@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
- Name: ZXing
- Description: ZXing library set
- Version: @VERSION@
--Libs: -L${libdir} -l@TARGET_ZXING@ 
-+Libs: -L${libdir} -lZXing
- Cflags: -I${includedir} -I${includedir}/ZXing

diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
deleted file mode 100644
index c448d00a309..00000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.1.0-pkgconfig-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/zxing.pc.in	2020-04-09 11:43:22.494219440 -0400
-+++ b/zxing.pc.in	2020-04-09 11:49:03.884867034 -0400
-@@ -5,6 +5,6 @@
- 
- Name: ZXing
- Description: ZXing library set
--Version: @VERSION@
-+Version: @PROJECT_VERSION@
- Libs: -L${libdir} -lZXing
- Cflags: -I${includedir} -I${includedir}/ZXing

diff --git a/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
deleted file mode 100644
index 3441bcd6009..00000000000
--- a/media-libs/zxing-cpp/zxing-cpp-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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 ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-pkgconfig-libs.patch" # git master
-	"${FILESDIR}/${P}-pkgconfig-version.patch" # bug 716818
-)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2021-05-02  7:29 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-05-02  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     2a78e7f1bfd34a0f1ac7710725077999c06805e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 07:28:41 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  2 07:28:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a78e7f1

media-libs/zxing-cpp: Fix build with GCC-11

Closes: https://bugs.gentoo.org/787560
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch    | 22 ++++++++++++++++++++++
 media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild        |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..13adad906c0
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch
@@ -0,0 +1,22 @@
+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
index a43d3881a65..3b38eb67cad 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,8 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}/${P}-gcc11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF # nothing is installed


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2021-07-13  5:55 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-07-13  5:55 UTC (permalink / raw
  To: gentoo-commits

commit:     eb1e2e61d52731cbf4ee60f2b85ce053663cd0d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 13 05:43:36 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 05:54:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1e2e61

media-libs/zxing-cpp: Drop 1.1.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/zxing-cpp/Manifest                      |  1 -
 .../zxing-cpp/files/zxing-cpp-1.1.1-gcc11.patch    | 22 ------------------
 media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild        | 27 ----------------------
 3 files changed, 50 deletions(-)

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 833baebc4c5..376361ba89e 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,2 +1 @@
-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

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 13adad906c0..00000000000
--- 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 3b38eb67cad..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2022-07-14 11:45 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2022-07-14 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c180e5b4af5f256037845b662c7e017f9dae7ec8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 08:03:46 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 11:45:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c180e5b4

media-libs/zxing-cpp: 1.4.0 version bump, add subslot

1.4.0 is not ABI compatible to 1.3.0 without bumping soname.
Thankfully upstream was made aware of this and will change SO handling
going forward.

Downstream patch: Install one private header needed for
app-office/libreoffice to build successfully.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/zxing-cpp/Manifest                      |  1 +
 ...pp-1.4.0-install-required-private-headers.patch | 43 ++++++++++++++++++++++
 media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild        | 28 ++++++++++++++
 3 files changed, 72 insertions(+)

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 1e76da116ca3..8a7287886422 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1 +1,2 @@
 DIST zxing-cpp-1.3.0.tar.gz 97938087 BLAKE2B f0c9c906ab2b534c67cf66605eca0ecc22a90fc9d69e23397bcb0bc8eaf3d68a7ad41631ea6d9c7f292ee03165d2e038d84f497307384205e2d6f37fef5dddba SHA512 27821667dea3d09b91bf9825ff25483ed658d850fd238009f1c7e43b1b09e62d24b3a2cd78d4e39d29725931b32bfce3e21e7ec871830b3ad69a5a69c72d8de8
+DIST zxing-cpp-1.4.0.tar.gz 1018225 BLAKE2B 98b6badfe0ddfa39650eb4fbfc02bc01f5237cdd5edfafd7b88067997a22caa2e64d067328b534c439d7d89fef5b6d48acf4bc29389142b332123b477f3e3dde SHA512 05c5b9282f13b76fa0897b21e5b73cb7df0c52e62f1a2d9760fe774aa0378fde97f5f9896690b65b28b4b96ba6ad2703bed53ffaf9d3784636d29cbe860d4bad

diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch
new file mode 100644
index 000000000000..2a85252f5439
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch
@@ -0,0 +1,43 @@
+From 4159a44bdc785b27013bc6be1d32b2e442c73b74 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Jul 2022 12:04:27 +0200
+Subject: [PATCH] Add INSTALL_PRIVATE_HEADERS switch to unbreak LibreOffice
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt      | 1 +
+ core/CMakeLists.txt | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e947ce8d..2e41e773 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ option (BUILD_BLACKBOX_TESTS "Build the black box reader/writer tests" OFF)
+ option (BUILD_UNIT_TESTS "Build the unit tests (don't enable for production builds)" OFF)
+ option (BUILD_PYTHON_MODULE "Build the python module" OFF)
+ set(BUILD_DEPENDENCIES "AUTO" CACHE STRING "Fetch from github or use locally installed (AUTO/GITHUB/LOCAL)")
++option (INSTALL_PRIVATE_HEADERS "Install (some) private headers to unbreak (some) revdeps broken by 1.4.0 cleanup" OFF)
+ 
+ if (WIN32)
+     option (BUILD_SHARED_LIBS "Build and link as shared library" OFF)
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 7382bcae..575e696b 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -174,6 +174,12 @@ if (BUILD_WRITERS)
+     )
+ endif()
+ # end of public header set
++if (INSTALL_PRIVATE_HEADERS)
++    set (PUBLIC_HEADERS ${PUBLIC_HEADERS}
++        src/BitArray.h
++    )
++endif()
++# end of 'private' public header set
+ 
+ set (AZTEC_FILES
+ )
+-- 
+2.35.1
+

diff --git a/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild
new file mode 100644
index 000000000000..7fe3f592a74c
--- /dev/null
+++ b/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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/1.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# Downstream patch until revdeps like LibreOffice are fixed
+PATCHES=( "${FILESDIR}/${P}-install-required-private-headers.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_PRIVATE_HEADERS=ON # required by LibreOffice as of 7.3.5.1
+		-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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2023-04-30 17:16 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-04-30 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     453c970181b2ada7c54262c47bde4cfdcda7ae85
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 21:35:21 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 17:16:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453c9701

media-libs/zxing-cpp: drop 1.4.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/zxing-cpp/Manifest                      |  1 -
 ...pp-1.4.0-install-required-private-headers.patch | 43 ----------------------
 media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild        | 28 --------------
 3 files changed, 72 deletions(-)

diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 7fb1cf7c9f17..e9f6df0ca556 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,2 +1 @@
-DIST zxing-cpp-1.4.0.tar.gz 1018225 BLAKE2B 98b6badfe0ddfa39650eb4fbfc02bc01f5237cdd5edfafd7b88067997a22caa2e64d067328b534c439d7d89fef5b6d48acf4bc29389142b332123b477f3e3dde SHA512 05c5b9282f13b76fa0897b21e5b73cb7df0c52e62f1a2d9760fe774aa0378fde97f5f9896690b65b28b4b96ba6ad2703bed53ffaf9d3784636d29cbe860d4bad
 DIST zxing-cpp-2.0.0.tar.gz 856413 BLAKE2B 8069d3e39a7ddf99510777df477a5e3503e5eead7adcbf175123ab59de47c3da75bb8187533dad552a07b1475756ff3981d30eaa3e8088c5c9b991e22a7127bd SHA512 fa22164f834a42194eafd0d3e9c09d953233c69843ac6e79c8d6513314be28d8082382b436c379368e687e0eed05cb5e566d2893ec6eb29233a36643904ae083

diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch
deleted file mode 100644
index 2a85252f5439..000000000000
--- a/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4159a44bdc785b27013bc6be1d32b2e442c73b74 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 14 Jul 2022 12:04:27 +0200
-Subject: [PATCH] Add INSTALL_PRIVATE_HEADERS switch to unbreak LibreOffice
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt      | 1 +
- core/CMakeLists.txt | 6 ++++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e947ce8d..2e41e773 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,7 @@ option (BUILD_BLACKBOX_TESTS "Build the black box reader/writer tests" OFF)
- option (BUILD_UNIT_TESTS "Build the unit tests (don't enable for production builds)" OFF)
- option (BUILD_PYTHON_MODULE "Build the python module" OFF)
- set(BUILD_DEPENDENCIES "AUTO" CACHE STRING "Fetch from github or use locally installed (AUTO/GITHUB/LOCAL)")
-+option (INSTALL_PRIVATE_HEADERS "Install (some) private headers to unbreak (some) revdeps broken by 1.4.0 cleanup" OFF)
- 
- if (WIN32)
-     option (BUILD_SHARED_LIBS "Build and link as shared library" OFF)
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 7382bcae..575e696b 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -174,6 +174,12 @@ if (BUILD_WRITERS)
-     )
- endif()
- # end of public header set
-+if (INSTALL_PRIVATE_HEADERS)
-+    set (PUBLIC_HEADERS ${PUBLIC_HEADERS}
-+        src/BitArray.h
-+    )
-+endif()
-+# end of 'private' public header set
- 
- set (AZTEC_FILES
- )
--- 
-2.35.1
-

diff --git a/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild
deleted file mode 100644
index d4d127e000be..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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/1.4"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-# Downstream patch until revdeps like LibreOffice are fixed
-PATCHES=( "${FILESDIR}/${P}-install-required-private-headers.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PRIVATE_HEADERS=ON # required by LibreOffice as of 7.3.5.1
-		-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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/
@ 2024-10-04 13:01 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b6405d399294fba767ee6047ab2267286f423a84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 12:35:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 13:01:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6405d39

media-libs/zxing-cpp: Fix build with >=libcxx-19

Closes: https://bugs.gentoo.org/939897
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../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.ebuild        |  5 ++++
 3 files changed, 61 insertions(+)

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.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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-10-04 13:01 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-30 17:16 [gentoo-commits] repo/gentoo:master commit in: media-libs/zxing-cpp/, media-libs/zxing-cpp/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-10-04 13:01 Andreas Sturmlechner
2022-07-14 11:45 Andreas Sturmlechner
2021-07-13  5:55 Andreas Sturmlechner
2021-05-02  7:29 Andreas Sturmlechner
2020-09-13 18:25 Andreas Sturmlechner
2020-08-18 17:49 Andreas Sturmlechner
2020-04-09 21:37 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox