summaryrefslogtreecommitdiffstats
path: root/arch/tde-libs/tde-libkexiv2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/tde-libs/tde-libkexiv2')
-rw-r--r--arch/tde-libs/tde-libkexiv2/PKGBUILD62
-rw-r--r--arch/tde-libs/tde-libkexiv2/exiv2-fixes.patch105
2 files changed, 22 insertions, 145 deletions
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
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-14 22:23:47 +0000