From b53b39c5b11eee058afe12dc28a2cc5a1ada4fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 20 Sep 2021 19:19:42 +0200
Subject: ArchLinux: Update tde-libs modules to R14.0.10. Switch libcaldav,
 libcarddav and libexiv2 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-libs/tde-libkexiv2/PKGBUILD | 62 +++++++++++++-----------------------
 1 file changed, 22 insertions(+), 40 deletions(-)

(limited to 'arch/tde-libs/tde-libkexiv2/PKGBUILD')

diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD
index 78fb2f7f0..a1ca5ce5a 100644
--- a/arch/tde-libs/tde-libkexiv2/PKGBUILD
+++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD
@@ -2,61 +2,43 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 pkgname=tde-libkexiv2
-pkgver=14.0.5
+pkgver=14.0.10
 pkgrel=1
 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
 arch=('i686' 'x86_64')
-url="http://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
 license=('GPL')
 groups=('tde-libs')
 depends=('tde-tdebase' 'exiv2')
-makedepends=('pkgconfig' 'autoconf' 'imake')
+makedepends=('pkgconfig' 'cmake')
 optdepends=()
 provides=("${pkgname#*-}")
 conflicts=("trinity-${pkgname#*-}")
 replaces=("trinity-${pkgname#*-}")
 options=('staticlibs' 'libtool' '!emptydirs')
 # install='pkgname.install'
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/libraries/libkexiv2-R${pkgver}.tar.bz2"
-        "exiv2-fixes.patch")
-md5sums=('c6fbcf0c85099e9f689e6af69507b860'
-         '71bf0967f94cf8975c5be0efe313265e')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkexiv2-trinity-${pkgver}.tar.xz")
+md5sums=('0647354c2cc1da9f54cd0d0707b026a3')
 
-build() {
-  ## Generate config files and update with autoreconf
-  cd ${srcdir}/libraries/${pkgname#*-}
-
-  msg "Patching to fix compiler errors with exiv2..."
-  patch -p1 -i ${srcdir}/exiv2-fixes.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
-
-  ## configure
-  msg "Configuring - ${pkgname}..."
-
-  ./configure \
-    --prefix=${TDEDIR} \
-    --with-qt-dir=${QTDIR} \
-    --with-qt-includes=${QTDIR}/include \
-    --with-qt-libraries=${QTDIR}/lib \
-    --localstatedir=/var \
-    --enable-debug=full \
-    --enable-closure
-
-  msg "Building - ${pkgname}..."
-  make $NUMJOBS
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_GCC_VISIBILITY=ON
+
+   msg "Building $pkgname..."
+   make $NUMJOBS
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
-
-  cd ${srcdir}/libraries/${pkgname#*-}            # use for non-out-of-source
-
-  make -j1 DESTDIR="$pkgdir" install
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   make -j1 DESTDIR="$pkgdir" install
 }
-- 
cgit v1.2.1