4 files changed, 13 insertions, 74 deletions
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
index 65a175e8b..9033e78a5 100644
--- a/arch/tde-core/tde-tdebase/PKGBUILD
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname='tde-tdebase'
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="Trinity Desktop Enviroment base components"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdebase'
+url='https://scm.trinitydesktop.org/scm/git/tdebase'
 license=('GPL')
 provides=('tdebase')
 groups=('tde-core')
@@ -16,7 +16,6 @@ depends=('libraw1394'
          'libxss'
          'lm_sensors'
          'tde-tdelibs'
-         'tde-dbus-tqt'
          'tde-dbus-1-tqt'
          'ttf-dejavu'
          'ttf-freefont'
@@ -50,7 +49,7 @@ replaces=('trinity-tdebase')
 options=('staticlibs' 'libtool' '!strip')
 install='trinity-tdebase.install'
 
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdebase-R${pkgver}.tar.bz2"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz"
         'arch-kdeshutdown.png'
         'kdm-default-face.png'
         'agent-shutdown.sh'
@@ -58,12 +57,9 @@ source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdebas
         'tdm-trinity'
         'trinity.desktop'
         'tdm.service'
-        'xsession.patch'
-        'stat.patch'
-        'rpcfix.patch'
-        'config_fix.patch')
+        'xsession.patch')
 
-md5sums=('aed6cd45278faa17b9a448b34cbb5127'
+md5sums=('bca895dfc2b88c4b74e307d5690108bf'
          '2dac928c6177b9fa0f4e751d7dddc62e'
          '81eb97f16b66a2152e592358727a30c7'
          '18e8d01124b19f7df2937c06e177bf7f'
@@ -71,32 +67,21 @@ md5sums=('aed6cd45278faa17b9a448b34cbb5127'
          'bb4c25e560fa719e8e8f49ef80bd1c99'
          '091f4e1045867bbbc15bf323731aae82'
          'e0ddb96fc86bd081ce691744a68d2f9a'
-         'a761787a4d2f917389ced194552addca'
-         '9ed22bf950f1b8c722aad0078e270774'
-         '409bccfb0632c4eda71130e744676b9d'
-         'b75b47ff872e80ef2853389237665e9f')
+         'a761787a4d2f917389ced194552addca')
 
-build() {
-  cd ${srcdir}/${pkgname#*-}
-
-  msg "Patching to use new rpc/rpc.h include path"
-  patch -p1 -i ${srcdir}/rpcfix.patch
-
-  msg "Patching to not use linux/stat.h"
-  patch -p1 -i ${srcdir}/stat.patch
- 
-  msg "Patching CMakeLists.txt to fix config bug"
-  patch -p1 -i ${srcdir}/config_fix.patch
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
+build() {
+  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p ../build
-  cd ../build
+  mkdir -p build
+  cd build
 
   msg "Starting cmake..."
 
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
-  cmake ${srcdir}/tdebase \
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DWITH_SASL=ON \
@@ -159,7 +144,7 @@ package() {
   ln -sf $TDEDIR/bin/starttde ${pkgdir}$TDEDIR/bin/starttrinity
 
   # install mkpamserv script, so we can auto-generate pam.d configs in post_install()
-  install -D -m755 ${srcdir}/tdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
+  install -D -m755 ${srcdir}/${pkgname#*-}-trinity-${pkgver}/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
 
   # Install nice arch logo to use in the shutdown dialog
   install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/arch/tde-core/tde-tdebase/config_fix.patch b/arch/tde-core/tde-tdebase/config_fix.patch
deleted file mode 100644
index 27b379ff8..000000000
--- a/arch/tde-core/tde-tdebase/config_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur tdebase-orig/tdm/kfrontend/CMakeLists.txt tdebase/tdm/kfrontend/CMakeLists.txt
---- tdebase-orig/tdm/kfrontend/CMakeLists.txt	2018-08-25 10:01:35.000000000 +0000
-+++ tdebase/tdm/kfrontend/CMakeLists.txt	2019-01-30 19:27:06.000000000 +0000
-@@ -48,7 +48,7 @@
- 
- ##### tdm_config (executable) ###################
- 
--set_property( SOURCE tdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
-+set_property( SOURCE tdm_config.c tdm_greet.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
- 
- tde_add_executable( tdm_config
-   SOURCES tdm_config.c
-
diff --git a/arch/tde-core/tde-tdebase/rpcfix.patch b/arch/tde-core/tde-tdebase/rpcfix.patch
deleted file mode 100644
index 58aeb558b..000000000
--- a/arch/tde-core/tde-tdebase/rpcfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tdebase-orig/CMakeLists.txt      2016-11-06 21:13:18.000000000 -0800
-+++ tdebase/CMakeLists.txt      2018-06-11 20:56:07.988765200 -0700
-@@ -23,6 +23,8 @@
-
- ##### include essential cmake modules ###########
-
-+include_directories( /usr/include/tirpc ) # FIX For ArchLinux
-+
- include( FindPkgConfig )
- include( CheckIncludeFile )
- include( CheckIncludeFiles )
---- tdebase-orig/tdeioslave/nfs/CMakeLists.txt 2016-11-06 21:13:18.000000000 -0800
-+++ tdebase/tdeioslave/nfs/CMakeLists.txt      2018-06-11 21:22:40.661414000 -0700
-@@ -41,6 +41,6 @@
-
- tde_add_kpart( ${target} AUTOMOC
-   SOURCES tdeio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
--  LINK tdeio-shared
-+  LINK tdeio-shared tirpc
-   DESTINATION ${PLUGIN_INSTALL_DIR}
- )
diff --git a/arch/tde-core/tde-tdebase/stat.patch b/arch/tde-core/tde-tdebase/stat.patch
deleted file mode 100644
index c873edd84..000000000
--- a/arch/tde-core/tde-tdebase/stat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tdebase-orig/kdesktop/lock/lockprocess.cc tdebase/kdesktop/lock/lockprocess.cc
---- tdebase-orig/kdesktop/lock/lockprocess.cc	2018-08-25 10:01:35.000000000 +0000
-+++ tdebase/kdesktop/lock/lockprocess.cc	2019-01-22 23:24:54.000000000 +0000
-@@ -80,7 +80,7 @@
- #include <kcrash.h>
- 
- #ifdef __linux__
-+//#include <linux/stat.h>
--#include <linux/stat.h>
- #endif
- #include <pthread.h>
-