PKGBUILD fixes:

	kdebase: added missing xorg dependencies neede for compilation and running
		 minor fixes in kdm rc.d startscript (more elegancy)
	kdelibs: fixed dependencies
	gtk-qt-engine: fixed missing gtk2 dependency
	kdegraphics: fixed missing imlib and sane dependencies
New PKGBUILs: dolphin, kdeartwork, kdenetwork, kdepim
	libcaldav, libcarddav (pulled form old 'master' repo.

16 files changed, 631 insertions, 17 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index b157fd417..a03c45027 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -8,7 +8,24 @@ url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity - kdebase"
-depends=('hal' 'libltdl' 'trinity-dbus-1-qt3' 'trinity-arts' 'trinity-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1' 'trinity-dbus-tqt' 'trinity-kdelibs' 'openexr')
+depends=('hal'
+         'trinity-dbus-1-qt3'
+         'trinity-arts'
+         'trinity-qt3'
+         'trinity-pyqt3'
+         'trinity-dbus-tqt-1'
+         'trinity-dbus-tqt'
+         'trinity-kdelibs'
+         'openexr'
+         'libxtst'
+         'libxkbfile'
+         'xorg-server'
+         'xorg-xset'
+         'xorg-xsetroot'
+         'xorg-xprop'
+         'xorg-xmessage'
+         'xorg-xinit'
+         'xorg-iceauth')
 makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf')
 optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
         'pciutils: PCI bus configuration space access library and tools'
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity
index 48f290355..03209b456 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity
@@ -4,25 +4,27 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+PID=`pidof -o %PPID /opt/trinity/bin/kdm`
 case "$1" in
    start)
       #Check for running kdm, start when not running
-      stat_busy "Starting KDM"
-      /opt/trinity/bin/kdm
+      stat_busy "Starting TDM Desktop Manager"
+      [ -z "$PID" ] && /opt/trinity/bin/kdm &> /dev/null
 	   if [ $? -gt 0 ]; then
          stat_fail
       else
-         add_daemon kdm
+         echo $PID > /var/run/kdm.pid
+         add_daemon kdm-trinity
          stat_done
       fi
       ;;
    stop)
-      stat_busy "Stopping KDM"
-      [ -f /var/run/kdm.pid ] && kill `cat /var/run/kdm.pid` &> /dev/null
+      stat_busy "Stopping TDM Desktop Manager"
+      [ ! -z "$PID" ] && kill $PID &> /dev/null
       if [ $? -gt 0 ]; then
          stat_fail
       else
-         rm_daemon kdm
+         rm_daemon kdm-trinity
          stat_done
       fi
       ;;
@@ -35,4 +37,4 @@ case "$1" in
       echo "usage: $0 {start|stop|restart}"
       ;;
 esac
-exit 0
\ No newline at end of file
+exit 0
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
index 24f0534d3..8a9a6f194 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@@ -9,13 +9,13 @@ license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity - kdelibs, core libraries"
 depends=('libical'
-        'libxslt'
-	    'libltdl'
-        'avahi'
-        'pam-krb5'
-        'taglib'
-	'libxcomposite'
-        'trinity-arts')
+         'libxslt'
+         'libltdl'
+         'avahi'
+         'pam-krb5'
+         'taglib'
+         'libxcomposite'
+         'trinity-arts')
 makedepends=('pkgconfig' 'cmake' 'autoconf' )
 provides=('trinity-kdelibs' 'kdelibs3')
 conflicts=('trinity-kdelibs' 'kdelibs3')
diff --git a/arch/3.5.13/trinity-extras/trinity-dolphin/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-dolphin/PKGBUILD
new file mode 100644
index 000000000..6eb5c69b1
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-dolphin/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+# PKGBUILD by Pawel "l0ner" Soltys <sh4dou@gmail.com>
+
+pkgname=trinity-dolphin
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity - Do3phin file manager"
+depends=('trinity-kdebase')
+makedepends=('pkgconfig' 'cmake' 'imake')
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/dolphin-3.5.13.tar.gz)
+md5sums=('67040323c527d83978f58c76b47a91f6')
+
+_svnmod=applications/dolphin
+
+build() {
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
+  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"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD
index c9746f828..24bbf8c3a 100644
--- a/arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD
@@ -8,7 +8,7 @@ url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
 pkgdesc="Trinity - Qt wrapper for GTK, makes gtk2 apps look pretty under TDE"
-depends=('trinity-kdebase')
+depends=('trinity-kdebase' 'gtk2')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/gtk-qt-engine-3.5.13.tar.gz)
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
new file mode 100644
index 000000000..6d5d3fae2
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+# PKGBUILD by Pawel "l0ner" Soltys <sh4dou@gmail.com>
+
+pkgname=trinity-kdeartwork
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity - kdeartwork artwork collection"
+depends=('trinity-kdebase' 'trinity-arts' 'xscreensaver' 'libart-lgpl' 'glproto')
+makedepends=('pkgconfig' 'cmake' 'imake')
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeartwork-3.5.13.tar.gz)
+md5sums=('24f85eb3e5a9106de48a3e81d2575ffe')
+
+_svnmod=kdeartwork
+
+build() {
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
+  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"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DWITH_XSCREENSAVER=ON \
+    -DWITH_LIBART=ON \
+    -DWITH_OPENGL=ON \
+    -DWITH_ARTS=ON \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
index 5cdd79aac..96444bc34 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
@@ -8,7 +8,7 @@ url='http://www.trinitydesktop.com'
 license=('GPL')
 groups=('trinity-extras')
 pkgdesc="Trinity - kdegraphics"
-depends=('trinity-kdebase' 'libart-lgpl' 'libgphoto2' 'libtiff' 'openexr' 't1lib')
+depends=('trinity-kdebase' 'libart-lgpl' 'libgphoto2' 'libtiff' 'openexr' 't1lib' 'imlib' 'sane')
 makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi')
 # 'poppler-qt'
 optdepends=('xscreensaver: Screen saver and locker for the X Window System')
diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
new file mode 100644
index 000000000..945b941fe
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
@@ -0,0 +1,66 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+# PKGBUILD by Pawel "l0ner" Soltys <sh4dou@gmail.com>
+
+pkgname=trinity-kdenetwork
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity - kdenetwork network utilities"
+depends=('trinity-kdebase' 
+         'trinity-arts' 
+         'speex' 
+         'gsmlib-git'
+         'libgadu'
+         'meanwhile'
+         'sqlite3'
+         'libidn'
+         'v4l-utils'
+         )
+makedepends=('pkgconfig' 'cmake' 'imake')
+options=('libtool' '!strip')
+source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch')
+md5sums=('349f197c9af4bf0d9b8773f26829415e'
+         '8abe1847df7b7449027719238a27e359')
+
+_svnmod=kdenetwork
+
+build() {
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
+  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"
+
+  patch -N -d ${srcdir} -p0 < kdenetwork.patch
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DWITH_JINGLE=ON \
+    -DWITH_SPEEX=ON \
+    -DWITH_WEBCAM=ON \
+    -DWITH_GSM=ON \
+    -DWITH_ARTS=ON \
+    -DBUILD_KOPETE_PROTOCOL_ALL=ON \
+    -DBUILD_KOPETE_PLUGIN_ALL=ON \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch b/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch
new file mode 100644
index 000000000..9459677fe
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch
@@ -0,0 +1,180 @@
+diff -u -r kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp src/kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp
+--- kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp	2011-08-12 22:11:02.000000000 +0200
++++ src/kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp	2011-12-15 23:25:02.000000000 +0100
+@@ -75,7 +75,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)
+ #define _LINUX_TIME_H
+ #endif
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #define DEF_WIDTH			352
+ #define DEF_HEIGHT		288
+diff -u -r kdenetwork/kopete/protocols/jabber/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/CMakeLists.txt
+--- kdenetwork/kopete/protocols/jabber/CMakeLists.txt	2011-06-22 03:37:12.000000000 +0200
++++ src/kdenetwork/kopete/protocols/jabber/CMakeLists.txt	2011-12-15 22:56:58.000000000 +0100
+@@ -80,6 +80,6 @@
+     jabberclient-static kopetejabberui-static
+     iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static
+     qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES}
+-    kopete-shared
++    kopete-shared idn
+   DESTINATION ${PLUGIN_INSTALL_DIR}
+ )
+diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h
+--- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h	2011-06-22 03:37:10.000000000 +0200
++++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h	2011-12-15 22:56:58.000000000 +0100
+@@ -80,6 +80,7 @@
+ 
+ #include <set>
+ #include <list>
++#include <stdlib.h>
+ 
+ // 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
+@@ -35,7 +35,7 @@
+ tde_add_kpart( kio_jabberdisco AUTOMOC
+   SOURCES jabberdisco.cpp
+   LINK
+-    jabberclient-static
++    jabberclient-static idn
+     iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
+     qca-static cutestuff_network-static cutestuff_util-static kio-shared
+   DESTINATION ${PLUGIN_INSTALL_DIR}
+diff -u -r kdenetwork/kopete/protocols/msn/CMakeLists.txt src/kdenetwork/kopete/protocols/msn/CMakeLists.txt
+--- kdenetwork/kopete/protocols/msn/CMakeLists.txt	2011-06-22 03:37:22.000000000 +0200
++++ src/kdenetwork/kopete/protocols/msn/CMakeLists.txt	2011-12-15 22:56:58.000000000 +0100
+@@ -47,7 +47,7 @@
+ 
+ tde_add_kpart( kopete_msn AUTOMOC
+   SOURCES
+-    dummy.cpp webcam.cpp
++    webcam.cpp
+   LINK kopete_msn_shared-shared
+   DESTINATION ${PLUGIN_INSTALL_DIR}
+ )
+diff -u -r kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp src/kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp
+--- kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp	2011-08-12 22:11:37.000000000 +0200
++++ src/kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp	2011-12-15 22:56:58.000000000 +0100
+@@ -54,7 +54,7 @@
+ #include "kopetemessage.h"
+ #include "kopetecontact.h"
+ #include "kopeteuiglobal.h"
+-#include "kopeteemoticons.h"
++#include "private/kopeteemoticons.h"
+ //#include "kopeteaccountmanager.h"
+ //#include "kopeteprotocol.h"
+ 
+diff -u -r kdenetwork/kopete/protocols/sms/services/smsclient.cpp src/kdenetwork/kopete/protocols/sms/services/smsclient.cpp
+--- kdenetwork/kopete/protocols/sms/services/smsclient.cpp	2011-08-12 22:11:13.000000000 +0200
++++ src/kdenetwork/kopete/protocols/sms/services/smsclient.cpp	2011-12-15 22:56:58.000000000 +0100
+@@ -67,7 +67,7 @@
+ 		return;
+ 	}
+ 
+-	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString());
++	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"));
+ 	if (programName.isNull())
+ 		programName = "/usr/bin/sms_client";
+ 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
new file mode 100644
index 000000000..8abc24251
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
@@ -0,0 +1,89 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdepim
+pkgver=3513
+pkgrel=1.0
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.com'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity - kdepim"
+depends=(
+         'trinity-kdebase'
+         'trinity-arts'
+         'trinity-kdelibs'
+         'gpgme'
+         'boost'
+         'gnokii'
+         'trinity-libcaldav'
+         'trinity-libcarddav')
+makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi')
+# 'poppler-qt'
+provides=('trinity-kdepim')
+conflicts=('trinity-kdepim')
+replaces=('trinity-kdepim')
+options=('libtool' '!strip')
+source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdepim-3.5.13.tar.gz')
+md5sums=('4488062d5400bdd99642fe0b72ebcf9a')
+
+_svnmod=kdepim
+trinity_prefix="/opt/trinity"
+
+build() {
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+    [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+
+   export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include
+   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+   export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DWITH_SASL=ON \
+    -DWITH_NEWDISTRLISTS=ON \
+    -DWITH_GNOKII=ON \
+    -DWITH_EXCHANGE=ON \
+    -DWITH_EGROUPWARE=ON \
+    -DWITH_KOLAB=ON \
+    -DWITH_SLOX=ON \
+    -DWITH_GROUPWISE=ON \
+    -DWITH_FEATUREPLAN=ON \
+    -DWITH_GROUPDAV=ON \
+    -DWITH_BIRTHDAYS=ON \
+    -DWITH_NEWEXCHANGE=ON \
+    -DWITH_SCALIX=ON \
+    -DWITH_CALDAV=ON \
+    -DWITH_CARDDAV=ON \
+    -DWITH_INDEXLIB=ON \
+    -DWITH_ARTS=ON \
+    -DBUILD_ALL=ON
+  make
+
+#     -DWITH_PDF=ON \ (waiting on poppler-qt3)
+#     -DWITH_QT3=ON \
+#     -DQTDIR=/opt/qt \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+  cd ${startdir}
+}
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/Changelog.patch b/arch/3.5.13/trinity-extras/trinity-libcaldav/Changelog.patch
new file mode 100644
index 000000000..db579b99b
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-libcaldav/Changelog.patch
@@ -0,0 +1,12 @@
+--- libcaldav-0.6.5/ChangeLog
++++ libcaldav-0.6.5/ChangeLog	2011-05-08 00:56:11.000000000 -0500
+@@ -1,3 +1,9 @@
++libcaldav (0.6.5)
++  * Fix bug to be able to integrate the debian libcaldav
++    source with Arch PKGBUILD Patch provided by Timothy Pearson
++
++-- David Rankin <drankinatty@gmail.com>  Sun, 8 May 2011 22:51:03 +0100
++
+ libcaldav (0.6.2)
+   * Fix bug to be able to handle HTTP HEADER lines split
+     over multiple lines. Patch provided by Timothy Pearson
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.am.patch b/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.am.patch
new file mode 100644
index 000000000..37a673219
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.am.patch
@@ -0,0 +1,11 @@
+--- libcaldav-0.6.5/src/Makefile.am
++++ libcaldav-0.6.5/src/Makefile.am	2011-05-08 01:16:47.000000000 -0500
+@@ -37,7 +37,7 @@
+ 			get-freebusy-report.c \
+ 			get-freebusy-report.h
+ 
+-libcaldav_includedir=$(includedir)/libcaldav-@VERSION@
++libcaldav_includedir=$(includedir)/libcaldav
+ libcaldav_include_HEADERS = caldav.h
+ 
+ noinst_HEADERS = \
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.in.patch b/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.in.patch
new file mode 100644
index 000000000..cb0ad466a
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.in.patch
@@ -0,0 +1,11 @@
+--- libcaldav-0.6.5/src/Makefile.in
++++ libcaldav-0.6.5/src/Makefile.in	2011-05-08 01:16:15.000000000 -0500
+@@ -284,7 +284,7 @@
+ 			get-freebusy-report.c \
+ 			get-freebusy-report.h
+ 
+-libcaldav_includedir = $(includedir)/libcaldav-@VERSION@
++libcaldav_includedir = $(includedir)/libcaldav
+ libcaldav_include_HEADERS = caldav.h
+ noinst_HEADERS = \
+ 			add-caldav-object.h \
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD
new file mode 100644
index 000000000..c704e5020
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+#
+
+pkgname=trinity-libcaldav
+pkgver=0.6.5
+_pkgsuffix=2debian2
+pkgrel=1
+pkgdesc="A client library adding support for the CalDAV protocol"
+arch=('i686' 'x86_64')
+url="http://www.trinitydesktop.org"
+groups=('trinity-extras')
+depends=('doxygen' 'curl')
+license=('GPL')
+provides=('trinity-libcaldav' 'libcaldav')
+conflicts=('libcaldav')
+replaces=('trinity-libcaldav')
+source=("http://quickbuild.pearsoncomputing.net:58080/2055979/libcaldav_0.6.5-2debian2.tar.gz" "Changelog.patch" "Makefile.am.patch" "Makefile.in.patch")
+md5sums=('fba66a6c605a6d7be67a638cd29667b6'
+         '184818aedf65459ad3f9c0741462f85a'
+         '5ce5bd3c1ed4d5004a864130a971f737'
+         'c136e14af1923c2cf6dc5beb93da2ba4')
+
+_prefix=/usr
+
+build() {
+
+  # patch for Changelog version
+  patch -p0 -i ${srcdir}/Changelog.patch || return 1
+  patch -p0 -i ${srcdir}/Makefile.am.patch || return 1
+  patch -p0 -i ${srcdir}/Makefile.in.patch || return 1
+
+  cd ${srcdir}/libcaldav-${pkgver}
+  msg "Running ./autogen.sh for autoreconf"
+  ./autogen.sh --prefix=${_prefix}
+#    --includedir=/usr/include
+#   msg "Running configure"
+#   ./configure --prefix=${_prefix}
+
+  make || return 1
+}
+
+package() {
+  cd ${srcdir}/libcaldav-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD
new file mode 100644
index 000000000..c88252ffe
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+#
+
+pkgname=trinity-libcarddav
+pkgver=0.6.2
+_pkgsuffix=2debian2
+pkgrel=1
+pkgdesc="A client library adding support for the CardDAV protocol"
+arch=('i686' 'x86_64')
+url="http://www.trinitydesktop.org/"
+groups=('trinity-extras')
+depends=('curl')
+license=('GPL')
+provides=('trinity-libcarddav' 'libcarddav')
+conflicts=('libcarddav')
+replaces=('trinity-libcarddav')
+# http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_0.6.2-2debian2.tar.gz
+source=("http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_${pkgver}-${_pkgsuffix}.tar.gz" "libcarddav.patch")
+md5sums=('42a0fe57ba4c639aad53024f6c8d5614'
+         '63ef0b91ff27dfb7c48ca0f07866af79')
+
+_prefix=/usr
+
+build() {
+   cd ${srcdir}
+
+   # apply libcarddav patch
+   msg "Applying Patch: libcarddav.patch"
+   patch -uNp2 -i ${srcdir}/libcarddav.patch || return 1
+
+   cd ${srcdir}/libcarddav-${pkgver}
+   msg "Running ./autogen.sh for autoreconf"
+   ./autogen.sh --prefix=${_prefix}
+   #   msg "Running configure"
+   #   ./configure --prefix=${_prefix}
+
+   make || return 1
+}
+
+package() {
+   cd ${srcdir}/libcarddav-${pkgver}
+   make DESTDIR=${pkgdir} install
+}
diff --git a/arch/3.5.13/trinity-extras/trinity-libcarddav/libcarddav.patch b/arch/3.5.13/trinity-extras/trinity-libcarddav/libcarddav.patch
new file mode 100644
index 000000000..00621d45e
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-libcarddav/libcarddav.patch
@@ -0,0 +1,38 @@
+diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/ChangeLog trinity-libcarddav//src/libcarddav-0.6.2/ChangeLog
+--- trinity-libcarddav-orig//src/libcarddav-0.6.2/ChangeLog 2010-07-21 02:57:45.000000000 -0500
++++ trinity-libcarddav//src/libcarddav-0.6.2/ChangeLog   2011-05-08 14:08:07.000000000 -0500
+@@ -1,3 +1,9 @@
++libcarddav (0.6.2)
++  * Update Changelog to correct version. Includes patch
++    provided by Timothy Pearson
++
++-- David Rankin <drankinatty@gmail.com>  Sun, 8 May 2011 22:51:03 +0100
++
+ libcarddav (0.6.1)
+   * Fix redirection bug to fully support Zimbra server. Patch
+     provided by Timothy Pearson
+diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.am trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.am
+--- trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.am 2010-07-21 02:57:45.000000000 -0500
++++ trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.am   2011-05-08 14:08:37.000000000 -0500
+@@ -35,7 +35,7 @@
+                        lock-carddav-object.c \
+                        lock-carddav-object.h
+
+-libcarddav_includedir=$(includedir)/libcarddav-@VERSION@
++libcarddav_includedir=$(includedir)/libcarddav
+ libcarddav_include_HEADERS = carddav.h
+
+ noinst_HEADERS = \
+diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.in trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.in
+--- trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.in  2010-07-21 02:57:45.000000000 -0500
++++ trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.in 2011-05-08 14:09:05.000000000 -0500
+@@ -278,7 +278,7 @@
+                        lock-carddav-object.c \
+                        lock-carddav-object.h
+
+-libcarddav_includedir = $(includedir)/libcarddav-@VERSION@
++libcarddav_includedir = $(includedir)/libcarddav
+ libcarddav_include_HEADERS = carddav.h
+ noinst_HEADERS = \
+                     add-carddav-object.h \
+