From 97b2476606456d0d385dceb83dbc4657c8472f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 22 Sep 2021 17:25:57 +0200
Subject: ArchLinux: Update remaining application in tde-extra to R14.0.10.
 Switch amarok, kmplayer, ksplash-engine-moodin, tde-systemsettings, tdesudo
 and tdmtheme to CMake. Backport patches to tdesudo to resolve FTBFS.
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 08dc2d3a905752c1f405392c4f2e33ba577a9b8b)
---
 arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD')

diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
index 075ff99a5..17969464b 100644
--- a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
+++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-gtk3-tqt-engine
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="gtk3 tqt engine"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/gtk3-tqt-engine'
+url='https://scm.trinitydesktop.org/scm/git/applications/gtk3-tqt-engine'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase' 'gtk3')
@@ -15,13 +15,17 @@ makedepends=('pkgconfig' 'cmake')
 #conflicts=('gtk3-tqt-engine')
 #replaces=('gtk3-tqt-engine')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/gtk3-tqt-engine-R${pkgver}.tar.bz2")
-md5sums=('76b078e7afcd6a8e683efa924fcfad2e')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk3-tqt-engine-trinity-${pkgver}.tar.xz")
+md5sums=('1f94fd009a3c062e042f914c21d49984')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+[ -n "$TQTDIR" ] || TQTDIR=${QTDIR}
+
 build() {
   ## Generate config files and update with autoreconf
-  cd ${srcdir}/applications/${pkgname#*-}
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
 
   msg "Copying system libtool files...."
   cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
@@ -33,7 +37,13 @@ build() {
   ## configure
   msg "Configuring - ${pkgname}..."
 
-  ./configure --prefix=${TDEDIR}
+  ./configure \
+    --prefix=${TDEDIR} \
+    --with-qt-dir=${QTDIR} \
+    --with-qt-includes=${QTDIR}/include \
+    --with-qt-libraries=${QTDIR}/lib \
+    --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \
+    --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \
 
   ### PATCH: This allows the package to compile due to some odd reason its not finding tqt-mt, Remove LD_LIBRARY_PATH
   ###        if fixed on future versions
@@ -42,7 +52,6 @@ build() {
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/applications/${pkgname#*-}
-  
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
   make -j1 DESTDIR="${pkgdir}" install
 }
-- 
cgit v1.2.1