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 <[email protected]>
(cherry picked from commit 08dc2d3a905752c1f405392c4f2e33ba577a9b8b)

15 files changed, 260 insertions, 309 deletions

diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD
index d26358250..b87b39775 100644
--- a/arch/tde-extra/tde-amarok/PKGBUILD
+++ b/arch/tde-extra/tde-amarok/PKGBUILD
@@ -1,40 +1,47 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-amarok
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE Amarok"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/amarok'
+url='https://scm.trinitydesktop.org/scm/git/applications/amarok'
 license=('GPL')
 groups=('tde-extra')
-depends=('tde-tdebase' 'taglib')
+depends=('tde-tdebase' 'taglib' 'xine-lib')
 makedepends=('pkgconfig' 'cmake')
 #provides=('tde-amarok')
 #conflicts=('tde-amarok')
 #replaces=('tde-amarok')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/amarok-R${pkgver}.tar.bz2")
-md5sums=('0351b0d4ee54ae266e2a3ec47cd3accf')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/amarok-trinity-${pkgver}.tar.xz")
+md5sums=('fab4ed783d4027711e4aaca098bb04b1')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
 build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/applications/${pkgname#*-}
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
 
-  msg "Running make -f admin/Makefile.common ...."
-  make -f admin/Makefile.common
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
-  ## configure
-  msg "Configuring - ${pkgname}..."
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_EMBEDDED_SQLITE=ON \
+     -DWITH_OPENGL=ON
 
-  ./configure --prefix=${TDEDIR}
-  make $NUMJOBS
+   msg "Building - ${pkgname#*-}..."
+   make $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/applications/${pkgname#*-}
-  
+  cd ${srcdir}/build
   make -j1 DESTDIR="${pkgdir}" install
 }
diff --git a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
index c16ef0f97..4209ff819 100644
--- a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
+++ b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-gtk-qt-engine
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="gtk qt engine"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine'
+url='https://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
@@ -15,33 +15,32 @@ makedepends=('pkgconfig' 'cmake')
 #conflicts=('gtk-qt-engine')
 #replaces=('gtk-qt-engine')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/gtk-qt-engine-R${pkgver}.tar.bz2")
-md5sums=('31777d53a3b6e79e416306427e908a89')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk-qt-engine-trinity-${pkgver}.tar.xz")
+md5sums=('419342ad15dca93e5e4424eb7b0a2e59')
 # install=''
 
-build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/applications/${pkgname#*-}
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
+build() {
+  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p "$srcdir/build"
   cd "$srcdir/build"
 
   msg "Starting cmake..."
 
-  cmake ${srcdir}/applications/${pkgname#*-} \
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
+  msg "Building - ${pkgname#*-}..."
   make $NUMJOBS
-
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build            # use for libtool
-
+  cd ${srcdir}/build
   make -j1 DESTDIR="${pkgdir}" install
 }
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
 }
diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD
index a5b3bdcc5..b36d9203f 100644
--- a/arch/tde-extra/tde-kmplayer/PKGBUILD
+++ b/arch/tde-extra/tde-kmplayer/PKGBUILD
@@ -2,59 +2,47 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-kmplayer
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE KMPlayer"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/kmplayer'
+url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase' 'dbus-glib')
-makedepends=('pkgconfig' 'cmake' 'mplayer')
+makedepends=('pkgconfig' 'cmake' 'mplayer' 'xine-lib')
 #provides=('kmplayer')
 #conflicts=('kmplayer')
 #replaces=('kmplayer')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/kmplayer-R${pkgver}.tar.bz2"
-        "callback-stub-fix.patch")
-md5sums=('968e2116b333ea646ce00fd2ab2038a8'
-         '31ed0b0814a3855c65541c058ac91a68')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/kmplayer-trinity-${pkgver}.tar.xz")
+md5sums=('e817acc32c3f87cc475be8d8c7a1b4a7')
 # install=''
 
-build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/applications/${pkgname#*-}
-
-  msg "Patching for callback stub header..."
-  patch -p1 -i ${srcdir}/callback-stub-fix.patch
-
-  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}..."
-  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
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd 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 \
+     -DBUILD_KOFFICE_PLUGIN=OFF \
+     -DBUILD_KGSTPLAYER=OFF
+
+   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-kmplayer/callback-stub-fix.patch b/arch/tde-extra/tde-kmplayer/callback-stub-fix.patch
deleted file mode 100644
index a2069defc..000000000
--- a/arch/tde-extra/tde-kmplayer/callback-stub-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur kmplayer-orig/src/Makefile.am kmplayer/src/Makefile.am
---- kmplayer-orig/src/Makefile.am	2018-08-25 10:16:53.000000000 +0000
-+++ kmplayer/src/Makefile.am	2019-01-31 21:26:36.000000000 +0000
-@@ -27,6 +27,7 @@
- kmplayer_la_SOURCES= main.cpp kmplayerapp.cpp kmplayertvsource.cpp kmplayerbroadcast.cpp kmplayervdr.cpp
- kmplayer_la_LIBADD= libkmplayercommon.la $(LIB_XTEST)
- kmplayer_la_LDFLAGS= -module $(KDE_PLUGIN) $(LIB_QT)
-+kmplayer_la_COMPILE_FIRST= kmplayer_backend_stub.h
- 
- EXTRA_PROGRAMS = kxineplayer kxvplayer kgstplayer
- if include_kxineplayer
-@@ -48,14 +49,17 @@
- kxineplayer_CFLAGS= $(CFLAGS_XINE)
- kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
- kxineplayer_SOURCES= xineplayer.cpp
-+kxineplayer_COMPILE_FIRST= kmplayer_callback_stub.h
- 
- kxvplayer_LDADD= libkmplayerbackend.la -lDCOP -lXv
- kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
- kxvplayer_SOURCES= xvplayer.cpp
-+kxvplayer_COMPILE_FIRST= kmplayer_callback_stub.h
- 
- kgstplayer_LDADD= libkmplayerbackend.la $(LIB_GST) $(LIB_GST_PLUGINS) $(LIB_GST_OVERLAY) -lDCOP
- kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
- kgstplayer_SOURCES= gstplayer.cpp
-+kgstplayer_COMPILE_FIRST= kmplayer_callback_stub.h
- 
- knpplayer_LDADD= $(LIBNSPR_LIBS)
- knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
-@@ -79,3 +83,5 @@
- 
- messages: rc.cpp
- 	$(XGETTEXT) *.cpp -o $(podir)/kmplayer.pot
-+
-+.NOTPARALLEL:
diff --git a/arch/tde-extra/tde-krusader/PKGBUILD b/arch/tde-extra/tde-krusader/PKGBUILD
index d00693d71..2688b1bec 100644
--- a/arch/tde-extra/tde-krusader/PKGBUILD
+++ b/arch/tde-extra/tde-krusader/PKGBUILD
@@ -1,11 +1,11 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-krusader
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE Krusader"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/krusader'
+url='https://scm.trinitydesktop.org/scm/git/applications/krusader'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
@@ -14,15 +14,16 @@ makedepends=('pkgconfig' 'automake')
 #conflicts=('krusader')
 #replaces=('krusader')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/krusader-R${pkgver}.tar.bz2")
-md5sums=('0787b4b4271f7a107b4d397db621b145')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/krusader-trinity-${pkgver}.tar.xz")
+md5sums=('1491538ca6e616ec5bdfaa9c9f86c9b2')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
 build() {
-  # old ruby1.8 path
-  export PATH=/opt/ruby1.8/bin:$PATH
   ## 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
@@ -45,12 +46,11 @@ build() {
     --enable-closure
 
   msg "Building - ${pkgname#*-}..."
-make $NUMJOBS
+  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}/${pkgname#*-}-trinity-${pkgver}            # use for libtool
+  make -j1 DESTDIR="${pkgdir}" install
 }
diff --git a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
index 7da4d0d4a..4735a9653 100644
--- a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
+++ b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
@@ -1,56 +1,46 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-ksplash-engine-moodin
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE KSplash Engine Moodin"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
+url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'automake')
+makedepends=('pkgconfig' 'cmake')
 #provides=('ksplash-engine-moodin')
 #conflicts=('ksplash-engine-moodin')
 #replaces=('ksplash-engine-moodin')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/ksplash-engine-moodin-R${pkgver}.tar.bz2")
-md5sums=('fb580976442327d34fbfcd2fcab63e9e')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/ksplash-engine-moodin-trinity-${pkgver}.tar.xz")
+md5sums=('3a10d2089ed4e165ff74994e9efbf262')
 # install=''
 
-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
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
-  ## 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
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd 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 \
+     -DWITH_ALL_OPTIONS=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-style-qtcurve/PKGBUILD b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
index e5bc33437..148be966f 100644
--- a/arch/tde-extra/tde-style-qtcurve/PKGBUILD
+++ b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-style-qtcurve
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE Style QTCurve"
 arch=('i686' 'x86_64')
@@ -14,33 +14,30 @@ makedepends=('pkgconfig' 'cmake')
 #conflicts=('tde-style-qtcurve')
 #replaces=('tde-style-qtcurve')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/tde-style-qtcurve-R${pkgver}.tar.bz2")
-md5sums=('43e7e865807d966890663e511837b616')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-style-qtcurve-trinity-${pkgver}.tar.xz")
+md5sums=('b5bff2af06e5891d9b4bbeb5b3c83835')
 # install=''
 
-build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/applications/${pkgname}
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
+build() {
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p "$srcdir/build"
   cd "$srcdir/build"
 
   msg "Starting cmake..."
-
-  cmake ${srcdir}/applications/${pkgname} \
+  cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
+  msg "Building - ${pkgname}..."
   make $NUMJOBS
-
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build            # use for libtool
-
+  cd ${srcdir}/build
   make -j1 DESTDIR="${pkgdir}" install
 }
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
 }
