Hello community, here is the log from the commit of package kdegraphics4 checked in at Fri Nov 28 16:25:38 CET 2008. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2008-11-20 16:51:34.000000000 +0100 +++ kdegraphics4/kdegraphics4.changes 2008-11-28 15:34:56.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 28 15:34:24 CET 2008 - dmueller@suse.de + +- update libkexiv/libkdcraw to trunk for beta6 of digikam + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libkdcraw-trunk-880480.diff libkexiv2-trunk-880480.diff New: ---- libkdcraw-trunk-890188.diff libkexiv2-trunk-890188.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.J15039/_old 2008-11-28 16:25:13.000000000 +0100 +++ /var/tmp/diff_new_pack.J15039/_new 2008-11-28 16:25:13.000000000 +0100 @@ -34,12 +34,12 @@ Summary: kdegraphics base package Url: http://www.kde.org Version: 4.1.3 -Release: 3 +Release: 4 Source0: kdegraphics-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff -Patch1: libkdcraw-trunk-880480.diff -Patch2: libkexiv2-trunk-880480.diff +Patch1: libkdcraw-trunk-890188.diff +Patch2: libkexiv2-trunk-890188.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Suggests: libksane0 @@ -536,6 +536,8 @@ /usr/bin/xf86gammacfg %changelog +* Fri Nov 28 2008 dmueller@suse.de +- update libkexiv/libkdcraw to trunk for beta6 of digikam * Thu Nov 20 2008 stbinner@suse.de - add SLE provides/obsoletes * Wed Nov 05 2008 dmueller@suse.de ++++++ libkdcraw-trunk-880480.diff -> libkdcraw-trunk-890188.diff ++++++ ++++ 751 lines (skipped) ++++ between KDE/kdegraphics4/libkdcraw-trunk-880480.diff ++++ and kdegraphics4/libkdcraw-trunk-890188.diff ++++++ libkexiv2-trunk-880480.diff -> libkexiv2-trunk-890188.diff ++++++ --- KDE/kdegraphics4/libkexiv2-trunk-880480.diff 2008-11-05 18:28:38.000000000 +0100 +++ kdegraphics4/libkexiv2-trunk-890188.diff 2008-11-28 15:34:55.000000000 +0100 @@ -1,5 +1,5 @@ ---- libkexiv2/kexiv2comments.cpp -+++ libkexiv2/kexiv2comments.cpp +--- libkexiv2/kexiv2comments.cpp (Revision 890188) ++++ libkexiv2/kexiv2comments.cpp (Revision 890188) @@ -10,10 +10,6 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -21,8 +21,8 @@ } return false; ---- libkexiv2/kexiv2gps.cpp -+++ libkexiv2/kexiv2gps.cpp +--- libkexiv2/kexiv2gps.cpp (Revision 890188) ++++ libkexiv2/kexiv2gps.cpp (Revision 890188) @@ -10,20 +10,16 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -104,10 +104,19 @@ } - for(QStringList::Iterator it2 = gpsTagsKeys.begin(); it2 != gpsTagsKeys.end(); ++it2) -+ for(QStringList::const_iterator it2 = gpsTagsKeys.begin(); it2 != gpsTagsKeys.end(); ++it2) ++ for(QStringList::const_iterator it2 = gpsTagsKeys.constBegin(); it2 != gpsTagsKeys.constEnd(); ++it2) { Exiv2::ExifKey gpsKey((*it2).toAscii().constData()); Exiv2::ExifData::iterator it3 = d->exifMetadata.findKey(gpsKey); +@@ -528,7 +523,7 @@ void KExiv2::convertToRational(double nu + // To do this we: (for example) + // 0.12345 * 10000 = 1234.5 + // floor(1234.5) = 1234 - now bigger than 1 - ready... +- fractional = trunc(fractional * rounder); ++ fractional = round(fractional * rounder); + + // Convert the whole thing to a fraction. + // Fraction is: @@ -630,7 +625,6 @@ void KExiv2::convertToRationalSmallDenom } } @@ -123,8 +132,8 @@ - - } // NameSpace KExiv2Iface ---- libkexiv2/kexiv2private.cpp -+++ libkexiv2/kexiv2private.cpp +--- libkexiv2/kexiv2private.cpp (Revision 890188) ++++ libkexiv2/kexiv2private.cpp (Revision 890188) @@ -9,10 +9,6 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -136,9 +145,11 @@ * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; -@@ -35,24 +31,17 @@ namespace KExiv2Iface +@@ -34,25 +30,19 @@ namespace KExiv2Iface + KExiv2Priv::KExiv2Priv() { ++ writeRawFiles = false; imageComments = std::string(); - -#ifdef _XMP_SUPPORT_ @@ -163,8 +174,8 @@ } QString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum) ---- libkexiv2/kexiv2exif.cpp -+++ libkexiv2/kexiv2exif.cpp +--- libkexiv2/kexiv2exif.cpp (Revision 890188) ++++ libkexiv2/kexiv2exif.cpp (Revision 890188) @@ -10,20 +10,16 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -261,8 +272,8 @@ const std::string &fileName((const char*)(QFile::encodeName(thumbFile.fileName()))); #if (EXIV2_TEST_VERSION(0,17,91)) ---- libkexiv2/kexiv2.cpp -+++ libkexiv2/kexiv2.cpp +--- libkexiv2/kexiv2.cpp (Revision 890188) ++++ libkexiv2/kexiv2.cpp (Revision 890188) @@ -9,10 +9,6 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -300,7 +311,7 @@ bool KExiv2::supportXmp() { #ifdef _XMP_SUPPORT_ -@@ -92,13 +107,38 @@ bool KExiv2::supportXmp() +@@ -92,13 +107,46 @@ bool KExiv2::supportXmp() #endif // _XMP_SUPPORT_ } @@ -335,6 +346,14 @@ + return true; +#else + return false; ++#endif ++ } ++ else if (typeMime == QString("image/x-raw")) ++ { ++#if (EXIV2_TEST_VERSION(0,17,91)) ++ return true; ++#else ++ return false; #endif + } + @@ -342,7 +361,30 @@ } QString KExiv2::Exiv2Version() -@@ -141,18 +181,59 @@ bool KExiv2::isReadOnly(const QString& f +@@ -123,36 +171,77 @@ QString KExiv2::version() + bool KExiv2::isReadOnly(const QString& filePath) + { + if (!canWriteComment(filePath)) +- return false; ++ return true; + + if (!canWriteExif(filePath)) +- return false; ++ return true; + + if (!canWriteIptc(filePath)) +- return false; ++ return true; + + #ifdef _XMP_SUPPORT_ + if (!canWriteXmp(filePath)) +- return false; ++ return true; + #endif // _XMP_SUPPORT_ + +- return true; ++ return false; + } //-- General methods ---------------------------------------------- @@ -404,7 +446,7 @@ Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((const char*) (QFile::encodeName(filePath))); -@@ -199,12 +280,21 @@ bool KExiv2::save(const QString& filePat +@@ -199,12 +288,30 @@ bool KExiv2::save(const QString& filePat QFileInfo dinfo(finfo.path()); if (!finfo.isWritable()) { @@ -420,15 +462,24 @@ + } + + // TIFF/EP Raw file based supported by Exiv2 0.18 are : DNG, NEF, PEF. ++ QString rawTiffBasedSupported("dng nef pef"); + QString rawTiffBasedNotSupported("3fr arw cr2 dcr erf k25 kdc mos orf raw sr2 srf"); + if (rawTiffBasedNotSupported.contains(finfo.suffix().toUpper())) + { + kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() + << "' is TIFF based RAW file not yet supported. Metadata not saved." << endl; ++ return false; ++ } ++ ++ if (rawTiffBasedSupported.contains(finfo.suffix().toUpper()) && !d->writeRawFiles) ++ { ++ kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() ++ << "' is TIFF based RAW file supported but writing mode is disabled. " ++ << "Metadata not saved." << endl; return false; } -@@ -235,11 +325,12 @@ bool KExiv2::save(const QString& filePat +@@ -235,11 +342,12 @@ bool KExiv2::save(const QString& filePat { if (image->mimeType() == "image/tiff") { @@ -443,8 +494,25 @@ untouchedTags << "Exif.Image.ImageWidth"; untouchedTags << "Exif.Image.ImageLength"; untouchedTags << "Exif.Image.BitsPerSample"; ---- libkexiv2/kexiv2iptc.cpp -+++ libkexiv2/kexiv2iptc.cpp +@@ -331,6 +439,16 @@ QString KExiv2::getFilePath() const + return d->filePath; + } + ++void KExiv2::setWriteRawFiles(bool on) ++{ ++ d->writeRawFiles = on; ++} ++ ++bool KExiv2::writeRawFiles() const ++{ ++ return d->writeRawFiles; ++} ++ + bool KExiv2::setProgramId(bool /*on*/) const + { + return true; +--- libkexiv2/kexiv2iptc.cpp (Revision 890188) ++++ libkexiv2/kexiv2iptc.cpp (Revision 890188) @@ -10,20 +10,16 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -572,8 +640,8 @@ it = iptcData.erase(it); else ++it; ---- libkexiv2/kexiv2private.h -+++ libkexiv2/kexiv2private.h +--- libkexiv2/kexiv2private.h (Revision 890188) ++++ libkexiv2/kexiv2private.h (Revision 890188) @@ -41,7 +41,6 @@ #include <QMatrix> #include <QFileInfo> @@ -590,8 +658,17 @@ // Exiv2 includes. ---- libkexiv2/kexiv2image.cpp -+++ libkexiv2/kexiv2image.cpp +@@ -119,6 +119,8 @@ public: + + public: + ++ bool writeRawFiles; ++ + QString filePath; + + std::string imageComments; +--- libkexiv2/kexiv2image.cpp (Revision 890188) ++++ libkexiv2/kexiv2image.cpp (Revision 890188) @@ -10,20 +10,16 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -849,8 +926,8 @@ QByteArray data; data.resize(previewFile.size()); ---- libkexiv2/CMakeLists.txt -+++ libkexiv2/CMakeLists.txt +--- libkexiv2/CMakeLists.txt (Revision 890188) ++++ libkexiv2/CMakeLists.txt (Revision 890188) @@ -1,7 +1,9 @@ -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") @@ -871,8 +948,8 @@ IF( WIN32 ) TARGET_LINK_LIBRARIES( kexiv2 ${EXPAT_LIBRARIES} ) ---- libkexiv2/kexiv2.h -+++ libkexiv2/kexiv2.h +--- libkexiv2/kexiv2.h (Revision 890188) ++++ libkexiv2/kexiv2.h (Revision 890188) @@ -118,13 +118,27 @@ public: //-- STATICS methods ---------------------------------------------- //----------------------------------------------------------------- @@ -903,7 +980,17 @@ /** Return a string version of Exiv2 release in format "major.minor.patch" */ -@@ -142,6 +156,11 @@ public: +@@ -135,13 +149,20 @@ public: + static QString version(); + + /** return true if metadata from file cannot be written by Exiv2. ++ This method is obosolete and will be removed. ++ Use canWriteComment(), canWriteExif(), canWriteIptc(), or canWriteXmp() instead. + */ +- static bool isReadOnly(const QString& filePath); ++ KDE_DEPRECATED static bool isReadOnly(const QString& filePath); + + //----------------------------------------------------------------- //-- GENERAL methods ---------------------------------------------- //----------------------------------------------------------------- @@ -915,8 +1002,25 @@ /** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a picture (JPEG, RAW, TIFF, PNG, DNG, etc...). Return true if metadata have been loaded successfully from file. */ ---- libkexiv2/kexiv2xmp.cpp -+++ libkexiv2/kexiv2xmp.cpp +@@ -169,6 +190,16 @@ public: + */ + QString getFilePath() const; + ++ /** Enable or disable writing metadata operations to RAW tiff based files. ++ It's require Exiv2 0.18. By default RAW files are untouched. ++ */ ++ void setWriteRawFiles(bool on); ++ ++ /** Return true if writing metadata operations on RAW tiff based files is enabled. ++ It's require Exiv2 0.18. ++ */ ++ bool writeRawFiles() const; ++ + //------------------------------------------------------------------- + //-- Metadata IMAGE INFORMATION manipulation methods ---------------- + //------------------------------------------------------------------- +--- libkexiv2/kexiv2xmp.cpp (Revision 890188) ++++ libkexiv2/kexiv2xmp.cpp (Revision 890188) @@ -10,20 +10,16 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -1056,12 +1160,16 @@ } #endif // _XMP_SUPPORT_ -@@ -560,7 +557,7 @@ bool KExiv2::setXmpTagStringSeq(const ch - QStringList list = seq; +@@ -557,10 +554,10 @@ bool KExiv2::setXmpTagStringSeq(const ch + + try + { +- QStringList list = seq; ++ const QStringList list = seq; Exiv2::Value::AutoPtr xmpTxtSeq = Exiv2::Value::create(Exiv2::xmpSeq); - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) -+ for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) ++ for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it ) { const std::string &txt((*it).toUtf8().constData()); xmpTxtSeq->read(txt); @@ -1088,7 +1196,7 @@ Exiv2::Value::AutoPtr xmpTxtBag = Exiv2::Value::create(Exiv2::xmpBag); - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) -+ for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) ++ for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it ) { const std::string &txt((*it).toUtf8().constData()); xmpTxtBag->read(txt); @@ -1118,19 +1226,22 @@ + // Create a list of keywords including old one witch already exists. - for (QStringList::Iterator it = oldkeys.begin(); it != oldkeys.end(); ++it ) -+ for (QStringList::const_iterator it = oldkeys.begin(); it != oldkeys.end(); ++it ) ++ for (QStringList::const_iterator it = oldkeys.constBegin(); it != oldkeys.constEnd(); ++it ) { if (!newkeys.contains(*it)) newkeys.append(*it); -@@ -848,9 +845,9 @@ bool KExiv2::setXmpSubCategories(const Q +@@ -846,11 +843,11 @@ bool KExiv2::setXmpSubCategories(const Q + if (!setProgramId(setProgramName)) + return false; - QStringList oldSubCat = getXmpSubCategories(); +- QStringList oldSubCat = getXmpSubCategories(); ++ const QStringList oldSubCat = getXmpSubCategories(); QStringList newSubCat = newSubCategories; - + // Create a list of sub-categories including old one witch already exists. - for (QStringList::Iterator it = oldSubCat.begin(); it != oldSubCat.end(); ++it ) -+ for (QStringList::const_iterator it = oldSubCat.begin(); it != oldSubCat.end(); ++it ) ++ for (QStringList::const_iterator it = oldSubCat.constBegin(); it != oldSubCat.constEnd(); ++it ) { if (!newSubCat.contains(*it)) newSubCat.append(*it); @@ -1142,19 +1253,19 @@ + // Create a list of sub-categories including old one witch already exists. - for (QStringList::Iterator it = oldSubjectCodes.begin(); it != oldSubjectCodes.end(); ++it ) -+ for (QStringList::const_iterator it = oldSubjectCodes.begin(); it != oldSubjectCodes.end(); ++it ) ++ for (QStringList::const_iterator it = oldSubjectCodes.constBegin(); it != oldSubjectCodes.constEnd(); ++it ) { if (!newSubjectCodes.contains(*it)) newSubjectCodes.append(*it); ---- TODO -+++ TODO +--- TODO (Revision 890188) ++++ TODO (Revision 890188) @@ -1,3 +1,3 @@ - Extract GPS info from XMP tags. -- Exif/Iptc => Xmp synchrosization. +- Exif/Iptc => Xmp synchronization. - Xmp side-car file support. ---- NEWS -+++ NEWS +--- NEWS (Revision 890188) ++++ NEWS (Revision 890188) @@ -1,9 +1,27 @@ -0.2.0 +0.4.0 - @@ -1184,9 +1295,9 @@ Bugs fixed from B.K.O (http://bugs.kde.org): 001 ==> 146864: Lesser XMP support in digiKam. ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -15,11 +15,13 @@ PROJECT(libkexiv2) +--- CMakeLists.txt (Revision 890188) ++++ CMakeLists.txt (Revision 890188) +@@ -15,11 +15,14 @@ PROJECT(libkexiv2) # 0.1.7 => 4.0.1 # 0.1.8 => 5.0.0 # ... here we can have new releases from KDE3 branch @@ -1194,15 +1305,16 @@ +# 0.2.0 => 6.0.0 (released with KDE 4.1.0) +# 0.3.0 => 7.0.0 (released with KDE 4.1.2) +# 0.4.0 => 7.1.0 ++# 0.5.0 => 7.2.0 (Released with KDE 4.2.0) # Library API version SET(KEXIV2_LIB_MAJOR_VERSION "0") -SET(KEXIV2_LIB_MINOR_VERSION "2") -+SET(KEXIV2_LIB_MINOR_VERSION "4") ++SET(KEXIV2_LIB_MINOR_VERSION "5") SET(KEXIV2_LIB_PATCH_VERSION "0") # Suffix to add at end of version string. Usual values are: -@@ -29,12 +31,12 @@ SET(KEXIV2_LIB_PATCH_VERSION "0") +@@ -29,12 +32,12 @@ SET(KEXIV2_LIB_PATCH_VERSION "0") # "-beta3" : beta3 release. # "-rc" : release candidate. # "" : final relase. Can be used in production. @@ -1214,12 +1326,20 @@ -SET(KEXIV2_LIB_SO_CUR_VERSION "6") -SET(KEXIV2_LIB_SO_REV_VERSION "0") +SET(KEXIV2_LIB_SO_CUR_VERSION "7") -+SET(KEXIV2_LIB_SO_REV_VERSION "1") ++SET(KEXIV2_LIB_SO_REV_VERSION "2") SET(KEXIV2_LIB_SO_AGE_VERSION "0") # ======================================================= ---- README -+++ README +@@ -47,7 +50,6 @@ SET(KEXIV2_LIB_SO_VERSION_STRING "${KEXI + + # ======================================================= + +- + if (EXIV2_FOUND) + SUBDIRS(libkexiv2) + +--- README (Revision 890188) ++++ README (Revision 890188) @@ -9,7 +9,9 @@ See AUTHORS file for details. -- ABOUT -------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org