From 1838e1a41f12414ad989d5f1c712ef0c62df9bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 27 Oct 2021 22:43:21 +0200
Subject: 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 arch/tde-extra/tde-tdepowersave/PKGBUILD | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'arch/tde-extra/tde-tdepowersave/PKGBUILD')

diff --git a/arch/tde-extra/tde-tdepowersave/PKGBUILD b/arch/tde-extra/tde-tdepowersave/PKGBUILD
index a9c5d20c5..968037a4b 100644
--- a/arch/tde-extra/tde-tdepowersave/PKGBUILD
+++ b/arch/tde-extra/tde-tdepowersave/PKGBUILD
@@ -2,34 +2,32 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 _mod=tdepowersave
-_cat=applications/
+_cat=applications/system/
 _kdemod="${_mod/tde/kde}"
-pkgname="tde-$_mod"
-pkgver=14.0.10
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
-pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
+pkgdesc="Trinity Desktop Enviroment - ${_mod}"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/$_mod"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
-#provides=("$_mod")
+provides=("${_mod}")
 groups=('tde-extra')
 depends=(
   'tde-tdelibs'
   'tde-dbus-1-tqt'
   'libxss'
 )
-makedepends=(
-  'cmake'
-  'pkgconfig'
-)
+makedepends=('tde-cmake-trinity')
 optdepends=()
-confilicts=("trinity-$_kdemod" "kdemod3-$_kdemod")
-#replaces=("trinity-$_mod")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
 install=
 
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R$pkgver/main/$_cat$_mod-trinity-$pkgver.tar.xz")
-md5sums=('64daecf2c9061f3797b2cab8f0ad347b')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('68686e75e26795c31d051cf84e0fd06a')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -42,17 +40,18 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
   msg "Building - ${pkgname#*-}..."
-  make VERBOSE=1 $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd "$srcdir/build"
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }
-- 
cgit v1.2.1