diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-11-09 21:50:37 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-11-09 21:50:37 -0200 |
| commit | 03d5565a5e31c4f5189f8fd91eaf11aac5b9d5d3 (patch) | |
| tree | 07fc3972b70c63354bd4bbc2c6301781555354dc /libre/kdenetwork-kopete-libre/use-libotr3.patch | |
| parent | ba4c662f002990f3dfd05596e9b68ac3a7891ecc (diff) | |
| download | abslibre-03d5565a5e31c4f5189f8fd91eaf11aac5b9d5d3.tar.gz abslibre-03d5565a5e31c4f5189f8fd91eaf11aac5b9d5d3.tar.bz2 abslibre-03d5565a5e31c4f5189f8fd91eaf11aac5b9d5d3.zip | |
kdenetwork-kopete-libre-4.9.3-1: better version of use-libotr3 patch
Diffstat (limited to 'libre/kdenetwork-kopete-libre/use-libotr3.patch')
| -rw-r--r-- | libre/kdenetwork-kopete-libre/use-libotr3.patch | 55 |
1 files changed, 53 insertions, 2 deletions
diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/use-libotr3.patch index c36d1a00c..1e96c98d6 100644 --- a/libre/kdenetwork-kopete-libre/use-libotr3.patch +++ b/libre/kdenetwork-kopete-libre/use-libotr3.patch @@ -1,5 +1,6 @@ ---- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~ 2012-11-06 10:51:56.566038215 +0000 -+++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake 2012-11-06 10:53:38.861993686 +0000 +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) @@ -18,3 +19,53 @@ 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 |