ArchLinux: Update tdeaccessibility, tdeaddons, tdeedu and tdetoys to R14.0.10.

Backport patches to tdeedu to resolve FTBFS.
Switch tdeaccessibility and tdeedu to CMake.

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

1 files changed, 21 insertions, 35 deletions

diff --git a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
index b95da285b..01f04aa99 100644
--- a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
+++ b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
@@ -1,60 +1,46 @@
 # Maintainer: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-tdeaccessibility
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="Accessibility utilities for the TDE Desktop"
 arch=('i686' 'x86_64')
-url="http://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake')
+makedepends=('pkgconfig' 'cmake' 'tde-tdemultimedia')
 optdepends=()
 provides=("${pkgname#*-}")
 conflicts=("trinity-${pkgname#*-}")
 replaces=("trinity-${pkgname#*-}")
 options=('staticlibs' 'libtool' '!emptydirs')
 # install='pkgname.install'
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdeaccessibility-R${pkgver}.tar.bz2")
-md5sums=('e6b46859ddc8bb22e6b4e5cd21f989e1')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaccessibility-trinity-${pkgver}.tar.xz")
+md5sums=('0fb53257ee9b5dbd464a6ca8f30ef5b6')
 
-build() {
-  cd ${srcdir}/${pkgname#*-}
-  ## Generate config files and update with autoreconf
-
-  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 make -f admin/Makefile.common ...."
-  make -f admin/Makefile.common
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
-  ## configure
-  msg "Configuring - ${pkgname}..."
-  ./configure \
-    --prefix=${TDEDIR} \
-    --with-qt-dir=${QTDIR} \
-    --with-extra-libs=${TDEDIR}/lib/trinity \
-    --localstatedir=/var \
-    --enable-kttsd-epos=no \
-    --enable-kttsd-festivalint=no \
-    --enable-kttsd-flite=no \
-    --enable-kttsd-freetts=no \
-    --enable-kttsd-hadifix=no \
-    --enable-debug=full \
-    --enable-closure
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
 
-  msg "Building - ${pkgname}..."
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
-  make $NUMJOBS
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON
 
+   msg "Building - ${pkgname#*-}..."
+   make $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-
-  cd ${srcdir}/${pkgname#*-}            # use for non-out-of-source
-
-  make -j1 DESTDIR="$pkgdir" install
+  cd ${srcdir}/build
+  make -j1 DESTDIR="${pkgdir}" install
 }