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