--- src/libs/3rdparty/botan/botan.cpp.orig 2012-12-17 17:18:37.000000000 +0100 +++ src/libs/3rdparty/botan/botan.cpp 2013-01-16 23:31:13.000000000 +0100 @@ -15,6 +15,8 @@ #endif +#if 0 // Bundled Botan + namespace Botan { /** @@ -47183,6 +47185,8 @@ } +#endif // Bundled Botan + namespace Botan { PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n) { --- src/libs/3rdparty/botan/botan.h.orig 2012-12-17 17:18:37.000000000 +0100 +++ src/libs/3rdparty/botan/botan.h 2013-01-16 23:09:47.000000000 +0100 @@ -11,6 +11,20 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if 0 // Bundled Botan + #include #include #include @@ -16184,6 +16198,8 @@ }; } +#endif // Bundled Botan + namespace Botan { typedef QSharedPointer PublicKeyPtr; BOTAN_DLL PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n); --- src/libs/3rdparty/botan/botan.pri.orig 2012-12-17 17:18:37.000000000 +0100 +++ src/libs/3rdparty/botan/botan.pri 2013-01-16 22:50:26.000000000 +0100 @@ -6,18 +6,6 @@ DEPENDPATH += . -DEFINES += BOTAN_DLL= -unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \ - BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \ - BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO -*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \ - BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \ - BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER -macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN -*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC -*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG -*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL - win32 { DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \ BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \