diff options
Diffstat (limited to 'app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches')
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches deleted file mode 100644 index 406571cdd3a0..000000000000 --- a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches +++ /dev/null @@ -1,48 +0,0 @@ -From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001 -From: Kristian Fiskerstrand <kf@sumptuouscapital.com> -Date: Thu, 11 Aug 2016 14:44:37 +0200 -Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7 - - * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7 - --- -Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be -compiled with at least this standard. - -This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if -building against Qt 5.7 or higher. ---- - m4/qt.m4 | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/m4/qt.m4 b/m4/qt.m4 -index 093f428..90c4a6e 100644 ---- a/m4/qt.m4 -+++ b/m4/qt.m4 -@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT], - enable_pinentry_qt5="try") - - have_qt5_libs="no"; -+ require_qt_cpp11="no"; - - if test "$enable_pinentry_qt5" != "no"; then - PKG_CHECK_MODULES(PINENTRY_QT, -@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT], - fi - fi - if test "$have_qt5_libs" = "yes"; then -+ PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11, -+ Qt5Core >= 5.7.0, -+ [require_qt_cpp11="yes"], -+ [require_qt_cpp11="no"]) -+ -+ if test "${require_qt_cpp11}" = "yes"; then -+ PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11" -+ fi -+ - AC_CHECK_TOOL(MOC, moc) - AC_MSG_CHECKING([moc version]) - mocversion=`$MOC -v 2>&1` --- -2.7.3 - |