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.

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

2 files changed, 60 insertions, 36 deletions

diff --git a/arch/tde-extra/tde-tdesudo/PKGBUILD b/arch/tde-extra/tde-tdesudo/PKGBUILD
index 17739ab81..779adce1f 100644
--- a/arch/tde-extra/tde-tdesudo/PKGBUILD
+++ b/arch/tde-extra/tde-tdesudo/PKGBUILD
@@ -1,56 +1,49 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-tdesudo
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE Sudo"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/tdesudo'
+url='https://scm.trinitydesktop.org/scm/git/applications/tdesudo'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'automake')
+makedepends=('pkgconfig' 'cmake')
 #provides=('tdesudo')
 #conflicts=('tdesudo')
 #replaces=('tdesudo')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/tdesudo-R${pkgver}.tar.bz2")
-md5sums=('8f86b7b497a9575979b27fd2911b0106')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdesudo-trinity-${pkgver}.tar.xz"
+        'bp000-1136b8150f.diff')
+md5sums=('ff1b28acd12998c216e4256ca94f795b'
+         '6ba546544bfab644bbbba972f31a137b')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
 build() {
-  # old ruby1.8 path
-  export PATH=/opt/ruby1.8/bin:$PATH
-  ## 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
-
-  ## configure
-  msg "Configuring - ${pkgname#*-}..."
-  CFLAGS="${CFLAGS} -fpermissive" \
-  CXXFLAGS="${CXXFLAGS} -fpermissive" \
-  ./configure \
-    --prefix=${TDEDIR} \
-    --with-qt-dir=${QTDIR} \
-    --with-qt-includes=${QTDIR}/include \
-    --with-qt-libraries=${QTDIR}/lib \
-    --sysconfdir=${TDEDIR}/etc \
-    --localstatedir=/var \
-    --enable-closure
-
-  msg "Building - ${pkgname#*-}..."
-make $NUMJOBS
+   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+   patch -p1 < $srcdir/bp000-1136b8150f.diff
+
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p $srcdir/build
+   cd $srcdir/build
+
+   #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON
+
+   msg "Building - ${pkgname#*-}..."
+   make $NUMJOBS
 }
 
 package() {
-msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/applications/${pkgname#*-}            # use for libtool
-
-make -j1 DESTDIR="${pkgdir}" install
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  make -j1 DESTDIR="${pkgdir}" install
 }
diff --git a/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff b/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff
new file mode 100644
index 000000000..60bd6082c
--- /dev/null
+++ b/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff
@@ -0,0 +1,31 @@
+From 1136b8150f58e909eaa094d991dcefa81b8f6a60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
+Date: Tue, 11 May 2021 19:45:01 +0200
+Subject: Fix ftbfs on Fedora 34
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+error: ordered comparison of pointer with integer zero ('char*' and 'int')
+
+Signed-off-by: François Andriot <francois.andriot@free.fr>
+---
+ tdesudo/tdesudo.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tdesudo/tdesudo.cpp b/tdesudo/tdesudo.cpp
+index c255d0f..83158ab 100644
+--- a/tdesudo/tdesudo.cpp
++++ b/tdesudo/tdesudo.cpp
+@@ -205,7 +205,7 @@ TdeSudo::TdeSudo(TQWidget *parent, const char *name,const TQString& icon, const
+ 		chmod(m_tmpname.ascii(),0644);
+ 	
+ 	QCStringList output;
+-	while (fgets(buf, 1024, f) > 0)
++	while (fgets(buf, 1024, f) != NULL)
+ 		output += buf; 
+ 	if (pclose(f) < 0) {
+ 		kdError() << k_lineinfo << "Could not run xauth.\n";
+-- 
+cgit v1.2.1
+