[qt] hack around openssl type mismatch wrt SSL_CTX_ctrl (with and without const)

Rex Dieter rdieter at fedoraproject.org
Wed Jun 1 19:28:24 UTC 2011


commit ef9de1563fe268baadb5032fa99ea0e19f772157
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 1 14:28:01 2011 -0500

    hack around openssl type mismatch wrt SSL_CTX_ctrl (with and without const)

 ...verywhere-opensource-src-4.8.0-tp-openssl.patch |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.8.0-tp-openssl.patch b/qt-everywhere-opensource-src-4.8.0-tp-openssl.patch
new file mode 100644
index 0000000..317fd4d
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.0-tp-openssl.patch
@@ -0,0 +1,15 @@
+diff -up qt-everywhere-opensource-src-4.8.0-tp/src/network/network.pro.openssl qt-everywhere-opensource-src-4.8.0-tp/src/network/network.pro
+--- qt-everywhere-opensource-src-4.8.0-tp/src/network/network.pro.openssl	2011-05-23 05:26:21.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.0-tp/src/network/network.pro	2011-06-01 14:25:55.012307358 -0500
+@@ -20,6 +20,8 @@ include(access/access.pri)
+ include(bearer/bearer.pri)
+ include(kernel/kernel.pri)
+ include(socket/socket.pri)
++## hack around typedef mismatch for SSL_CTX_ctrl (with and without const) -- Rex
++QMAKE_CXXFLAGS += -fpermissive
+ include(ssl/ssl.pri)
+ 
+ QMAKE_LIBS += $$QMAKE_LIBS_NETWORK
+diff -up qt-everywhere-opensource-src-4.8.0-tp/src/network/ssl/qsslsocket_openssl.cpp.openssl qt-everywhere-opensource-src-4.8.0-tp/src/network/ssl/qsslsocket_openssl.cpp
+diff -up qt-everywhere-opensource-src-4.8.0-tp/src/network/ssl/qsslsocket_openssl_symbols.cpp.openssl qt-everywhere-opensource-src-4.8.0-tp/src/network/ssl/qsslsocket_openssl_symbols.cpp
+diff -up qt-everywhere-opensource-src-4.8.0-tp/src/network/ssl/qsslsocket_openssl_symbols_p.h.openssl qt-everywhere-opensource-src-4.8.0-tp/src/network/ssl/qsslsocket_openssl_symbols_p.h


More information about the scm-commits mailing list