LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File system-botan-lib.diff of Package qt-creator (Project openSUSE:Factory)

diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri
index 20832c1..4b715c0 100644
--- a/src/libs/3rdparty/botan/botan.pri
+++ b/src/libs/3rdparty/botan/botan.pri
@@ -1,2 +1,2 @@
-INCLUDEPATH *= $$PWD/..
-LIBS *= -l$$qtLibraryName(Botan)
+INCLUDEPATH *= /usr/include/botan-1.10
+LIBS *= -lbotan-1.10
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 5eaf471..9a1da2d 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -5,7 +5,6 @@ QT += core gui
 # aggregation and extensionsystem are directly in src.pro
 # because of dependencies of app
 SUBDIRS   = \
-    3rdparty \
     utils \
     utils/process_stub.pro \
     languageutils \
diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp
index 3e1b697..e17aaca 100644
--- a/src/libs/ssh/sshcryptofacility.cpp
+++ b/src/libs/ssh/sshcryptofacility.cpp
@@ -38,6 +38,11 @@
 #include "sshpacket_p.h"
 
 #include <botan/botan.h>
+#include <botan/cbc.h>
+#include <botan/dsa.h>
+#include <botan/pkcs8.h>
+#include <botan/pubkey.h>
+#include <botan/rsa.h>
 
 #include <QDebug>
 #include <QList>
diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h
index 5b22429..a3a7b1a 100644
--- a/src/libs/ssh/sshcryptofacility_p.h
+++ b/src/libs/ssh/sshcryptofacility_p.h
@@ -32,6 +32,7 @@
 #define SSHABSTRACTCRYPTOFACILITY_P_H
 
 #include <botan/botan.h>
+#include <botan/hmac.h>
 
 #include <QByteArray>
 #include <QScopedPointer>
diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp
index c11201c..93538a2 100644
--- a/src/libs/ssh/sshkeyexchange.cpp
+++ b/src/libs/ssh/sshkeyexchange.cpp
@@ -37,6 +37,12 @@
 #include "sshincomingpacket_p.h"
 
 #include <botan/botan.h>
+#include <botan/dh.h>
+#include <botan/dl_group.h>
+#include <botan/dsa.h>
+#include <botan/pem.h>
+#include <botan/pubkey.h>
+#include <botan/rsa.h>
 
 #ifdef CREATOR_SSH_DEBUG
 #include <iostream>
diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp
index ef28c05..ca42f56 100644
--- a/src/libs/ssh/sshkeygenerator.cpp
+++ b/src/libs/ssh/sshkeygenerator.cpp
@@ -35,6 +35,11 @@
 #include "sshpacket_p.h"
 
 #include <botan/botan.h>
+#include <botan/der_enc.h>
+#include <botan/dsa.h>
+#include <botan/pem.h>
+#include <botan/pkcs8.h>
+#include <botan/rsa.h>
 
 #include <QDateTime>
 #include <QInputDialog>
diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h
index 0bd0413..fb5201f 100644
--- a/src/libs/ssh/sshkeypasswordretriever_p.h
+++ b/src/libs/ssh/sshkeypasswordretriever_p.h
@@ -31,6 +31,7 @@
 #define KEYPASSWORDRETRIEVER_H
 
 #include <botan/botan.h>
+#include <botan/ui.h>
 
 #include <string>