From 1838e1a41f12414ad989d5f1c712ef0c62df9bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= 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 --- arch/tde-extra/tde-abakus/PKGBUILD | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'arch/tde-extra/tde-abakus') diff --git a/arch/tde-extra/tde-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD index c8961c7d7..67e4b762e 100644 --- a/arch/tde-extra/tde-abakus/PKGBUILD +++ b/arch/tde-extra/tde-abakus/PKGBUILD @@ -2,10 +2,11 @@ # Contributor: David C. Rankin _mod=abakus -_cat=applications/ +_cat=applications/utilities/ _kdemod="${_mod/tde/kde}" + pkgname="tde-${_mod}" -pkgver=14.0.10 +pkgver=14.0.11 pkgrel=1 pkgdesc="Calculator for TDE" arch=('i686' 'x86_64') @@ -17,17 +18,16 @@ depends=( 'tde-tdelibs' ) makedepends=( - 'cmake' - 'pkgconfig' + 'tde-cmake-trinity' ) optdepends=() -confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +conflicts=("trinity-${_mod}" "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=('90fa9e728b8b48ad5e51c95eb5d05dc7') +md5sums=('5f8e3779d9d4f7ddad3c436cb5bbfd03') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 @@ -39,6 +39,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ @@ -46,11 +47,11 @@ build() { -DWITH_ALL_OPTIONS=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