From cce396ee08e36ea0e414661883490fff628b0d96 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 11 Feb 2017 08:48:40 +0100 Subject: [PATCH] Fix FTBFS Signed-off-by: Igor Gnatenko --- 0001-add-missing-include-functional.patch | 48 +++++++++++++++++++++++ gpgme.spec | 8 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-add-missing-include-functional.patch diff --git a/0001-add-missing-include-functional.patch b/0001-add-missing-include-functional.patch new file mode 100644 index 0000000..79ace6b --- /dev/null +++ b/0001-add-missing-include-functional.patch @@ -0,0 +1,48 @@ +From fd89a9e229ae5ebe959459fe62a6304c0cce0cf4 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sat, 11 Feb 2017 08:36:24 +0100 +Subject: [PATCH] add missing #include + +With GCC 7.0, functional is not included transitively and we get: +In file included from qgpgmedeletejob.h:39:0, + from qgpgmedeletejob.cpp:38: +threadedjobmixin.h:98:33: error: 'function' in namespace 'std' does not name a template type + void setFunction(const std::function &function) + ^~~~~~~~ + +std::{function,bind,placeholders,mem_fn} are defined in functional. + +References: https://bugzilla.redhat.com/show_bug.cgi?id=1417383 +Signed-off-by: Igor Gnatenko +--- + lang/qt/src/qgpgmenewcryptoconfig.cpp | 1 + + lang/qt/src/threadedjobmixin.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp +index 4738a03b..6901eef1 100644 +--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp ++++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + using namespace QGpgME; + using namespace GpgME; +diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h +index 32b23db9..5ad2737f 100644 +--- a/lang/qt/src/threadedjobmixin.h ++++ b/lang/qt/src/threadedjobmixin.h +@@ -51,6 +51,7 @@ + #include "job.h" + + #include ++#include + + namespace QGpgME + { +-- +2.11.1 + diff --git a/gpgme.spec b/gpgme.spec index d471f09..2bc7c38 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -11,7 +11,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.8.0 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ URL: https://gnupg.org/related_software/gpgme/ @@ -19,6 +19,9 @@ Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2 Source2: gpgme-multilib.h ## upstream patches +# https://bugs.gnupg.org/gnupg/issue2955 +# https://bugzilla.redhat.com/show_bug.cgi?id=1417383 +Patch1: 0001-add-missing-include-functional.patch # upstream fix for cmake file(s) Patch2: 0002-Remove-a-forgotten-instance-of-libsuffix.patch @@ -235,6 +238,9 @@ fi %{python3_sitearch}/gpg/ %changelog +* Sat Feb 11 2017 Igor Gnatenko - 1.8.0-12 +- Fix FTBFS + * Fri Feb 10 2017 Fedora Release Engineering - 1.8.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild