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-core/tde-tdelibs/PKGBUILD | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'arch/tde-core/tde-tdelibs/PKGBUILD')

diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD
index 759b18d6a..9e930a584 100644
--- a/arch/tde-core/tde-tdelibs/PKGBUILD
+++ b/arch/tde-core/tde-tdelibs/PKGBUILD
@@ -3,12 +3,16 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdelibs
-pkgver=14.0.10
-pkgrel=2
+_mod=tdelibs
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
 pkgdesc="Trinity Desktop core libraries and applications"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdelibs'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('aspell'
@@ -32,29 +36,28 @@ depends=('aspell'
 	'xorg-xprop'
 	'xorg-xset'
 	'xorg-xsetroot')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdelibs')
-conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3')
-replaces=('trinity-kdelibs' 'trinity-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}")
+replaces=("trinity-${_kdemod}" "trinity-${_mod}")
 options=('staticlibs' 'libtool' '!makeflags' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz")
-
-md5sums=('cbb77407a886b588b4749524ae8e5edd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6a93917c4879d0a34764264f53e8519f')
 
-install='trinity-tdelibs.install'
+install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
 
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
   msg "Starting cmake..."
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -84,13 +87,13 @@ build() {
     -DWITH_HSPELL=ON
 
   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
   msg "Removing conflicting images"
   rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 }
-- 
cgit v1.2.1