From 6beb7211c30f0b4feeb7e487dc25899507ae72b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 20 Sep 2021 21:13:29 +0200
Subject: ArchLinux: Update tdepim, tdemultimedia, tdenetwork, tdegraphics and
 tdegames to R14.0.10. Backport patches to tdegraphics to resolve FTBFS.
 Switch tdemultimedia to CMake.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 arch/tde-extra/tde-tdemultimedia/PKGBUILD   | 67 ++++++++++++-----------------
 arch/tde-extra/tde-tdemultimedia/stat.patch | 15 -------
 2 files changed, 28 insertions(+), 54 deletions(-)
 delete mode 100644 arch/tde-extra/tde-tdemultimedia/stat.patch

(limited to 'arch/tde-extra/tde-tdemultimedia')

diff --git a/arch/tde-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
index 01378237c..2efbe8767 100644
--- a/arch/tde-extra/tde-tdemultimedia/PKGBUILD
+++ b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
@@ -2,59 +2,48 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-tdemultimedia
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="Trinity Desktop MultiMedia Components"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdemultimedia'
+url='https://scm.trinitydesktop.org/scm/git/tdemultimedia'
 license=('GPL')
 groups=('tde-extra')
-depends=('tde-tdebase')
+depends=('tde-tdebase' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
 makedepends=('pkgconfig' 'cmake')
 provides=('tdemultimedia')
 conflicts=('trinity-tdemultimedia' 'trinity-kdemultimedia')
 replaces=('trinity-tdemultimedia')
 options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdemultimedia-R${pkgver}.tar.bz2"
-        "stat.patch")
-md5sums=('35df868eecb8a7d794c156fe6e6e038c'
-         '19a31ab61d45477149dd7ab6b85a17cd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdemultimedia-trinity-${pkgver}.tar.xz")
+md5sums=('f1f40920c9eed566eaa98a81b838b7b8')
 # install=''
 
-build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/${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 "Patching to not use linux/stat.h"
-  patch -p1 -i ${srcdir}/stat.patch
-
-  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 \
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_ARTS_AKODE=OFF \
+      -DBUILD_ALL=ON \
+      -DBUILD_JUK=OFF
+
+   msg "Building - ${pkgname#*-}..."
+   make $NUMJOBS
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${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-tdemultimedia/stat.patch b/arch/tde-extra/tde-tdemultimedia/stat.patch
deleted file mode 100644
index 167ee6cfc..000000000
--- a/arch/tde-extra/tde-tdemultimedia/stat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur tdemultimedia-orig/kscd/kcompactdisc.cpp tdemultimedia/kscd/kcompactdisc.cpp
---- tdemultimedia-orig/kscd/kcompactdisc.cpp	2018-08-25 05:29:23.000000000 +0000
-+++ tdemultimedia/kscd/kcompactdisc.cpp	2019-01-31 10:16:44.000000000 +0000
-@@ -42,11 +42,6 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- 
--/* this is for glibc 2.x which the ust structure in ustat.h not stat.h */
--#ifdef __GLIBC__
--#include <sys/ustat.h>
--#endif
--
- #ifdef __FreeBSD__
- #include <sys/param.h>
- #include <sys/ucred.h>
-- 
cgit v1.2.3