Accepting request 870409 from home:cgiboudeaux:branches:devel:libraries:c_c++

- Update to 1.1.1. No changelog available.
- Drop fix-pkg-config-file.patch. Merged upstream
- Add 0001-Fix-build-with-GCC-11.patch to fix GCC 11 build
  issues (boo#1181915)

OBS-URL: https://build.opensuse.org/request/show/870409
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=17
This commit is contained in:
Dirk Mueller 2021-02-09 13:52:24 +00:00 committed by Git OBS Bridge
parent c3d5e65aa7
commit 76955b2fce
6 changed files with 39 additions and 19 deletions

View File

@ -0,0 +1,24 @@
From 4766de0a8e6f780a04b03776d0c0380cb85935b8 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 9 Feb 2021 09:14:00 +0100
Subject: [PATCH] Fix build with GCC 11
---
core/src/Pattern.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/src/Pattern.h b/core/src/Pattern.h
index 97093f0..87f340e 100644
--- a/core/src/Pattern.h
+++ b/core/src/Pattern.h
@@ -21,6 +21,7 @@
#include <cmath>
#include <cstddef>
#include <cstdint>
+#include <limits>
#include <numeric>
#include <vector>
--
2.30.0

View File

@ -1,13 +0,0 @@
Index: zxing-cpp-1.1.0/zxing.pc.in
===================================================================
--- zxing-cpp-1.1.0.orig/zxing.pc.in
+++ zxing-cpp-1.1.0/zxing.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/@CMAKE_INSTALL_INCL
Name: ZXing
Description: ZXing library set
-Version: @VERSION@
-Libs: -L${libdir} -l@TARGET_ZXING@
+Version: @PROJECT_VERSION@
+Libs: -L${libdir} -lZXing
Cflags: -I${includedir} -I${includedir}/ZXing

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:283574a817a6efdb38e4f0480fb7697e9b1f90b55d6b16e92e1a2d2af9c43506
size 128856890

3
zxing-cpp-1.1.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86
size 128925736

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 9 07:50:14 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 1.1.1. No changelog available.
- Drop fix-pkg-config-file.patch. Merged upstream
- Add 0001-Fix-build-with-GCC-11.patch to fix GCC 11 build
issues (boo#1181915)
-------------------------------------------------------------------
Fri Jan 15 00:29:36 UTC 2021 - Simon Lees <sflees@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package zxing-cpp
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%define sover 1
Name: zxing-cpp
Version: 1.1.0
Version: 1.1.1
Release: 0
Summary: Library for processing 1D and 2D barcodes
License: Apache-2.0 AND Zlib AND LGPL-2.1-with-Qt-Company-Qt-exception-1.1
@ -26,7 +26,8 @@ Group: Development/Languages/C and C++
URL: https://github.com/nu-book/zxing-cpp/
Source0: https://github.com/nu-book/zxing-cpp/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source99: baselibs.conf
Patch0: fix-pkg-config-file.patch
# PATCH-FIX-UPSTREAM
Patch0: 0001-Fix-build-with-GCC-11.patch
BuildRequires: cmake >= 3.10
BuildRequires: gcc-c++
BuildRequires: pkgconfig