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>
(cherry picked from commit 7821de9ce7)

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")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdesdk-trinity-${pkgver}.tar.xz")
-md5sums=('3821592afede20daf82ed2eef597955b')
+md5sums=('5d117cbbe1cd938624656917646eebab')
 # install=''
 
-#prepare() {
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
-# patch -Np1 -i "${srcdir}/../kautoconfig.patch"
-#}
 
 build() {
-  ## Generate config files and update with autoreconf
+   cd $srcdir
-  cd ${srcdir}/${pkgname#*-}
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
 
-  msg "Copying system libtool files...."
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
-  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 ...."
+   msg "Starting cmake..."
-  make -f admin/Makefile.common
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
-
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
-  ## configure
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-  msg "Configuring - ${pkgname}..."
+     -DBUILD_ALL=ON
-  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 "Building - ${pkgname#*-}..."
+   make $NUMJOBS
 }
 
 package() {
- msg "Packaging - $pkgname-$pkgver"
+  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${pkgname#*-}            # use for libtool
+  cd ${srcdir}/build
-
   make -j1 DESTDIR="${pkgdir}" install
 }

arch/tde-devel/tde-tdevelop/PKGBUILD

@@ -2,35 +2,39 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-tdevelop
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdevelop'
+url='https://scm.trinitydesktop.org/scm/git/tdevelop'
 license=('GPL')
 groups=('tde-devel')
 pkgdesc="Trinity Desktop Developer Tools"
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('pkgconfig' 'cmake' 'tde-tdesdk')
 provides=('tdevelop')
 conflicts=('trinity-tdevelop' 'trinity-kdevelop')
 replaces=('trinity-tdevelop')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdevelop-R${pkgver}.tar.bz2"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdevelop-trinity-${pkgver}.tar.xz"
-        "fix_tqt_error.patch")
+        'bp000-ba5f58bf.diff')
-md5sums=('ddc6fe1c7adc3c6284db806a8ea96e76'
+md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8'
-         'da7c0a4793e98351d9f2d4122d3d2626')
+         'e7519ea06bd63b4fc9aa7e0ac5076576')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
 build() {
-   cd ${srcdir}/${pkgname#*-}
+   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-   patch -p1 -i ${srcdir}/fix_tqt_error.patch
+   patch -p1 < ${srcdir}/bp000-ba5f58bf.diff
 
+   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
    mkdir -p ${srcdir}/build
    cd ${srcdir}/build
 
    msg "Starting cmake..."
-   cmake ${srcdir}/${pkgname#*-} \
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
       -DWITH_BUILDTOOL_ALL=ON \

arch/tde-devel/tde-tdevelop/fix_tqt_error.patch

@@ -1,26 +0,0 @@
-diff -Naur tdevelop-orig/lib/interfaces/external/CMakeLists.txt tdevelop/lib/interfaces/external/CMakeLists.txt
---- tdevelop-orig/lib/interfaces/external/CMakeLists.txt	2015-09-22 20:10:40.000000000 -0700
-+++ tdevelop/lib/interfaces/external/CMakeLists.txt	2017-06-29 04:29:48.095622130 -0700
-@@ -15,6 +15,9 @@
-   ${TQT_INCLUDE_DIRS}
- )
- 
-+link_directories (
-+  ${TQT_LIBRARY_DIRS}
-+)
- 
- ##### headers ###################################
- 
-diff -Naur tdevelop-orig/src/newui/CMakeLists.txt tdevelop/src/newui/CMakeLists.txt
---- tdevelop-orig/src/newui/CMakeLists.txt	2015-09-22 20:10:40.000000000 -0700
-+++ tdevelop/src/newui/CMakeLists.txt	2017-06-29 04:34:10.788957492 -0700
-@@ -15,6 +15,9 @@
-   ${TQT_INCLUDE_DIRS}
- )
- 
-+link_directories(
-+  ${TQT_LIBRARY_DIRS}
-+)
- 
- ##### d (shared) ################################
- 

arch/tde-devel/tde-tdewebdev/PKGBUILD

@@ -1,10 +1,10 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
 pkgname=tde-tdewebdev
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdewebdev'
+url='https://scm.trinitydesktop.org/scm/git/tdewebdev'
 license=('GPL')
 groups=('tde-devel')
 pkgdesc="Trinity Web Developer Tools"
@@ -14,10 +14,12 @@ provides=('tdewebdev')
 conflicts=('trinity-tdewebdev' 'trinity-kdewebdev')
 replaces=('trinity-tdewebdev')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdewebdev-R${pkgver}.tar.bz2")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdewebdev-trinity-${pkgver}.tar.xz")
-md5sums=('a51df50c2a897883d3557421b6949620')
+md5sums=('96bcdfdcd4308b0721ed23d7d5b9954f')
 # install=''
 
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
 build() {
    cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
@@ -25,11 +27,9 @@ build() {
    cd build
 
    msg "Starting cmake..."
-   cmake ${srcdir}/${pkgname#*-} \
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_SPEEX=ON \
-      -DWITH_ARTS=ON \
       -DBUILD_ALL=ON
 
    msg "Building - ${pkgname#*-}..."