Date: Tuesday, May 7, 2013 @ 18:44:51
  Author: andrea
Revision: 184736

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kdenetwork/repos/testing-i686/
  kdenetwork/repos/testing-i686/PKGBUILD
    (from rev 184735, kdenetwork/trunk/PKGBUILD)
  kdenetwork/repos/testing-i686/kdenetwork-kget.install
    (from rev 184735, kdenetwork/trunk/kdenetwork-kget.install)
  kdenetwork/repos/testing-i686/kdenetwork-kopete.install
    (from rev 184735, kdenetwork/trunk/kdenetwork-kopete.install)
  kdenetwork/repos/testing-i686/kdenetwork-kppp.install
    (from rev 184735, kdenetwork/trunk/kdenetwork-kppp.install)
  kdenetwork/repos/testing-i686/kdenetwork.install
    (from rev 184735, kdenetwork/trunk/kdenetwork.install)
  kdenetwork/repos/testing-i686/use-libotr3.patch
    (from rev 184735, kdenetwork/trunk/use-libotr3.patch)
  kdenetwork/repos/testing-x86_64/
  kdenetwork/repos/testing-x86_64/PKGBUILD
    (from rev 184735, kdenetwork/trunk/PKGBUILD)
  kdenetwork/repos/testing-x86_64/kdenetwork-kget.install
    (from rev 184735, kdenetwork/trunk/kdenetwork-kget.install)
  kdenetwork/repos/testing-x86_64/kdenetwork-kopete.install
    (from rev 184735, kdenetwork/trunk/kdenetwork-kopete.install)
  kdenetwork/repos/testing-x86_64/kdenetwork-kppp.install
    (from rev 184735, kdenetwork/trunk/kdenetwork-kppp.install)
  kdenetwork/repos/testing-x86_64/kdenetwork.install
    (from rev 184735, kdenetwork/trunk/kdenetwork.install)
  kdenetwork/repos/testing-x86_64/use-libotr3.patch
    (from rev 184735, kdenetwork/trunk/use-libotr3.patch)

------------------------------------------+
 testing-i686/PKGBUILD                    |  119 +++++++++++++++++++++++++++++
 testing-i686/kdenetwork-kget.install     |   12 ++
 testing-i686/kdenetwork-kopete.install   |   12 ++
 testing-i686/kdenetwork-kppp.install     |   12 ++
 testing-i686/kdenetwork.install          |   11 ++
 testing-i686/use-libotr3.patch           |   71 +++++++++++++++++
 testing-x86_64/PKGBUILD                  |  119 +++++++++++++++++++++++++++++
 testing-x86_64/kdenetwork-kget.install   |   12 ++
 testing-x86_64/kdenetwork-kopete.install |   12 ++
 testing-x86_64/kdenetwork-kppp.install   |   12 ++
 testing-x86_64/kdenetwork.install        |   11 ++
 testing-x86_64/use-libotr3.patch         |   71 +++++++++++++++++
 12 files changed, 474 insertions(+)

