1 files changed, 32 insertions, 36 deletions
diff --git a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
index b23465403..cbe5cf1d2 100644
--- a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
+++ b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
@@ -1,54 +1,50 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-twin-style-crystal
-pkgver=14.0.10
+_mod=twin-style-crystal
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE TWin Style Crystal"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-#provides=('twin-style-crystal')
-#conflicts=('twin-style-crystal')
-#replaces=('twin-style-crystal')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_kdemod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/twin-style-crystal-trinity-${pkgver}.tar.xz")
-md5sums=('b87b5ad84ba492e6e56c583c05ba4d40')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('b435ddeae50565fd440dc3705f503218')
+install=''
 
 [ -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 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 \
-    --sysconfdir=${TDEDIR}/etc \
-    --localstatedir=/var \
-    --enable-closure
-
-  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}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
 }