View | Details | Raw Unified | Return to bug 214575
Collapse All | Expand All

(-)security/gpgme/Makefile (-14 / +4 lines)
Lines 60-72 Link Here
60
60
61
.  if ${SLAVEPORT} == "cpp"
61
.  if ${SLAVEPORT} == "cpp"
62
CONFIGURE_ARGS+=--enable-languages="cpp"
62
CONFIGURE_ARGS+=--enable-languages="cpp"
63
USES+=		compiler:c++11-lang
63
USES+=		compiler:c++11-lib
64
# Unhide std::to_string() to fix build with GCC 4.8 (ports/193528).
65
CXXFLAGS+=	-D_GLIBCXX_USE_C99
64
.  endif
66
.  endif
65
67
66
.  if ${SLAVEPORT} == "qt5"
68
.  if ${SLAVEPORT} == "qt5"
67
LIB_DEPENDS+=	libgpgmepp.so:security/gpgme-cpp
69
LIB_DEPENDS+=	libgpgmepp.so:security/gpgme-cpp
68
CONFIGURE_ARGS+=--enable-languages="cpp qt"
70
CONFIGURE_ARGS+=--enable-languages="cpp qt"
69
USES+=		compiler:c++11-lang pkgconfig
71
USES+=		compiler:c++11-lib pkgconfig
70
USE_QT5=	buildtools_build core testlib
72
USE_QT5=	buildtools_build core testlib
71
CONFLICTS_INSTALL=	kdepimlibs-4.*
73
CONFLICTS_INSTALL=	kdepimlibs-4.*
72
.  endif
74
.  endif
Lines 86-103 Link Here
86
.include <bsd.port.pre.mk>
88
.include <bsd.port.pre.mk>
87
89
88
.if defined(SLAVEPORT)
90
.if defined(SLAVEPORT)
89
.  if ${SLAVEPORT} == "cpp"
90
.    if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000
91
BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
92
CXXFLAGS+=	-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1
93
.    endif
94
.  endif
95
.  if ${SLAVEPORT} == "qt5"
96
.    if ${OPSYS} == FreeBSD && (${OSVERSION} < 1001000 || (${OSVERSION} >= 1001507 && ${OSVERSION} < 1100080))
97
BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
98
CXXFLAGS+=	-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1
99
.    endif
100
.  endif
101
.  if ${SLAVEPORT} == "python"
91
.  if ${SLAVEPORT} == "python"
102
.    if ${PYTHON_REL} >= 3000
92
.    if ${PYTHON_REL} >= 3000
103
CONFIGURE_ARGS+=--enable-languages="python3"
93
CONFIGURE_ARGS+=--enable-languages="python3"
(-)security/gpgme/files/patch-git_b4658f6a1 (+35 lines)
Line 0 Link Here
1
From: Andras Mantia <andras@kdab.com>
2
Date: Wed, 2 Nov 2016 09:23:42 +0000 (+0200)
3
Subject: qt: Fix build with g++ 4.8.x
4
X-Git-Tag: gpgme-1.8.0~36
5
X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=b4658f6a1110bb0b54bd5dfc9df8e8b390e38d61
6
7
qt: Fix build with g++ 4.8.x
8
9
* lang/qt/src/defaultkeygenerationjob.cpp
10
(DefaultKeyGenerationJob::start): Explicitly connect pointer
11
in the QPointer.
12
13
--
14
Commit message written by Andre Heinecke <aheinecke@intevation.de>
15
---
16
17
diff --git a/lang/qt/src/defaultkeygenerationjob.cpp b/lang/qt/src/defaultkeygenerationjob.cpp
18
index d26e824..020f4d2 100644
19
--- lang/qt/src/defaultkeygenerationjob.cpp
20
+++ lang/qt/src/defaultkeygenerationjob.cpp
21
@@ -105,11 +105,11 @@ GpgME::Error DefaultKeyGenerationJob::start(const QString &email, const QString
22
 
23
     d->job = openpgp()->keyGenerationJob();
24
     d->job->installEventFilter(this);
25
-    connect(d->job, &KeyGenerationJob::result,
26
+    connect(d->job.data(), &KeyGenerationJob::result,
27
             this, &DefaultKeyGenerationJob::result);
28
-    connect(d->job, &KeyGenerationJob::done,
29
+    connect(d->job.data(), &KeyGenerationJob::done,
30
             this, &DefaultKeyGenerationJob::done);
31
-    connect(d->job, &KeyGenerationJob::done,
32
+    connect(d->job.data(), &KeyGenerationJob::done,
33
             this, &QObject::deleteLater);
34
     return d->job->start(args);
35
 }
(-)security/gpgme/files/patch-lang_qt_src_qgpgmeencryptjob.cpp (+45 lines)
Line 0 Link Here
1
Rename encrypt() so that the code builds with FreeBSD 10.2/10.3's libc++, which
2
has a bug that causes std::bind() to fail with the original function name:
3
4
qgpgmeencryptjob.cpp:133:9: error: no matching function for call to 'bind'
5
    run(std::bind(&encrypt,
6
        ^~~~~~~~~
7
/usr/include/c++/v1/functional:2184:1: note: candidate template ignored:
8
couldn't infer template argument '_Fp'
9
bind(_Fp&& __f, _BoundArgs&&... __bound_args)
10
^
11
/usr/include/c++/v1/functional:2193:1: note: candidate template ignored:
12
couldn't infer template argument '_Rp'
13
bind(_Fp&& __f, _BoundArgs&&... __bound_args)
14
^
15
1 error generated.
16
17
--- lang/qt/src/qgpgmeencryptjob.cpp.orig	2016-10-18 17:22:02 UTC
18
+++ lang/qt/src/qgpgmeencryptjob.cpp
19
@@ -65,7 +65,7 @@ void QGpgMEEncryptJob::setOutputIsBase64
20
     mOutputIsBase64Encoded = on;
21
 }
22
 
23
-static QGpgMEEncryptJob::result_type encrypt(Context *ctx, QThread *thread,
24
+static QGpgMEEncryptJob::result_type do_encrypt(Context *ctx, QThread *thread,
25
         const std::vector<Key> &recipients,
26
         const std::weak_ptr<QIODevice> &plainText_,
27
         const std::weak_ptr<QIODevice> &cipherText_,
28
@@ -117,7 +117,7 @@ static QGpgMEEncryptJob::result_type enc
29
     if (!buffer->open(QIODevice::ReadOnly)) {
30
         assert(!"This should never happen: QBuffer::open() failed");
31
     }
32
-    return encrypt(ctx, 0, recipients, buffer, std::shared_ptr<QIODevice>(), eflags, outputIsBsse64Encoded);
33
+    return do_encrypt(ctx, 0, recipients, buffer, std::shared_ptr<QIODevice>(), eflags, outputIsBsse64Encoded);
34
 }
35
 
36
 Error QGpgMEEncryptJob::start(const std::vector<Key> &recipients, const QByteArray &plainText, bool alwaysTrust)
37
@@ -130,7 +130,7 @@ Error QGpgMEEncryptJob::start(const std:
38
 void QGpgMEEncryptJob::start(const std::vector<Key> &recipients, const std::shared_ptr<QIODevice> &plainText,
39
                              const std::shared_ptr<QIODevice> &cipherText, const Context::EncryptionFlags eflags)
40
 {
41
-    run(std::bind(&encrypt,
42
+    run(std::bind(&do_encrypt,
43
                     std::placeholders::_1, std::placeholders::_2,
44
                     recipients,
45
                     std::placeholders::_3, std::placeholders::_4,
(-)security/gpgme-cpp/Makefile (-1 / +1 lines)
Lines 1-6 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTREVISION=	0
3
PORTREVISION=	1
4
PKGNAMESUFFIX=	-${SLAVEPORT}
4
PKGNAMESUFFIX=	-${SLAVEPORT}
5
5
6
MAINTAINER=	jhale@FreeBSD.org
6
MAINTAINER=	jhale@FreeBSD.org
(-)security/gpgme-qt5/Makefile (-1 / +1 lines)
Lines 1-6 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTREVISION=	1
3
PORTREVISION=	2
4
PKGNAMESUFFIX=	-${SLAVEPORT}
4
PKGNAMESUFFIX=	-${SLAVEPORT}
5
5
6
MAINTAINER=	jhale@FreeBSD.org
6
MAINTAINER=	jhale@FreeBSD.org

Return to bug 214575