[kde-freebsd] [SVN Commit] area51

[Raphael Kubo da Costa]

SVN commit 11669 by rakuco:

KDE, QT: Merge r402613 from ports.

------------------------------------------------------------------------
r402613 | rakuco | 2015-11-29 19:08:04 +0100 (Sun, 29 Nov 2015) | 12 lines

Make devel/qt4's clang+base libstdc++ patch work without changes to x11/kdelibs4.

Unconditionally including ciso646 in qglobal.h to check for libc++ makes
including qglobal.h from C programs fail.

qglobal.h is not supposed to be used in C programs, but kdelibs4's
FindQt.cmake ends up calling CHECK_SYMBOL_EXISTS() instead of
CHECK_CXX_SYMBOL_EXISTS() to check if some macros are defined. Since
kdelibs4 is in maintenance mode, our changes to it can be avoided if we just
check for __cplusplus before including ciso646 (<initializer_list> is not
available in C anyway).

------------------------------------------------------------------------



 M  +4 -46     KDE/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake  
 M  +6 -4      QT/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h