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

[Andreas Sturmlechner]

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@×××××.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
+)