From 76955b2fce1125cb4870691c370f3776103072976bf40e017056df7cccc89c25 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 9 Feb 2021 13:52:24 +0000 Subject: [PATCH] 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 --- 0001-Fix-build-with-GCC-11.patch | 24 ++++++++++++++++++++++++ fix-pkg-config-file.patch | 13 ------------- zxing-cpp-1.1.0.tar.gz | 3 --- zxing-cpp-1.1.1.tar.gz | 3 +++ zxing-cpp.changes | 8 ++++++++ zxing-cpp.spec | 7 ++++--- 6 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 0001-Fix-build-with-GCC-11.patch delete mode 100644 fix-pkg-config-file.patch delete mode 100644 zxing-cpp-1.1.0.tar.gz create mode 100644 zxing-cpp-1.1.1.tar.gz diff --git a/0001-Fix-build-with-GCC-11.patch b/0001-Fix-build-with-GCC-11.patch new file mode 100644 index 0000000..999b3bc --- /dev/null +++ b/0001-Fix-build-with-GCC-11.patch @@ -0,0 +1,24 @@ +From 4766de0a8e6f780a04b03776d0c0380cb85935b8 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +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 + #include + #include ++#include + #include + #include + +-- +2.30.0 + diff --git a/fix-pkg-config-file.patch b/fix-pkg-config-file.patch deleted file mode 100644 index 96a405e..0000000 --- a/fix-pkg-config-file.patch +++ /dev/null @@ -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 diff --git a/zxing-cpp-1.1.0.tar.gz b/zxing-cpp-1.1.0.tar.gz deleted file mode 100644 index 15fe16f..0000000 --- a/zxing-cpp-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:283574a817a6efdb38e4f0480fb7697e9b1f90b55d6b16e92e1a2d2af9c43506 -size 128856890 diff --git a/zxing-cpp-1.1.1.tar.gz b/zxing-cpp-1.1.1.tar.gz new file mode 100644 index 0000000..99b1f10 --- /dev/null +++ b/zxing-cpp-1.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86 +size 128925736 diff --git a/zxing-cpp.changes b/zxing-cpp.changes index 34cf9c7..0add7da 100644 --- a/zxing-cpp.changes +++ b/zxing-cpp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 9 07:50:14 UTC 2021 - Christophe Giboudeaux + +- 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 diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 9802443..140a4f3 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -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