diff --git a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
index d6b94e78d..76c8e7b0c 100644
--- a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
+++ b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
@@ -1,11 +1,11 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-tdenetworkmanager
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="gtk qt engine"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager'
+url='https://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
@@ -14,33 +14,30 @@ makedepends=('pkgconfig' 'cmake')
 #conflicts=('tdenetworkmanager')
 #replaces=('tdenetworkmanager')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/tdenetworkmanager-R${pkgver}.tar.bz2")
-md5sums=('28f6255e6407330573f8a4af57e41a65')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdenetworkmanager-trinity-${pkgver}.tar.xz")
+md5sums=('2edab1bc48066a52f0b53a19457495a2')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
 build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/applications/${pkgname#*-}
-  
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p "$srcdir/build"
-  cd "$srcdir/build"
+  mkdir -p "${srcdir}/build"
+  cd "${srcdir}/build"
 
   msg "Starting cmake..."
-
-  cmake ${srcdir}/applications/${pkgname#*-} \
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
+  msg "Building - ${pkgname#*-}..."
   make $NUMJOBS
-
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build            # use for libtool
-
+  cd ${srcdir}/build
   make -j1 DESTDIR="${pkgdir}" install
 }
diff --git a/arch/tde-extra/tde-tdepowersave/PKGBUILD b/arch/tde-extra/tde-tdepowersave/PKGBUILD
index 65f5a99f8..f89a988f0 100644
--- a/arch/tde-extra/tde-tdepowersave/PKGBUILD
+++ b/arch/tde-extra/tde-tdepowersave/PKGBUILD
@@ -5,11 +5,11 @@ _mod=tdepowersave
 _cat=applications/
 _kdemod="${_mod/tde/kde}"
 pkgname="tde-$_mod"
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
 arch=('i686' 'x86_64')
-url="http://scm.trinitydesktop.org/scm/git/$_mod"
+url="https://scm.trinitydesktop.org/scm/git/$_mod"
 license=('GPL')
 #provides=("$_mod")
 groups=('tde-extra')
@@ -18,7 +18,6 @@ depends=(
   'tde-dbus-1-tqt'
 )
 makedepends=(
-  'autoconf'
   'cmake'
   'pkgconfig'
 )
@@ -28,27 +27,26 @@ confilicts=("trinity-$_kdemod" "kdemod3-$_kdemod")
 options=('staticlibs' 'libtool' '!strip')
 install=
 
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R$pkgver/$_cat$_mod-R$pkgver.tar.bz2")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R$pkgver/main/$_cat$_mod-trinity-$pkgver.tar.xz")
+md5sums=('64daecf2c9061f3797b2cab8f0ad347b')
 
-build() {
-  cd "${srcdir}/${_cat}${_mod}"
-
-  msg "Patch sources"
-  sed -i 's/^int kdemain/KDE_EXPORT \0/' src/main.cpp
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
+build() {
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p "$srcdir/build"
-  cd "$srcdir/build"
+  mkdir -p "${srcdir}/build"
+  cd "${srcdir}/build"
 
-  msg "Starting cmake..."
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
-  export LIBRARY_PATH="$LIBRARY_PATH:/opt/trinity/lib/"
-  cmake ${srcdir}/${_cat}${_mod} \
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
+  msg "Building - ${pkgname#*-}..."
   make VERBOSE=1 $NUMJOBS
 }
 
@@ -57,4 +55,3 @@ package() {
   cd "$srcdir/build"
   make -j1 DESTDIR="$pkgdir" install
 }
-md5sums=('5006a20e844e3d8dc2ba8dbc41487990')
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?= <[email protected]>
+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 <[email protected]>
+---
+ 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
+
diff --git a/arch/tde-extra/tde-tdmtheme/PKGBUILD b/arch/tde-extra/tde-tdmtheme/PKGBUILD
index aa991c312..83b79322e 100644
--- a/arch/tde-extra/tde-tdmtheme/PKGBUILD
+++ b/arch/tde-extra/tde-tdmtheme/PKGBUILD
@@ -1,56 +1,42 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-tdmtheme
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDM Theme"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/tdmtheme'
+url='https://scm.trinitydesktop.org/scm/git/applications/tdmtheme'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'automake')
+makedepends=('pkgconfig' 'cmake')
 #provides=('tdmtheme')
 #conflicts=('tdmtheme')
 #replaces=('tdmtheme')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/tdmtheme-R${pkgver}.tar.bz2")
