ArchLinux: Update tdesdk, tdevelop and tdewebdev to R14.0.10.

Backport patches to tdevelop to resolve FTBFS.
Switch tdesdk to CMake.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 20 insertions, 33 deletions

diff --git a/arch/tde-devel/tde-tdesdk/PKGBUILD b/arch/tde-devel/tde-tdesdk/PKGBUILD
index 0b085d9e7..6c3ffc895 100644
--- a/arch/tde-devel/tde-tdesdk/PKGBUILD
+++ b/arch/tde-devel/tde-tdesdk/PKGBUILD
@@ -2,58 +2,45 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-tdesdk
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdesdk'
+url='https://scm.trinitydesktop.org/scm/git/tdesdk'
 license=('GPL')
 groups=('tde-devel')
 pkgdesc="Trinity Desktop Development Tools"
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake' 'flex' 'subversion')
+makedepends=('pkgconfig' 'cmake' 'flex' 'subversion' 'pod2man')
 provides=('tdesdk')
 conflicts=('trinity-tdesdk' 'trinity-kdesdk')
 replaces=('trinity-tdesdk')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdesdk-R${pkgver}.tar.bz2")
-md5sums=('3821592afede20daf82ed2eef597955b')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdesdk-trinity-${pkgver}.tar.xz")
+md5sums=('5d117cbbe1cd938624656917646eebab')
 # install=''
 
-#prepare() {
-# patch -Np1 -i "${srcdir}/../kautoconfig.patch"
-#}
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/${pkgname#*-}
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
 
-  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
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
-  msg "Running make -f admin/Makefile.common ...."
-  make -f admin/Makefile.common
-
-  ## configure
-  msg "Configuring - ${pkgname}..."
-  CFLAGS="${CFLAGS} -fpermissive" \
-  CXXFLAGS="${CXXFLAGS} -std=c++0x -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
+   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}/${pkgname#*-}            # use for libtool
-
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
   make -j1 DESTDIR="${pkgdir}" install
 }