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-devel/tde-tdevelop/PKGBUILD | 38 +++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'arch/tde-devel/tde-tdevelop/PKGBUILD')

diff --git a/arch/tde-devel/tde-tdevelop/PKGBUILD b/arch/tde-devel/tde-tdevelop/PKGBUILD
index 56a4ecc2c..db57ea73b 100644
--- a/arch/tde-devel/tde-tdevelop/PKGBUILD
+++ b/arch/tde-devel/tde-tdevelop/PKGBUILD
@@ -1,53 +1,51 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdevelop
-pkgver=14.0.10
+_mod=tdevelop
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdevelop'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-devel')
 pkgdesc="Trinity Desktop Developer Tools"
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'tde-tdesdk' 'subversion')
-provides=('tdevelop')
-conflicts=('trinity-tdevelop' 'trinity-kdevelop')
-replaces=('trinity-tdevelop')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk' 'subversion')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdevelop-trinity-${pkgver}.tar.xz"
-        'bp000-ba5f58bf.diff')
-md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8'
-         'e7519ea06bd63b4fc9aa7e0ac5076576')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2323f9116e354a28e72da92a4f820641')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-   patch -p1 < ${srcdir}/bp000-ba5f58bf.diff
-
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
    mkdir -p ${srcdir}/build
    cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
       -DWITH_BUILDTOOL_ALL=ON \
       -DWITH_LANGUAGE_ALL=ON \
-      -DWITH_VCS_ALL=ON \
-      -DBUILD_ALL=ON
+      -DWITH_VCS_ALL=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
 }
-- 
cgit v1.2.1