kdebase: fixes in patches

	split PKGBUILD

2 files changed, 88 insertions, 40 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index 022189a58..f40f55b46 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 
-pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-kate' 'trinity-konqueror')
+pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-console' 'trinity-kate' 'trinity-konqueror')
 pkgver=3513
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -11,16 +11,14 @@ groups=('trinity-base')
 pkgdesc="Trinity Desktop Enviroment base components"
 depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal'
          'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth'
-         'libxtst')
-         # 'libltdl'
-         # 'openexr'
-         # 'libxkbfile'
+         'libxtst' 'libraw1394')
 
-makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient')
 optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
             'pciutils: PCI bus configuration space access library and tools'
             'xscreensaver: Screen saver and locker for the X Window System'
-            'xorg-fonts-75dpi: X.org 75dpi fonts collection')
+            'xorg-fonts-75dpi: X.org 75dpi fonts collection'
+            'samba: file sharing over SMB')
 confilicts=('kdemod3-kdebase')
 options=('libtool')
 source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 
@@ -33,7 +31,7 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz'
         'kdm-trinity' 
         'trinity.desktop')
 md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
-         '22160aaf726fbd1a58b2f4c5483e51fb'
+         '327e4d68bd1fc4d29bdb273e81f90415'
          '895f5d7351aa73ba1f57b0ad27081d69'
          'bb3004513d703d6b72ce70aa240af3a3'
          'e6afdd7ca60c4c59b851135785347e75'
@@ -51,7 +49,7 @@ build() {
    [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
    [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
-   export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
+   #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
    #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr
    #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH
    #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH
@@ -67,19 +65,14 @@ build() {
    #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt
 
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
+   mkdir -p ../build
+   cd ../build
 
    msg "Starting cmake..."
-   cmake ${srcdir}/kdebase --debug-output \
+   cmake ${srcdir}/kdebase \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DQT_VERSION=3 \
       -DSYSCONF_INSTALL_DIR=/etc \
       -DWITH_XFIXES=ON \
-      -DWITH_HAL=ON \
-      -DWITH_ARTS=ON \
-      -DWITH_SASL=ON \
-      -DWITH_OPENEXR=ON \
       -DWITH_XCOMPOSITE=ON \
       -DWITH_XCURSOR=ON \
       -DWITH_XRANDR=ON \
@@ -90,36 +83,50 @@ build() {
       -DWITH_XINERAMA=ON \
       -DWITH_XEXT=ON \
       -DWITH_PAM=ON \
-      -DBUILD_ALL=ON \
-      -DCMAKE_INCLUDE_DIR=$QTDIR/include/tqt
+      -DWITH_HAL=ON \
+      -DWITH_ARTS=ON \
+      -DWITH_SASL=ON \
+      -DWITH_OPENEXR=ON \
+      -DWITH_SAMBA=ON \
+      -DWITH_LIBUSB=ON \
+      -DWITH_LDAP=ON \
+      -DWITH_LIBRAW1394=ON \
+      -DWITH_I8K=ON \
+      -DBUILD_ALL=ON 
    make
 
-      #-DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0 \
-
 }
 
 package_trinity-kdebase() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/build
+   pkgdesc='Trinity Desktop Enviroment'
 
-   make DESTDIR="$pkgdir" install
+   msg "Packaging - $pkgname-$pkgver"
+   _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol 
+                  kdcop kdebugdialog kdeeject kdepasswd kdeprint kdesktop 
+                  kdesu kdialog kfind khelpcenter khotkeys kicker kioslave 
+                  klipper kmenuedit knetattach kpager kpersonalizer kreadconfig 
+                  krootbacking kscreensaver ksmserver ksplashml kstart ksysguard 
+                  ksystraycmd ktip kwin l10n kxkb nsplugins pics tqt3integration 
+                  tsak doc/faq doc/glossary doc/kcontrol doc/kdcop 
+                  doc/kdebugdialog doc/kdeprint doc/kdesu doc/kfind
+                  doc/khelpcenter doc/kicker doc/kinfocenter doc/kioslave 
+                  doc/klipper doc/kmenuedit doc/knetattach doc/kompmgr doc/kpager 
+                  doc/ksplashml doc/ksysguard doc/kxkb doc/quickstart 
+                  doc/userguide doc/visualdict"
+   for _dir in $_splitfolders; do
+      cd ${srcdir}/build/$_dir
+      make DESTDIR="$pkgdir" install
+   done
 
    # install X11 session file
    install -d -m755 ${pkgdir}/etc/X11/sessions
    install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop
 
-   # update the Xsession file, this resolves problem with kdm dropping back
-   # to the login screen
-   patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch
-
    # create the starttrinity link
    # do we need this? wouldn't be better to rename startkde script
    # to starttrinity? Well, whathever. 
    ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
 
-   # install kdm rc.d script. We need this to start kdm from rc.d
-   install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
-   
    # install mkpamserv script, so we can auto-generate pam.d configs in post_install()
    install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
 
@@ -127,11 +134,6 @@ package_trinity-kdebase() {
    # in the config file doens't exist. Maybe this should be provided by dbus bindings?
    # No, after riconsidering I'm not gonna provide it unless it's required.
 
-   # Add image for default user avatar. This removes kdm complains about missing
-   # default avatar from kdm.log
-   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
-   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
-
    # Install nice arch logo to use in the shutdown dialog
    install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png
 
@@ -152,11 +154,57 @@ package_trinity-kdebase() {
 }
 
 package_trinity-kdm() {
-pkgdesc="Trinity Display Manager"
+   pkgdesc="Trinity Display Manager"
+
+   msg "Packaging - $pkgname-$pkgver"
+   _splitfolders="kdm kdmlib doc/kdm"
+   for _dir in $_splitfolders; do
+      cd ${srcdir}/build/$_dir
+      make DESTDIR="$pkgdir" install
+   done
+
+   # update the Xsession file, this resolves problem with kdm dropping back
+   # to the login screen
+   patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch
+   
+   # install kdm rc.d script. We need this to start kdm from rc.d
+   install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
+
+   # Add image for default user avatar. This removes kdm complains about missing
+   # default avatar from kdm.log
+   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
+   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
 }
+
+package_trinity-console() {
+   pkgdesc="Trinity - an X termnal emulator"
+
+   msg "Packaging - $pkgname-$pkgver"
+   _splitfolders="konsole doc/konsole"
+   for _dir in $_splitfolders; do
+      cd ${srcdir}/build/$_dir
+      make DESTDIR="$pkgdir" install
+   done
+}
+
 package_trinity-kate() {
-pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface"
+   pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface"
+
+   msg "Packaging - $pkgname-$pkgver"
+   _splitfolders="kate doc/kate doc/kwrite"
+   for _dir in $_splitfolders; do
+      cd ${srcdir}/build/$_dir
+      make DESTDIR="$pkgdir" install
+   done
 }
+
 package_trinity-konqueror() {
-pkgdesc="Trinity Swiss Army application, file and web browser."
+   pkgdesc="Trinity Swiss Army application, file and web browser."
+
+   msg "Packaging - $pkgname-$pkgver"
+   _splitfolders="konqueror libkonq doc/konqueror"
+   for _dir in $_splitfolders; do
+      cd ${srcdir}/build/$_dir
+      make DESTDIR="$pkgdir" install
+   done
 }
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
index 31a31d946..0a0b90c54 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2