1 files changed, 25 insertions, 49 deletions
diff --git a/arch/tde-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD
index e326ce774..f3a415a06 100644
--- a/arch/tde-extra/tde-tdeedu/PKGBUILD
+++ b/arch/tde-extra/tde-tdeedu/PKGBUILD
@@ -1,75 +1,51 @@
 # Maintainer: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-tdeedu
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="Educational 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' 'autoconf')
+makedepends=('pkgconfig' 'cmake' 'texlive-bin')
 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}/tdeedu-R${pkgver}.tar.bz2"
-        "kmplot.patch")
-md5sums=('b6ceb82d93d19e3862dfb01c45457774'
-         '3b00bf93b77d020d69d9d92ef80041d2')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeedu-trinity-${pkgver}.tar.xz"
+        'bp000-0cb84fb9.diff')
+md5sums=('3859da24d70f0d787c0cc7f41540772d'
+         '5ae3959dc2dc62f1f7421620b198d175')
 
-build() {
-  cd ${srcdir}/${pkgname#*-}
-  ## Generate config files and update with autoreconf
-
-  msg "Patching for kmplot..."
-  patch -p1 -i ${srcdir}/kmplot.patch
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
-  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
+build() {
+   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+   patch -p1 < ${srcdir}/bp000-0cb84fb9.diff
 
-  ## 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
+   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
-
-#  # remove icons that conflict with tdelibs
-#  msg "Removing kttsd.png icons that conflict with tdelibs..."
-#  rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/16x16/apps/kttsd.png
-#  rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/22x22/apps/kttsd.png
-#  rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/32x32/apps/kttsd.png
-#  rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/48x48/apps/kttsd.png
-#  rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/64x64/apps/kttsd.png
-#  rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/128x128/apps/kttsd.png
-#  rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/scalable/apps/kttsd.svgz
+  cd ${srcdir}/build
+  make -j1 DESTDIR="${pkgdir}" install
 }