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-core/tde-tqt3/PKGBUILD | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'arch/tde-core/tde-tqt3/PKGBUILD')

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.
-- 
cgit v1.2.1