diff --git a/gpgme-include_functional.patch b/gpgme-include_functional.patch new file mode 100644 index 0000000..ed3b507 --- /dev/null +++ b/gpgme-include_functional.patch @@ -0,0 +1,24 @@ +Index: gpgme-1.8.0/lang/qt/src/qgpgmenewcryptoconfig.cpp +=================================================================== +--- gpgme-1.8.0.orig/lang/qt/src/qgpgmenewcryptoconfig.cpp ++++ gpgme-1.8.0/lang/qt/src/qgpgmenewcryptoconfig.cpp +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + using namespace QGpgME; + using namespace GpgME; +Index: gpgme-1.8.0/lang/qt/src/threadedjobmixin.h +=================================================================== +--- gpgme-1.8.0.orig/lang/qt/src/threadedjobmixin.h ++++ gpgme-1.8.0/lang/qt/src/threadedjobmixin.h +@@ -51,6 +51,7 @@ + #include "job.h" + + #include ++#include + + namespace QGpgME + { diff --git a/gpgme.changes b/gpgme.changes index e94e708..de126ea 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 7 02:48:46 UTC 2017 - crrodriguez@opensuse.org + +- gpgme-include_functional.patch: include where + needed, fix GCC7 build + ------------------------------------------------------------------- Tue Nov 22 23:19:10 UTC 2016 - lbeltrame@kde.org diff --git a/gpgme.spec b/gpgme.spec index 6df8b39..13e8831 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,7 +1,7 @@ # # spec file for package gpgme # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,7 @@ Source3: gpgme.keyring Source99: %{name}.changes #PATCH-FIX-UPSTREAM: remove-a-forgotten-instance-of-libsuffix.diff - Fix cmake files (or it will break KDE software building) Patch1: remove-a-forgotten-instance-of-libsuffix.diff +Patch2: gpgme-include_functional.patch BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.0.2 BuildRequires: libgpg-error-devel >= 1.17 @@ -190,7 +191,7 @@ This package contains the bindings to use the library in Qt C++ applications. %prep %setup -q %patch1 -p1 - +%patch2 -p1 %build build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99}) languages="cl"