ArchLinux: Update to R14.0.11

+ Add standalone package tde-cmake-trinity
+ Switch CMake builds to use Ninja
+ Switch some packages to CMake
+ Add tde-tqca and tde-akode
+ Add tde-i18n packages

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 25 insertions, 27 deletions

diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
index 85f569247..10a18556e 100644
--- a/arch/tde-core/tde-tdebase/PKGBUILD
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -1,16 +1,19 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname='tde-tdebase'
-pkgver=14.0.10
-pkgrel=2
+_mod=tdebase
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
 pkgdesc="Trinity Desktop Enviroment base components"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdebase'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
-provides=('tdebase')
+provides=("${_mod}")
 groups=('tde-core')
-# depends=('hal'
 depends=('libraw1394'
          'libxtst'
          'libxss'
@@ -23,15 +26,12 @@ depends=('libraw1394'
          'xorg-xinit'
          'htdig'
          'openssl-1.0')
-makedepends=('autoconf'
-	     'cmake'
-	     'imake'
-	     'pkgconfig'
-	     'libxkbfile'
-	     'smbclient'
-             'rpcsvc-proto'
-	     'xorg-bdftopcf'
-             'xscreensaver')
+makedepends=('tde-cmake-trinity'
+         'libxkbfile'
+         'smbclient'
+         'rpcsvc-proto'
+         'xorg-bdftopcf'
+         'xscreensaver')
 optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
             'pciutils: PCI bus configuration space access library and tools'
             'samba: file sharing over SMB'
@@ -44,12 +44,12 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
             'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)'
             'xorg-fonts-75dpi: X.org 75dpi fonts collection'
             'xscreensaver: Screen saver and locker for the X Window System')
-confilicts=('trinity-kdebase ''kdemod3-kdebase')
-replaces=('trinity-tdebase')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-install='trinity-tdebase.install'
+install="trinity-${_mod}.install"
 
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
         'agent-shutdown.sh'
         'agent-startup.sh'
         'tdm-trinity'
@@ -57,7 +57,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/
         'tdm.service'
         'xsession.patch')
 
-md5sums=('bca895dfc2b88c4b74e307d5690108bf'
+md5sums=('38d71c4d3fa51219b4f734b9d862308e'
          '18e8d01124b19f7df2937c06e177bf7f'
          'c963ef6e37c9051119972a58c67f05fb'
          'bb4c25e560fa719e8e8f49ef80bd1c99'
@@ -68,16 +68,16 @@ md5sums=('bca895dfc2b88c4b74e307d5690108bf'
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
 
   msg "Starting cmake..."
 
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DWITH_SASL=ON \
@@ -89,8 +89,6 @@ build() {
     -DWITH_XFIXES=ON \
     -DWITH_XRANDR=ON \
     -DWITH_XRENDER=ON \
-    -DWITH_XDAMAGE=ON \
-    -DWITH_XEXT=ON \
     -DWITH_XTEST=ON \
     -DWITH_OPENGL=ON \
     -DWITH_XSCREENSAVER=ON \
@@ -111,13 +109,13 @@ build() {
     -DTDM_PAM_SERVICE=tde \
     -DTDESCREENSAVER_PAM_SERVICE=tde-screensaver
 
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd $srcdir/build
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 
   # install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions)
   install -d -m755 ${pkgdir}/usr/share/xsessions