summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-09-20 19:19:42 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-09-29 09:27:54 +0200
commitf6a3277957fc0e5d0a00dde49d7e7eee72b6d750 (patch)
treecdaa1f1d6fc2b50d138eaf1f3a4cde1f9256fb9f
parent910a49dadf4afaf121b744feddffeaaa966a0126 (diff)
downloadtde-packaging-f6a3277957fc0e5d0a00dde49d7e7eee72b6d750.tar.gz
tde-packaging-f6a3277957fc0e5d0a00dde49d7e7eee72b6d750.zip
ArchLinux: Update tde-libs modules to R14.0.10.
Switch libcaldav, libcarddav and libexiv2 to CMake. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit b53b39c5b11eee058afe12dc28a2cc5a1ada4fb3)
-rw-r--r--arch/tde-libs/tde-libcaldav/PKGBUILD33
-rw-r--r--arch/tde-libs/tde-libcarddav/PKGBUILD35
-rw-r--r--arch/tde-libs/tde-libkdcraw/PKGBUILD16
-rw-r--r--arch/tde-libs/tde-libkexiv2/PKGBUILD62
-rw-r--r--arch/tde-libs/tde-libkexiv2/exiv2-fixes.patch105
5 files changed, 71 insertions, 180 deletions
diff --git a/arch/tde-libs/tde-libcaldav/PKGBUILD b/arch/tde-libs/tde-libcaldav/PKGBUILD
index f771226df..ecd9051e5 100644
--- a/arch/tde-libs/tde-libcaldav/PKGBUILD
+++ b/arch/tde-libs/tde-libcaldav/PKGBUILD
@@ -2,36 +2,43 @@
# Contribuitor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-libcaldav
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)"
arch=('i686' 'x86_64')
-url="http://scm.trinitydesktop.org/scm/git/libcaldav"
+url="https://scm.trinitydesktop.org/scm/git/libcaldav"
license=('GPL')
groups=('tde-libs')
depends=('curl' 'glib2')
-makedepends=(doxygen)
+makedepends=('doxygen' 'pkgconfig' 'cmake')
optdepends=()
provides=('libcaldav')
# conflicts=()
replaces=('trinity-libcaldav')
options=('staticlibs' 'libtool' '!strip')
install=
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/libcaldav-R${pkgver}.tar.bz2")
-md5sums=('e834fe3095d2c58f68fceebb5235aac2')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcaldav-trinity-${pkgver}.tar.xz")
+md5sums=('3d1b4997e4789c5b3a5389f5b58fd4f0')
+
+_prefix=/usr
build() {
+ cd $srcdir
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p build
+ cd build
- cd $srcdir
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -DCMAKE_INSTALL_PREFIX=${_prefix} \
+ -DWITH_GCC_VISIBILITY=ON
- cd $srcdir/dependencies/${pkgname#*-}
- ./autogen.sh --prefix=/usr
- make $NUMJOBS
+ msg "Building $pkgname..."
+ make $NUMJOBS
}
package() {
-
- cd ${srcdir}/dependencies/${pkgname#*-}
- make -j1 DESTDIR=${pkgdir} install
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ make -j1 DESTDIR="$pkgdir" install
}
-
diff --git a/arch/tde-libs/tde-libcarddav/PKGBUILD b/arch/tde-libs/tde-libcarddav/PKGBUILD
index f962ce651..96a67ea17 100644
--- a/arch/tde-libs/tde-libcarddav/PKGBUILD
+++ b/arch/tde-libs/tde-libcarddav/PKGBUILD
@@ -2,35 +2,40 @@
# Contributor: David C. Rankin <drankinatty@gmail.com>
pkgname=tde-libcarddav
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
pkgdesc="A client library adding support for the CardDAV protocol"
arch=('i686' 'x86_64')
-url="http://scm.trinitydesktop.org/scm/git/libcarddav"
+url="https://scm.trinitydesktop.org/scm/git/libcarddav"
groups=('tde-libs')
depends=('curl')
+makedepends=('pkgconfig' 'cmake')
license=('GPL')
provides=('libcarddav')
# conflicts=()
replaces=('trinity-libcarddav')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/libcarddav-R${pkgver}.tar.bz2")
-md5sums=('cd52173e640c5072bd5bf69e36bba47e')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcarddav-trinity-${pkgver}.tar.xz")
+md5sums=('54a5c89bb094ec40cc8cd5734233f743')
_prefix=/usr
build() {
-
- cd $srcdir
-
- cd ${srcdir}/dependencies/${pkgname#*-}
- msg "Running ./autogen.sh for autoreconf"
- ./autogen.sh --prefix=${_prefix}
-
- make $NUMJOBS
+ 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=${_prefix} \
+ -DWITH_GCC_VISIBILITY=ON
+
+ msg "Building $pkgname..."
+ make $NUMJOBS
}
package() {
-
- cd ${srcdir}/dependencies/${pkgname#*-}
- make -j1 DESTDIR=${pkgdir} install
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ make -j1 DESTDIR="$pkgdir" install
}
diff --git a/arch/tde-libs/tde-libkdcraw/PKGBUILD b/arch/tde-libs/tde-libkdcraw/PKGBUILD
index 85561a04a..295da133b 100644
--- a/arch/tde-libs/tde-libkdcraw/PKGBUILD
+++ b/arch/tde-libs/tde-libkdcraw/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-libkdcraw
-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' 'libraw' 'lcms')
+depends=('tde-tdebase' 'libraw' 'lcms2')
makedepends=('pkgconfig' 'autoconf' 'imake')
optdepends=()
provides=("${pkgname#*-}")
@@ -17,13 +17,15 @@ conflicts=("trinity-${pkgname#*-}")
replaces=("trinity-${pkgname#*-}")
options=('staticlibs' 'libtool' '!emptydirs')
# install='pkgname.install'
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/libraries/libkdcraw-R${pkgver}.tar.bz2")
-md5sums=('45d3aea12d4b1e307ed77639346b1b85')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkdcraw-trinity-${pkgver}.tar.xz")
+md5sums=('fedf15518c80f85174071df185a45c88')
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
## Generate config files and update with autoreconf
- cd ${srcdir}/libraries/${pkgname#*-}
+ cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
msg "Copying system libtool files...."
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
@@ -58,7 +60,7 @@ build() {
package() {
msg "Packaging - $pkgname-$pkgver"
- cd ${srcdir}/libraries/${pkgname#*-} # use for non-out-of-source
+ cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} # use for non-out-of-source
make -j1 DESTDIR="$pkgdir" install
}
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
}
diff --git a/arch/tde-libs/tde-libkexiv2/exiv2-fixes.patch b/arch/tde-libs/tde-libkexiv2/exiv2-fixes.patch
deleted file mode 100644
index 6681680ca..000000000
--- a/arch/tde-libs/tde-libkexiv2/exiv2-fixes.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Naur libkexiv2.orig/libkexiv2/libkexiv2/kexiv2.cpp libkexiv2/libkexiv2/libkexiv2/kexiv2.cpp
---- libkexiv2.orig/libkexiv2/libkexiv2/kexiv2.cpp 2015-09-23 05:34:27.000000000 +0000
-+++ libkexiv2/libkexiv2/libkexiv2/kexiv2.cpp 2019-06-19 03:34:15.000000000 +0000
-@@ -180,7 +180,7 @@
-
- Exiv2::ExifData& exif = d->exifMetadata;
-
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- Exiv2::Blob blob;
- Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exif);
- TQByteArray ba(blob.size());
-@@ -227,7 +227,7 @@
- }
- else
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- c2 = Exiv2::IptcParser::encode(d->iptcMetadata);
- #else
- c2 = iptc.copy();
-@@ -263,7 +263,7 @@
- {
- if (!data.isEmpty())
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- Exiv2::ExifParser::decode(d->exifMetadata, (const Exiv2::byte*)data.data(), data.size());
- return (!d->exifMetadata.empty());
- #else
-@@ -291,7 +291,7 @@
- {
- if (!data.isEmpty())
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- Exiv2::IptcParser::decode(d->iptcMetadata, (const Exiv2::byte*)data.data(), data.size());
- return (!d->iptcMetadata.empty());
- #else
-@@ -715,7 +715,7 @@
-
- try
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- Exiv2::ExifThumbC thumb(d->exifMetadata);
- Exiv2::DataBuf const c1 = thumb.copy();
- #else
-@@ -795,7 +795,7 @@
-
- try
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- TQByteArray data;
- TQBuffer buffer(data);
- buffer.open(IO_WriteOnly);
-@@ -1401,7 +1401,7 @@
- TQByteArray data((*it).size());
- if (data.size())
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- (*it).copy((Exiv2::byte*)data.data(), Exiv2::bigEndian);
- #else
- (*it).copy((Exiv2::byte*)data.data(), exifData.byteOrder());
-@@ -1603,7 +1603,7 @@
- {
- std::string exifkey(exifTagName);
- Exiv2::ExifKey ek(exifkey);
--#if EXIV2_TEST_VERSION(0, 21, 0)
-+#if !EXIV2_TEST_VERSION(0, 18, 0)
- return TQString::fromLocal8Bit( ek.tagLabel().c_str() );
- #else
- return TQString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) );
-@@ -1623,7 +1623,7 @@
- {
- std::string exifkey(exifTagName);
- Exiv2::ExifKey ek(exifkey);
--#if EXIV2_TEST_VERSION(0, 21, 0)
-+#if !EXIV2_TEST_VERSION(0, 18, 0)
- return TQString::fromLocal8Bit( ek.tagDesc().c_str() );
- #else
- return TQString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) );
-diff -Naur libkexiv2.orig/libkexiv2/libkexiv2/kexiv2private.cpp libkexiv2/libkexiv2/libkexiv2/kexiv2private.cpp
---- libkexiv2.orig/libkexiv2/libkexiv2/kexiv2private.cpp 2015-09-23 05:34:27.000000000 +0000
-+++ libkexiv2/libkexiv2/libkexiv2/kexiv2private.cpp 2019-06-19 03:34:03.000000000 +0000
-@@ -51,7 +51,7 @@
- {
- if (data.size_ != 0)
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- Exiv2::ExifParser::decode(exifMetadata, data.pData_, data.size_);
- return (!exifMetadata.empty());
- #else
-@@ -79,7 +79,7 @@
- {
- if (data.size_ != 0)
- {
--#if (EXIV2_TEST_VERSION(0,17,91))
-+#if !(EXIV2_TEST_VERSION(0,18,0))
- Exiv2::IptcParser::decode(iptcMetadata, data.pData_, data.size_);
- return (!iptcMetadata.empty());
- #else