Copied: kdenetwork/repos/testing-i686/PKGBUILD (from rev 184735, 
kdenetwork/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD                               (rev 0)
+++ testing-i686/PKGBUILD       2013-05-07 16:44:51 UTC (rev 184736)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgbase=kdenetwork
+pkgname=('kdenetwork-filesharing'
+         'kdenetwork-kdnssd'
+         'kdenetwork-kget'
+         'kdenetwork-kopete'
+         'kdenetwork-kppp'
+         'kdenetwork-krdc'
+         'kdenetwork-krfb')
+pkgver=4.10.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
+       'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
+    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
+    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz";
+        'use-libotr3.patch')
+sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d'
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
+
+build() {
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/use-libotr3.patch
+    cd ../
+
+       mkdir build
+       cd build
+       cmake ../${pkgbase}-${pkgver} \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DKDE4_BUILD_TESTS=OFF \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
+               -DWITH_Xmms=OFF \
+               -DWITH_LibMeanwhile=OFF \
+               -DWITH_qq=OFF
+       make
+}
+
+package_kdenetwork-filesharing() {
+       pkgdesc='Konqueror properties dialog plugin to share a directory with 
the local network'
+       depends=('kdelibs' 'smbclient')
+       install='kdenetwork.install'
+       cd $srcdir/build/filesharing
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kdnssd() {
+       pkgdesc='Monitors the network for DNS-SD services'
+       depends=('kdelibs')
+       cd $srcdir/build/kdnssd
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kget() {
+       pkgdesc='Download Manager'
+       depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
+       url="http://kde.org/applications/internet/kget/";
+       install='kdenetwork-kget.install'
+       cd $srcdir/build/kget
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/kget
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kopete() {
+       pkgdesc='Instant Messenger'
+       depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
+                'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
+       url="http://kde.org/applications/internet/kopete/";
+       install='kdenetwork-kopete.install'
+       cd $srcdir/build/kopete
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/kopete
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kppp() {
+       pkgdesc='Internet Dial-Up Tool'
+       depends=('kdebase-runtime' 'ppp')
+       url="http://kde.org/applications/internet/kppp/";
+       install='kdenetwork-kppp.install'
+       cd $srcdir/build/kppp
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/kppp
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krdc() {
+       pkgdesc='Remote Desktop Client'
+       depends=('kdebase-runtime' 'telepathy-qt')
+    optdepends=('libvncserver: VNC support'
+                'rdesktop: RDP support'
+                'kdebase-keditbookmarks: to edit bookmarks')
+       url="http://kde.org/applications/internet/krdc/";
+       cd $srcdir/build/krdc
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/krdc
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krfb() {
+       pkgdesc='Desktop Sharing'
+       # note on libxdamage:
+       #       not detected by namcap because libgl depends on it
+       #       but nvidia providing libgl does not depend on libxdamage
+       depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
+       cd $srcdir/build/krfb
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/krfb
+       make DESTDIR=$pkgdir install
+}

Copied: kdenetwork/repos/testing-i686/kdenetwork-kget.install (from rev 184735, 
kdenetwork/trunk/kdenetwork-kget.install)
===================================================================
--- testing-i686/kdenetwork-kget.install                                (rev 0)
+++ testing-i686/kdenetwork-kget.install        2013-05-07 16:44:51 UTC (rev 
184736)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kdenetwork/repos/testing-i686/kdenetwork-kopete.install (from rev 
184735, kdenetwork/trunk/kdenetwork-kopete.install)
===================================================================
--- testing-i686/kdenetwork-kopete.install                              (rev 0)
+++ testing-i686/kdenetwork-kopete.install      2013-05-07 16:44:51 UTC (rev 
184736)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kdenetwork/repos/testing-i686/kdenetwork-kppp.install (from rev 184735, 
kdenetwork/trunk/kdenetwork-kppp.install)
===================================================================
--- testing-i686/kdenetwork-kppp.install                                (rev 0)
+++ testing-i686/kdenetwork-kppp.install        2013-05-07 16:44:51 UTC (rev 
184736)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kdenetwork/repos/testing-i686/kdenetwork.install (from rev 184735, 
kdenetwork/trunk/kdenetwork.install)
===================================================================
--- testing-i686/kdenetwork.install                             (rev 0)
+++ testing-i686/kdenetwork.install     2013-05-07 16:44:51 UTC (rev 184736)
@@ -0,0 +1,11 @@
+post_install() {
+       xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       post_install
+}

Copied: kdenetwork/repos/testing-i686/use-libotr3.patch (from rev 184735, 
kdenetwork/trunk/use-libotr3.patch)
===================================================================
--- testing-i686/use-libotr3.patch                              (rev 0)
+++ testing-i686/use-libotr3.patch      2013-05-07 16:44:51 UTC (rev 184736)
@@ -0,0 +1,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

Copied: kdenetwork/repos/testing-x86_64/PKGBUILD (from rev 184735, 
kdenetwork/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD                             (rev 0)
+++ testing-x86_64/PKGBUILD     2013-05-07 16:44:51 UTC (rev 184736)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgbase=kdenetwork
+pkgname=('kdenetwork-filesharing'
+         'kdenetwork-kdnssd'
+         'kdenetwork-kget'
+         'kdenetwork-kopete'
+         'kdenetwork-kppp'
+         'kdenetwork-krdc'
+         'kdenetwork-krfb')
+pkgver=4.10.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
+       'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
+    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
+    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz";
+        'use-libotr3.patch')
+sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d'
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
+
+build() {
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/use-libotr3.patch
+    cd ../
+
+       mkdir build
+       cd build
+       cmake ../${pkgbase}-${pkgver} \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DKDE4_BUILD_TESTS=OFF \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
+               -DWITH_Xmms=OFF \
+               -DWITH_LibMeanwhile=OFF \
+               -DWITH_qq=OFF
+       make
+}
+
+package_kdenetwork-filesharing() {
+       pkgdesc='Konqueror properties dialog plugin to share a directory with 
the local network'
+       depends=('kdelibs' 'smbclient')
+       install='kdenetwork.install'
+       cd $srcdir/build/filesharing
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kdnssd() {
+       pkgdesc='Monitors the network for DNS-SD services'
+       depends=('kdelibs')
+       cd $srcdir/build/kdnssd
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kget() {
+       pkgdesc='Download Manager'
+       depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
+       url="http://kde.org/applications/internet/kget/";
+       install='kdenetwork-kget.install'
+       cd $srcdir/build/kget
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/kget
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kopete() {
+       pkgdesc='Instant Messenger'
+       depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
+                'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
+       url="http://kde.org/applications/internet/kopete/";
+       install='kdenetwork-kopete.install'
+       cd $srcdir/build/kopete
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/kopete
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kppp() {
+       pkgdesc='Internet Dial-Up Tool'
+       depends=('kdebase-runtime' 'ppp')
+       url="http://kde.org/applications/internet/kppp/";
+       install='kdenetwork-kppp.install'
+       cd $srcdir/build/kppp
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/kppp
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krdc() {
+       pkgdesc='Remote Desktop Client'
+       depends=('kdebase-runtime' 'telepathy-qt')
+    optdepends=('libvncserver: VNC support'
+                'rdesktop: RDP support'
+                'kdebase-keditbookmarks: to edit bookmarks')
+       url="http://kde.org/applications/internet/krdc/";
+       cd $srcdir/build/krdc
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/krdc
+       make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krfb() {
+       pkgdesc='Desktop Sharing'
+       # note on libxdamage:
+       #       not detected by namcap because libgl depends on it
+       #       but nvidia providing libgl does not depend on libxdamage
+       depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
+       cd $srcdir/build/krfb
+       make DESTDIR=$pkgdir install
+       cd $srcdir/build/doc/krfb
+       make DESTDIR=$pkgdir install
+}

Copied: kdenetwork/repos/testing-x86_64/kdenetwork-kget.install (from rev 
184735, kdenetwork/trunk/kdenetwork-kget.install)
===================================================================
--- testing-x86_64/kdenetwork-kget.install                              (rev 0)
+++ testing-x86_64/kdenetwork-kget.install      2013-05-07 16:44:51 UTC (rev 
184736)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kdenetwork/repos/testing-x86_64/kdenetwork-kopete.install (from rev 
184735, kdenetwork/trunk/kdenetwork-kopete.install)
===================================================================
--- testing-x86_64/kdenetwork-kopete.install                            (rev 0)
+++ testing-x86_64/kdenetwork-kopete.install    2013-05-07 16:44:51 UTC (rev 
184736)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kdenetwork/repos/testing-x86_64/kdenetwork-kppp.install (from rev 
184735, kdenetwork/trunk/kdenetwork-kppp.install)
===================================================================
--- testing-x86_64/kdenetwork-kppp.install                              (rev 0)
+++ testing-x86_64/kdenetwork-kppp.install      2013-05-07 16:44:51 UTC (rev 
184736)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kdenetwork/repos/testing-x86_64/kdenetwork.install (from rev 184735, 
kdenetwork/trunk/kdenetwork.install)
===================================================================
--- testing-x86_64/kdenetwork.install                           (rev 0)
+++ testing-x86_64/kdenetwork.install   2013-05-07 16:44:51 UTC (rev 184736)
@@ -0,0 +1,11 @@
+post_install() {
+       xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       post_install
+}

Copied: kdenetwork/repos/testing-x86_64/use-libotr3.patch (from rev 184735, 
kdenetwork/trunk/use-libotr3.patch)
===================================================================
--- testing-x86_64/use-libotr3.patch                            (rev 0)
+++ testing-x86_64/use-libotr3.patch    2013-05-07 16:44:51 UTC (rev 184736)
@@ -0,0 +1,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

Reply via email to