Botan/Botan-qt_thread_support.patch

Index: src/mutex/qt_mutex/mux_qt.cpp
===================================================================
--- src/mutex/qt_mutex/mux_qt.cpp.orig	2011-06-20 15:52:09.000000000 +0200
+++ src/mutex/qt_mutex/mux_qt.cpp	2011-06-21 14:56:14.738269417 +0200
@@ -9,7 +9,7 @@
 #include <botan/internal/mux_qt.h>
 #include <qmutex.h>
 
-#if !defined(QT_THREAD_SUPPORT)
+#if !(defined(QT_THREAD_SUPPORT) || !defined(QT_NO_THREAD))
    #error Your version of Qt does not support threads or mutexes
 #endif
 
Index: src/mutex/qt_mutex/info.txt
===================================================================
--- src/mutex/qt_mutex/info.txt.orig	2011-06-20 15:52:09.000000000 +0200
+++ src/mutex/qt_mutex/info.txt	2011-06-21 14:55:17.957040061 +0200
@@ -13,5 +13,5 @@ mux_qt.h
 # I think we want to always use qt-mt, not qt -- not much point in supporting
 # mutexes in a single threaded application, after all.
 <libs>
-all -> qt-mt
+all -> QtCore
 </libs>
- Devel package now is versioned so multiple devel packages may be installed in parallel. - Devel package renamed back to Botan-devel to keep rpmlint from thinking it is a library package ... - Update to 1.10.0: New Features: * SSL (SSLv3, TLS 1.0, and TLS 1.1 are currently supported) * GOST 34.10-2001 signature scheme (a Russian ECC signature standard analogous to ECDSA) * The SHA-3 candidates Keccak and Blue Midnight Wish * Bcrypt password hashing * XSalsa20 * AES key wrapping * Comb4P hash combinator. Other Changes: * The block cipher interface now exposes any possible parallelism available to the implementation, and XTS, CTR, and CBC modes have been changed to use them. * SIMD implementations of Serpent, XTEA, Noekeon, and IDEA have been added, as has an implementation of AES using SSSE3 which runs both in constant time and, on recent processors, significantly faster than the usual table based implementation. There have also been numerous optimizations to elliptic curves. * The documentation, previously written in LaTeX, is now in reStructuredText, which is converted into HTML with Sphinx. This new format is significantly easier to write, encouraging more documentation to be written and updated. And, indeed, a number of features never before documented are now described in the manual. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=18 2011-06-22 16:07:02 +02:00			`Index: src/mutex/qt_mutex/mux_qt.cpp`
			`===================================================================`
			`--- src/mutex/qt_mutex/mux_qt.cpp.orig 2011-06-20 15:52:09.000000000 +0200`
			`+++ src/mutex/qt_mutex/mux_qt.cpp 2011-06-21 14:56:14.738269417 +0200`
			`@@ -9,7 +9,7 @@`
			`#include <botan/internal/mux_qt.h>`
			`#include <qmutex.h>`

			`-#if !defined(QT_THREAD_SUPPORT)`
			`+#if !(defined(QT_THREAD_SUPPORT) \|\| !defined(QT_NO_THREAD))`
			`#error Your version of Qt does not support threads or mutexes`
			`#endif`

			`Index: src/mutex/qt_mutex/info.txt`
			`===================================================================`
			`--- src/mutex/qt_mutex/info.txt.orig 2011-06-20 15:52:09.000000000 +0200`
			`+++ src/mutex/qt_mutex/info.txt 2011-06-21 14:55:17.957040061 +0200`
			`@@ -13,5 +13,5 @@ mux_qt.h`
			`# I think we want to always use qt-mt, not qt -- not much point in supporting`
			`# mutexes in a single threaded application, after all.`
			`<libs>`
			`-all -> qt-mt`
			`+all -> QtCore`
			`</libs>`