kdenetwork: fixed FTBFS on missing tqname.{h,cc}, removed useless stuff, changed maintainer

2 files changed, 25 insertions, 109 deletions

diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
index d7265d8d9..82d8bebab 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-# PKGBUILD by Pawel "l0ner" Soltys <sh4dou@gmail.com>
+# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
 
 pkgname=trinity-kdenetwork
 pkgver=3513
@@ -11,7 +11,7 @@ groups=('trinity-extras')
 pkgdesc="Trinity network utilities"
 depends=('trinity-kdebase' 
          'trinity-arts' 
-         'speex' 
+         'speex' 'wireless_tools'
          'gsmlib-git'
          'libgadu'
          'meanwhile'
@@ -21,11 +21,8 @@ depends=('trinity-kdebase'
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
 source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch')
-source=('http://anduin.linuxfromscratch.org/sources/trinity/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch')
 md5sums=('349f197c9af4bf0d9b8773f26829415e'
-         '8abe1847df7b7449027719238a27e359')
-
-_svnmod=kdenetwork
+         'ee468902b7c40ac1cc86cbaababa35dc')
 
 build() {
   msg "Setting PATH, CMAKE and Trinity Environment variables"
@@ -34,9 +31,11 @@ build() {
   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
   export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
 
-  trinity_prefix="/opt/trinity"
+  _prefix="/opt/trinity"
 
-  patch -N -d ${srcdir} -p0 < kdenetwork.patch
+  patch -p0 -i ${srcdir}/kdenetwork.patch
+  mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.cc
+  mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.h
 
   cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
@@ -44,8 +43,8 @@ build() {
   cd build
 
   msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+  cmake ${srcdir}/kdenetwork \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_JINGLE=ON \
     -DWITH_SPEEX=ON \
diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch b/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch
index 9459677fe..7da894f5f 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch
+++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch
@@ -32,104 +32,6 @@ diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot
  
  // On our copy of sigslot.h, we force single threading
  #define SIGSLOT_PURE_ISO
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc	2011-06-22 03:37:08.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc	2011-12-15 22:56:58.000000000 +0100
-@@ -31,7 +31,7 @@
- #include "talk/p2p/client/sessionclient.h"
- #include "talk/p2p/base/helpers.h"
- #include "talk/base/logging.h"
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- #include "talk/xmpp/constants.h"
- #include "talk/xmllite/xmlprinter.h"
- #include <iostream>
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc	2011-06-22 03:37:11.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc	2011-12-15 22:56:58.000000000 +0100
-@@ -28,7 +28,7 @@
- #include <string>
- #include "talk/base/common.h"
- #include "talk/xmllite/xmlelement.h"
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- #include "talk/xmllite/xmlconstants.h"
- 
- //#define new TRACK_NEW
-Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.cc
-Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.h
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc	2011-06-22 03:37:11.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc	2011-12-15 22:56:58.000000000 +0100
-@@ -32,7 +32,7 @@
- 
- #include "talk/base/common.h"
- #include "talk/xmllite/xmlelement.h"
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- #include "talk/xmllite/xmlparser.h"
- #include "talk/xmllite/xmlbuilder.h"
- #include "talk/xmllite/xmlprinter.h"
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h	2011-06-22 03:37:11.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h	2011-12-15 22:56:58.000000000 +0100
-@@ -31,7 +31,7 @@
- #include <iosfwd>
- #include <string>
- #include "talk/base/scoped_ptr.h"
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- 
- namespace buzz {
- 
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h	2011-06-22 03:37:11.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h	2011-12-15 22:56:58.000000000 +0100
-@@ -31,7 +31,7 @@
- #include <string>
- #include "talk/base/scoped_ptr.h"
- #include "talk/base/stl_decl.h"
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- 
- namespace buzz {
- 
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc	2011-06-22 03:37:09.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc	2011-12-15 22:56:58.000000000 +0100
-@@ -29,7 +29,7 @@
- #include "talk/base/basicdefs.h"
- #include "talk/xmllite/xmlconstants.h"
- #include "talk/xmllite/xmlelement.h"
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- #include "talk/xmpp/jid.h"
- #include "talk/xmpp/constants.h"
- namespace buzz {
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h	2011-06-22 03:37:09.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h	2011-12-15 22:56:58.000000000 +0100
-@@ -29,7 +29,7 @@
- #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_
- 
- #include <string>
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- #include "talk/xmpp/jid.h"
- 
- 
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h	2011-06-22 03:37:09.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h	2011-12-15 22:56:58.000000000 +0100
-@@ -30,7 +30,7 @@
- 
- // also part of the API
- #include "talk/xmpp/jid.h"
--#include "talk/xmllite/tqname.h"
-+#include "talk/xmllite/qname.h"
- #include "talk/xmllite/xmlelement.h"
- 
- 
 diff -u -r kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt
 --- kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt	2011-06-22 03:37:08.000000000 +0200
 +++ src/kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt	2011-12-15 22:56:58.000000000 +0100
@@ -178,3 +80,18 @@ diff -u -r kdenetwork/kopete/protocols/sms/services/smsclient.cpp src/kdenetwork
  	if (programName.isNull())
  		programName = "/usr/bin/sms_client";
  
+diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt
+--- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt	2011-06-22 03:37:11.000000000 +0200
++++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt	2012-01-24 12:10:06.000000000 +0100
+@@ -23,6 +23,6 @@
+ 
+ tde_add_library( cricketxmllite STATIC_PIC
+   SOURCES
+-    qname.cc xmlbuilder.cc xmlconstants.cc xmlelement.cc xmlnsstack.cc
++    tqname.cc xmlbuilder.cc xmlconstants.cc xmlelement.cc xmlnsstack.cc
+     xmlparser.cc xmlprinter.cc
+ )
+Only in kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: qname.cc
+Only in kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: qname.h
+Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.cc
+Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.h