From b9d33de3622fcad3fdfdc9b1464b4bc160f205ba 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>
(cherry picked from commit 1838e1a41f12414ad989d5f1c712ef0c62df9bf1)
---
 arch/tde-core/tde-avahi-tqt/PKGBUILD | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'arch/tde-core/tde-avahi-tqt')

diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD
index 2df40dd16..737408364 100644
--- a/arch/tde-core/tde-avahi-tqt/PKGBUILD
+++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD
@@ -1,42 +1,46 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-avahi-tqt
-pkgver=14.0.10
+_mod=avahi-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Avahi-TQt"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/avahi-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
 # nss-mdns should probably move to tdelibs depends
-makedepends=('pkgconfig' 'cmake')
-provides=('avahi-tqt')
-replaces=('trinity-avahi-tqt')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('6cce8423a3030505bb56a8c73f6235d6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('e9e31775dc7ad94159e9e8ea0edf028c')
 
 [ -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
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }
-- 
cgit v1.2.1