[arch-commits] Commit in kdenetwork/trunk (PKGBUILD use-libotr3.patch)

[Andrea Scarpino]

    Date: Friday, November 9, 2012 @ 15:49:27
  Author: andrea
Revision: 170697

Better version of use-libotr3 patch (FS#32567)

Modified:
  kdenetwork/trunk/PKGBUILD
  kdenetwork/trunk/use-libotr3.patch

-------------------+
 PKGBUILD          |    2 -
 use-libotr3.patch |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-09 20:17:29 UTC (rev 170696)
+++ PKGBUILD	2012-11-09 20:49:27 UTC (rev 170697)
@@ -23,7 +23,7 @@
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
 sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
-          '808fa0400dc419d446d4ff8a9b536b5fddcb4727')
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
     cd ${pkgbase}-${pkgver}

Modified: use-libotr3.patch
===================================================================
--- use-libotr3.patch	2012-11-09 20:17:29 UTC (rev 170696)
+++ use-libotr3.patch	2012-11-09 20:49:27 UTC (rev 170697)
@@ -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