-md5sums=('dc202459e80fde7b469ef1cfb684803c')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdmtheme-trinity-${pkgver}.tar.xz")
+md5sums=('b085fa2792024415fb2174633875adbe')
 # install=''
 
-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
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
-  ## 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
+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
+
+   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-twin-style-crystal/PKGBUILD b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
index 4deb3c208..b23465403 100644
--- a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
+++ b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
@@ -1,28 +1,29 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-twin-style-crystal
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="TDE TWin Style Crystal"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal'
+url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal'
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'automake')
+makedepends=('pkgconfig' 'cmake')
 #provides=('twin-style-crystal')
 #conflicts=('twin-style-crystal')
 #replaces=('twin-style-crystal')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/twin-style-crystal-R${pkgver}.tar.bz2")
-md5sums=('51983ea2543b9ed886b4357bc6cfec60')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/twin-style-crystal-trinity-${pkgver}.tar.xz")
+md5sums=('b87b5ad84ba492e6e56c583c05ba4d40')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
 build() {
-  # old ruby1.8 path
-  export PATH=/opt/ruby1.8/bin:$PATH
   ## 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,8 +34,6 @@ build() {
 
   ## configure
   msg "Configuring - ${pkgname#*-}..."
-  CFLAGS="${CFLAGS} -fpermissive" \
-  CXXFLAGS="${CXXFLAGS} -fpermissive" \
   ./configure \
     --prefix=${TDEDIR} \
     --with-qt-dir=${QTDIR} \
@@ -45,12 +44,11 @@ build() {
     --enable-closure
 
   msg "Building - ${pkgname#*-}..."
-make $NUMJOBS
+  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}/${pkgname#*-}-trinity-${pkgver}
+  make -j1 DESTDIR="${pkgdir}" install
 }