Fix FTBFS
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
a792509f22
commit
cce396ee08
48
0001-add-missing-include-functional.patch
Normal file
48
0001-add-missing-include-functional.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From fd89a9e229ae5ebe959459fe62a6304c0cce0cf4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
|
||||||
|
Date: Sat, 11 Feb 2017 08:36:24 +0100
|
||||||
|
Subject: [PATCH] add missing #include <functional>
|
||||||
|
|
||||||
|
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<T_result()> &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 <ignatenkobrain@fedoraproject.org>
|
||||||
|
---
|
||||||
|
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 <sstream>
|
||||||
|
#include <string>
|
||||||
|
#include <cassert>
|
||||||
|
+#include <functional>
|
||||||
|
|
||||||
|
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 <cassert>
|
||||||
|
+#include <functional>
|
||||||
|
|
||||||
|
namespace QGpgME
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.11.1
|
||||||
|
|
@ -11,7 +11,7 @@
|
|||||||
Name: gpgme
|
Name: gpgme
|
||||||
Summary: GnuPG Made Easy - high level crypto API
|
Summary: GnuPG Made Easy - high level crypto API
|
||||||
Version: 1.8.0
|
Version: 1.8.0
|
||||||
Release: 11%{?dist}
|
Release: 12%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://gnupg.org/related_software/gpgme/
|
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
|
Source2: gpgme-multilib.h
|
||||||
|
|
||||||
## upstream patches
|
## 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)
|
# upstream fix for cmake file(s)
|
||||||
Patch2: 0002-Remove-a-forgotten-instance-of-libsuffix.patch
|
Patch2: 0002-Remove-a-forgotten-instance-of-libsuffix.patch
|
||||||
|
|
||||||
@ -235,6 +238,9 @@ fi
|
|||||||
%{python3_sitearch}/gpg/
|
%{python3_sitearch}/gpg/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 11 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.8.0-12
|
||||||
|
- Fix FTBFS
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-11
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-11
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user