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

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1838e1a41f12414ad989d5f1c712ef0c62df9bf1)

2 files changed, 23 insertions, 53 deletions

diff --git a/arch/tde-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD
index 05899c6f3..c5988fc4e 100644
--- a/arch/tde-extra/tde-tdeedu/PKGBUILD
+++ b/arch/tde-extra/tde-tdeedu/PKGBUILD
@@ -1,51 +1,52 @@
 # Maintainer: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdeedu
-pkgver=14.0.10
+_mod=tdeedu
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Educational utilities for the TDE Desktop"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
+makedepends=('tde-cmake-trinity' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
 optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeedu-trinity-${pkgver}.tar.xz"
-        'bp000-0cb84fb9.diff')
-md5sums=('3859da24d70f0d787c0cc7f41540772d'
-         '5ae3959dc2dc62f1f7421620b198d175')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('10d3f00e8539e7bb74ecb02c6a91c507')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-   patch -p1 < ${srcdir}/bp000-0cb84fb9.diff
-
-   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=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-     -DBUILD_ALL=ON
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON \
+     -DWITH_OCAML_SOLVER=OFF \
+     -DWITH_LIBUSB=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
 }
diff --git a/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff b/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff
deleted file mode 100644
index 5dbe6e492..000000000
--- a/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0cb84fb9036ce7bc7c757a3971fdb0c619d0c011 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 09:15:26 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: static assertion failed: comparison object must be invocable as const
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- kiten/learn.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kiten/learn.cpp b/kiten/learn.cpp
-index 94e77b9a..a1b685d4 100644
---- a/kiten/learn.cpp
-+++ b/kiten/learn.cpp
-@@ -762,7 +762,7 @@ void Learn::qupdate()
- 
- struct Learn::scoreCompare 
- {
--	bool operator()(const TQListViewItem* v1, const TQListViewItem* v2)
-+	bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) const
- 	{
- 		return v1->text(4).toInt() < v2->text(4).toInt();
- 	}
--- 
-cgit v1.2.1
-