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>

2 files changed, 15 insertions, 34 deletions

diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD
index 0f56bd687..9fca983df 100644
--- a/arch/tde-core/tde-tqt3/PKGBUILD
+++ b/arch/tde-core/tde-tqt3/PKGBUILD
@@ -3,13 +3,17 @@
 # Contributor: Calvin Morrison <MutantTurkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgbase=tde-tqt3
+_mod=tqt3
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod}"
 pkgname=("$pkgbase" "${pkgbase}-docs")
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqt3"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 options=('staticlibs' 'libtool' '!emptydirs' '!strip')
@@ -22,19 +26,16 @@ makedepends=('libcups'
         'libmng'
         'xorg-xrandr'
         'libxft'
+        'libxmu'
         'glu')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz"
-        'bp000-fix-build-key.diff')
-md5sums=('47d8495fcf444c5db2cf56843be3f746'
-         '950e3885135fd9844de856c770f19767')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3923dc1a1460c556ef5d1fc296211f3a')
 
 _prefix="/opt/trinity/tqt3"
 
 build() {
 
-  cd ${srcdir}/tqt3-trinity-${pkgver}
-
-  patch -p1 < ${srcdir}/bp000-fix-build-key.diff
+  cd ${srcdir}/${_mod}-trinity-${pkgver}
 
   # These are probably arch-specific. They were present in old qt3
   # PKGBULD, they were present in kdemod3 PKGBUILD, they are present
@@ -54,7 +55,7 @@ build() {
   sed -i "s|read acceptance|acceptance=yes|" configure
 
   msg "Setting enviroment variables..."
-  export QTDIR="${srcdir}/tqt3-trinity-${pkgver}"
+  export QTDIR="${srcdir}/${_mod}-trinity-${pkgver}"
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
@@ -94,6 +95,7 @@ build() {
     -platform linux-g++${ARCH} \
     -no-exceptions \
     -thread \
+    -enable-opengl \
     -dlopen-opengl \
     -no-ipv6
 
@@ -146,8 +148,8 @@ package_tde-tqt3() {
 
    make INSTALL_ROOT="$pkgdir" install
 
-  ## remove doc as it is now in a split package tde-tqt3-doc
-  rm -r "${pkgdir}${_prefix}/doc"
+   ## remove doc as it is now in a split package tde-tqt3-doc
+   rm -r "${pkgdir}${_prefix}/doc"
 
    # install link the apps provided by qt3 so we don't collide with
    # qt4 and can run them.
diff --git a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
deleted file mode 100644
index a0a0aa42e..000000000
--- a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   Wed Sep 22 15:00:08 2021 +0200
-
-    Fix buildkey for GCC >= 7 if the version is listed including minor numbers.
-    
-    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-
-diff --git a/configure b/configure
-index 92cec273..f021f563 100755
---- a/configure
-+++ b/configure
-@@ -2828,7 +2828,7 @@ g++*)
-     3.*)
- 	COMPILER_VERSION="3.*"
- 	;;
--    [1-9][0-9]|[7-9]|[4-6].*)
-+    [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*)
- 	COMPILER_VERSION="4.*"
- 	;;
-     *)