diff options
author | Slávek Banko <[email protected]> | 2021-09-20 17:08:32 +0200 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2021-09-29 09:27:25 +0200 |
commit | 0ac2945504b4df71d0ac6777b2c956cd4921ad08 (patch) | |
tree | 301eb3b41ae6f4e78a8b5611040ba8d9c13af6dd /arch/tde-libs/tde-libkexiv2 | |
parent | 318e997cf4d25c5d2e7b4261a6017b653c1fa93c (diff) | |
download | tde-packaging-0ac2945504b4df71d0ac6777b2c956cd4921ad08.tar.gz tde-packaging-0ac2945504b4df71d0ac6777b2c956cd4921ad08.zip |
ArchLinux: Take a newer state of pkgbuilds from Michael Manley
Clean old long-term not maintained pkgbuilds.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 018f946ee70600993c60a74046f417ca05bdb41b)
Diffstat (limited to 'arch/tde-libs/tde-libkexiv2')
-rw-r--r-- | arch/tde-libs/tde-libkexiv2/PKGBUILD | 62 | ||||
-rw-r--r-- | arch/tde-libs/tde-libkexiv2/exiv2-fixes.patch | 105 |
2 files changed, 167 insertions, 0 deletions
diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD new file mode 100644 index 000000000..78fb2f7f0 --- /dev/null +++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD @@ -0,0 +1,62 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-libkexiv2 +pkgver=14.0.5 +pkgrel=1 +pkgdesc="The EXIV2 Library interface for TDE kipi-plugins" +arch=('i686' 'x86_64') +url="http://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +license=('GPL') +groups=('tde-libs') +depends=('tde-tdebase' 'exiv2') +makedepends=('pkgconfig' 'autoconf' 'imake') +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') + +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 + +} + +package() { + msg "Packaging - $pkgname-$pkgver" + + cd ${srcdir}/libraries/${pkgname#*-} # use for non-out-of-source + + 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 new file mode 100644 index 000000000..6681680ca --- /dev/null +++ b/arch/tde-libs/tde-libkexiv2/exiv2-fixes.patch @@ -0,0 +1,105 @@ +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 |