head 1.3; access; symbols pkgsrc-2017Q3:1.2.0.42 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.38 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.36 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.34 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.32 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.30 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.28 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.26 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.24 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.22 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.20 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.18 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.16 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.14 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.12 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.10 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.8 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.1.1.0.6 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.4 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.2 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2017.09.26.10.27.04; author wiz; state dead; branches; next 1.2; commitid 9ARpkXTuh9Wg2H8A; 1.2 date 2012.11.16.00.52.14; author joerg; state Exp; branches; next 1.1; 1.1 date 2012.03.19.23.01.43; author markd; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2012.03.19.23.01.43; author markd; state Exp; branches; next ; desc @@ 1.3 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-aa,v 1.2 2012/11/16 00:52:14 joerg Exp $ --- libkexiv2/libkexiv2/kexiv2.cpp.orig 2009-02-27 08:39:37.000000000 +0000 +++ libkexiv2/libkexiv2/kexiv2.cpp @@@@ -49,6 +49,20 @@@@ extern "C" #include "kexiv2private.h" #include "kexiv2.h" +#if defined(__NetBSD__) || defined(__DragonFly__) +#include +#endif + +#if (defined(__DragonFly__) && __DragonFly_version < 190000) || (defined(__NetBSD__) && __NetBSD_Version__ <= 399001700) +static double trunc(double val) +{ + if (val > 0) + return floor(val); + else + return ceil(val); +} +#endif + namespace KExiv2Iface { @@@@ -800,8 +814,8 @@@@ bool KExiv2::setExifThumbnail(const QIma QBuffer buffer(data); buffer.open(IO_WriteOnly); thumb.save(&buffer, "JPEG"); - Exiv2::ExifThumb thumb(d->exifMetadata); - thumb.setJpegThumbnail((Exiv2::byte *)data.data(), data.size()); + Exiv2::ExifThumb thumb2(d->exifMetadata); + thumb2.setJpegThumbnail((Exiv2::byte *)data.data(), data.size()); #else KTempFile thumbFile(QString(), "KExiv2ExifThumbnail"); thumbFile.setAutoDelete(true); @@@@ -1603,7 +1617,11 @@@@ QString KExiv2::getExifTagTitle(const ch { std::string exifkey(exifTagName); Exiv2::ExifKey ek(exifkey); +#if (EXIV2_TEST_VERSION(0,21,0)) + return QString::fromLocal8Bit( ek.tagLabel().c_str() ); +#else return QString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) ); +#endif } catch (Exiv2::Error& e) { @@@@ -1619,7 +1637,11 @@@@ QString KExiv2::getExifTagDescription(co { std::string exifkey(exifTagName); Exiv2::ExifKey ek(exifkey); +#if (EXIV2_TEST_VERSION(0,21,0)) + return QString::fromLocal8Bit( ek.tagDesc().c_str() ); +#else return QString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) ); +#endif } catch (Exiv2::Error& e) { @ 1.2 log @Don't redeclare a local variable. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2012/03/19 23:01:43 markd Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2011/01/03 20:45:28 markd Exp $ d26 11 @ 1.1.1.1 log @Reimport libkexiv2 0.1.9nb5 as libkexiv2-kde3 @ text @@