blob: 1e96c98d6f6e0722aac289835c0c4d161e574dc8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
--- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
@@ -13,13 +13,13 @@
SET(LIBOTR_FIND_QUIETLY TRUE)
ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
-# Determine version information from libotr/version.h
+# Determine version information from libotr3/version.h
IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
# Check if version is at least 3.2.0
diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
--- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
@@ -26,7 +26,7 @@
*/
extern "C"{
-#include "libotr/proto.h"
+#include "libotr3/proto.h"
}
#include "kopetechatsession.h"
diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
--- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
@@ -36,10 +36,10 @@
#include "authenticationwizard.h"
extern "C" {
-#include <libotr/privkey.h>
-#include <libotr/proto.h>
-#include <libotr/message.h>
-#include <libotr/userstate.h>
+#include <libotr3/privkey.h>
+#include <libotr3/proto.h>
+#include <libotr3/message.h>
+#include <libotr3/userstate.h>
}
diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
--- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
@@ -32,11 +32,11 @@
#include <kopetechatsession.h>
extern "C" {
-#include <libotr/privkey.h>
-#include <libotr/proto.h>
-#include <libotr/message.h>
-#include <libotr/userstate.h>
-#include <libotr/context.h>
+#include <libotr3/privkey.h>
+#include <libotr3/proto.h>
+#include <libotr3/message.h>
+#include <libotr3/userstate.h>
+#include <libotr3/context.h>
}
class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
|
