From 08dc2d3a905752c1f405392c4f2e33ba577a9b8b 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>
---
 arch/tde-extra/tde-systemsettings/PKGBUILD | 46 +++++++++++++-----------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'arch/tde-extra/tde-systemsettings')

diff --git a/arch/tde-extra/tde-systemsettings/PKGBUILD b/arch/tde-extra/tde-systemsettings/PKGBUILD
index 239f47606..afbddda4f 100644
--- a/arch/tde-extra/tde-systemsettings/PKGBUILD
+++ b/arch/tde-extra/tde-systemsettings/PKGBUILD
@@ -1,11 +1,11 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-systemsettings
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE System Settings"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings'
+url='https://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
@@ -14,36 +14,30 @@ makedepends=('pkgconfig' 'cmake')
 #conflicts=('tde-systemsettings')
 #replaces=('tde-systemsettings')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/tde-systemsettings-R${pkgver}.tar.bz2")
-md5sums=('2a59f87b39bd63b8ae30eca38763a3ec')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-systemsettings-trinity-${pkgver}.tar.xz")
+md5sums=('aa7b76706221850c5ef5519360247e7b')
 # install=''
 
-build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/applications/${pkgname}
-
-  msg "Copying system libtool files...."
-  cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
-  cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
-
-  msg "Running make -f admin/Makefile.common ...."
-  make -f admin/Makefile.common
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
-  ## configure
-  msg "Configuring - ${pkgname}..."
-
-  ./configure --prefix=${TDEDIR}
-  make $NUMJOBS
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DBUILD_KNETWORKCONF=OFF
+
+   msg "Building - ${pkgname#*-}..."
+   make $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/applications/${pkgname}
-  
+  cd ${srcdir}/build
   make -j1 DESTDIR="${pkgdir}" install
-
-  rm -rf ${pkgdir}/opt/trinity/share/applications/tde/kcmfontinst.desktop
-  rm -rf ${pkgdir}/opt/trinity/share/applications/tde/laptop.desktop
-  rm -rf ${pkgdir}/opt/trinity/share/desktop-directories/tde-settings-power.directory
-  rm -rf ${pkgdir}/opt/trinity/share/desktop-directories/tde-settings-system.directory
 }
-- 
cgit v1.2.1