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-systemsettings/PKGBUILD | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'arch/tde-extra/tde-systemsettings')

diff --git a/arch/tde-extra/tde-systemsettings/PKGBUILD b/arch/tde-extra/tde-systemsettings/PKGBUILD
index b92314db6..faaa47b1c 100644
--- a/arch/tde-extra/tde-systemsettings/PKGBUILD
+++ b/arch/tde-extra/tde-systemsettings/PKGBUILD
@@ -1,22 +1,26 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-systemsettings
-pkgver=14.0.10
+_mod=tde-systemsettings
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE System Settings"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tde-systemsettings')
-#conflicts=('tde-systemsettings')
-#replaces=('tde-systemsettings')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-systemsettings-trinity-${pkgver}.tar.xz")
-md5sums=('aa7b76706221850c5ef5519360247e7b')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('17d6a2c9a6135680162a10de6ca0f4ae')
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -27,17 +31,18 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON \
      -DBUILD_KNETWORKCONF=OFF
 
    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
 }
-- 
cgit v1.2.3