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>

4 files changed, 83 insertions, 89 deletions

diff --git a/arch/tde-libs/tde-libcaldav/PKGBUILD b/arch/tde-libs/tde-libcaldav/PKGBUILD
index ecd9051e5..2759e3d0e 100644
--- a/arch/tde-libs/tde-libcaldav/PKGBUILD
+++ b/arch/tde-libs/tde-libcaldav/PKGBUILD
@@ -1,44 +1,47 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contribuitor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libcaldav
-pkgver=14.0.10
+_mod=libcaldav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcaldav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-libs')
 depends=('curl' 'glib2')
-makedepends=('doxygen' 'pkgconfig' 'cmake')
+makedepends=('doxygen' 'tde-cmake-trinity')
 optdepends=()
-provides=('libcaldav')
-# conflicts=()
-replaces=('trinity-libcaldav')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
 install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcaldav-trinity-${pkgver}.tar.xz")
-md5sums=('3d1b4997e4789c5b3a5389f5b58fd4f0')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('75662017b1a02ffc631e5120b7addfd0')
 
 _prefix=/usr
 
 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..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${_prefix} \
       -DWITH_GCC_VISIBILITY=ON
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }
diff --git a/arch/tde-libs/tde-libcarddav/PKGBUILD b/arch/tde-libs/tde-libcarddav/PKGBUILD
index 96a67ea17..58250939e 100644
--- a/arch/tde-libs/tde-libcarddav/PKGBUILD
+++ b/arch/tde-libs/tde-libcarddav/PKGBUILD
@@ -1,41 +1,45 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty@gmail.com>
 
-pkgname=tde-libcarddav
-pkgver=14.0.10
+_mod=libcarddav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="A client library adding support for the CardDAV protocol"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcarddav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 groups=('tde-libs')
 depends=('curl')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 license=('GPL')
-provides=('libcarddav')
+provides=("${_mod}")
 # conflicts=()
-replaces=('trinity-libcarddav')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcarddav-trinity-${pkgver}.tar.xz")
-md5sums=('54a5c89bb094ec40cc8cd5734233f743')
+replaces=("trinity-${_mod}")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('79e1c4e92751eb72c843ce0ddc70e5fe')
 
 _prefix=/usr
 
 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..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${_prefix} \
       -DWITH_GCC_VISIBILITY=ON
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }
diff --git a/arch/tde-libs/tde-libkdcraw/PKGBUILD b/arch/tde-libs/tde-libkdcraw/PKGBUILD
index e6f6e58b6..9dd9cfdc2 100644
--- a/arch/tde-libs/tde-libkdcraw/PKGBUILD
+++ b/arch/tde-libs/tde-libkdcraw/PKGBUILD
@@ -1,66 +1,49 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libkdcraw
-pkgver=14.0.10
+_mod=libkdcraw
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-libs')
 depends=('tde-tdelibs' 'libraw' 'lcms2')
-makedepends=('pkgconfig' 'autoconf' 'imake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkdcraw-trinity-${pkgver}.tar.xz")
-md5sums=('fedf15518c80f85174071df185a45c88')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2daaa1a383d0ccdfd914c29db7f05c37')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-
-  msg "Copying system libtool files...."
-  cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
-  cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
-
-  msg "Running autotools, libtoolize, aclocal, autoupdate, autoconf, automake, autoreconf"
-  aclocal
-  autoupdate
-  autoconf
-  automake --add-missing
-
-  msg "Running make -f admin/Makefile.common ...."
-  make -f admin/Makefile.common
-
-  ## configure
-  msg "Configuring - ${pkgname}..."
-
-  ./configure \
-    --prefix=${TDEDIR} \
-    --with-qt-dir=${QTDIR} \
-    --with-qt-includes=${QTDIR}/include \
-    --with-qt-libraries=${QTDIR}/lib \
-    --localstatedir=/var \
-    --enable-debug=full \
-    --enable-closure
-
-  ## make $NUMJOBS
-  msg "Building - ${pkgname}..."
-  make $NUMJOBS
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
-
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}    # use for non-out-of-source
-
-  make -j1 DESTDIR="$pkgdir" install
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
 }
diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD
index 68181afa8..3d89af561 100644
--- a/arch/tde-libs/tde-libkexiv2/PKGBUILD
+++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD
@@ -1,44 +1,48 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libkexiv2
-pkgver=14.0.10
+_mod=libkexiv2
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-libs')
 depends=('tde-tdelibs' 'exiv2')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkexiv2-trinity-${pkgver}.tar.xz")
-md5sums=('0647354c2cc1da9f54cd0d0707b026a3')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('94635dfeca198fce57cb45a15d31a222')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 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..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }