Hello community, here is the log from the commit of package nepomuk-core for openSUSE:Factory checked in at 2013-05-16 18:11:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nepomuk-core (Old) and /work/SRC/openSUSE:Factory/.nepomuk-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nepomuk-core" Changes: -------- --- /work/SRC/openSUSE:Factory/nepomuk-core/nepomuk-core.changes 2013-04-18 10:38:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nepomuk-core.new/nepomuk-core.changes 2013-05-16 18:11:44.000000000 +0200 @@ -1,0 +2,8 @@ +Sat May 4 17:03:22 UTC 2013 - [email protected] + +- Update to 4.10.3 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.3.php + * resolves bnc#818500 + +------------------------------------------------------------------- Old: ---- nepomuk-core-4.10.2.tar.xz New: ---- nepomuk-core-4.10.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nepomuk-core.spec ++++++ --- /var/tmp/diff_new_pack.KpEbvn/_old 2013-05-16 18:11:45.000000000 +0200 +++ /var/tmp/diff_new_pack.KpEbvn/_new 2013-05-16 18:11:45.000000000 +0200 @@ -34,7 +34,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://nepomuk.kde.org/ -Version: 4.10.2 +Version: 4.10.3 Release: 0 Source0: %{name}-%{version}.tar.xz Source99: nepomuk.png @@ -94,6 +94,7 @@ %_kde4_bindir/nepomuk2-rcgen %_kde4_modulesdir/nepomuk*.so %{_libdir}/libnepomukcommon.so +%{_libdir}/libnepomukextractor.so %{_libdir}/libnepomukcore.so.* %{_libdir}/libkdeinit4_nepomukserver.so %{_kde4_applicationsdir}/nepomukbackup.desktop ++++++ nepomuk-core-4.10.2.tar.xz -> nepomuk-core-4.10.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/autotests/lib/testbase.cpp new/nepomuk-core-4.10.3/autotests/lib/testbase.cpp --- old/nepomuk-core-4.10.2/autotests/lib/testbase.cpp 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/autotests/lib/testbase.cpp 2013-05-03 06:41:14.000000000 +0200 @@ -21,6 +21,7 @@ #include "testbase.h" #include "nepomukservicemanagerinterface.h" +#include "resourcemanager.h" #include <QtCore/QFile> #include <QtCore/QDir> @@ -43,7 +44,6 @@ class Nepomuk2::TestBase::Private { public: org::kde::nepomuk::ServiceManager* m_serviceManager; - QString m_repoLocation; KTempDir m_tempDir; }; @@ -61,13 +61,19 @@ d->m_serviceManager = new org::kde::nepomuk::ServiceManager( "org.kde.NepomukServer", "/servicemanager", QDBusConnection::sessionBus() ); - d->m_repoLocation = KStandardDirs::locateLocal( "data", "nepomuk/repository/" ); + // Wait for Nepomuk to get initialized + ResourceManager* rm = ResourceManager::instance(); + if( !rm->initialized() ) { + QEventLoop loop; + connect( rm, SIGNAL(nepomukSystemStarted()), &loop, SLOT(quit()) ); + kDebug() << "Waiting for Nepomuk to start"; + loop.exec(); + } // Stop all the other servies QSet<QString> services = runningServices().toSet(); kDebug() << "Running Services : " << services; services.remove( "nepomukstorage" ); - services.remove( "nepomukqueryservice" ); Q_FOREACH( const QString & service, services ) stopService( service ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/autotests/lib/tools/dbus-session-begin.sh new/nepomuk-core-4.10.3/autotests/lib/tools/dbus-session-begin.sh --- old/nepomuk-core-4.10.2/autotests/lib/tools/dbus-session-begin.sh 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/autotests/lib/tools/dbus-session-begin.sh 2013-05-03 06:41:14.000000000 +0200 @@ -3,3 +3,4 @@ # start the new dbus session bus and export the env variables it creates echo "Starting new DBus session..." eval `dbus-launch --sh-syntax` +export DBUS_SESSION_BUS_PID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/autotests/lib/tools/nepomuk-sandbox-begin.sh.in new/nepomuk-core-4.10.3/autotests/lib/tools/nepomuk-sandbox-begin.sh.in --- old/nepomuk-core-4.10.2/autotests/lib/tools/nepomuk-sandbox-begin.sh.in 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/autotests/lib/tools/nepomuk-sandbox-begin.sh.in 2013-05-03 06:41:14.000000000 +0200 @@ -39,18 +39,4 @@ echo "Starting nepomukserver" nepomukserver 2> $KDETMP/nepomuk-server.log & -waitForNepomukService () { - echo "Waiting for $1 service to be initialized." - - qdbus $1 /servicecontrol org.kde.nepomuk.ServiceControl.isInitialized 2> /dev/null - while [ $? -ne 0 ] - do - sleep 1 - qdbus $1 /servicecontrol org.kde.nepomuk.ServiceControl.isInitialized 2> /dev/null - done -} - -waitForNepomukService "org.kde.NepomukStorage" -waitForNepomukService "org.kde.nepomuk.services.nepomukqueryservice" - export NEPOMUK_TESTLIB_RUNNING=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/interfaces/org.kde.nepomuk.FileIndexer.xml new/nepomuk-core-4.10.3/interfaces/org.kde.nepomuk.FileIndexer.xml --- old/nepomuk-core-4.10.2/interfaces/org.kde.nepomuk.FileIndexer.xml 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/interfaces/org.kde.nepomuk.FileIndexer.xml 2013-05-04 14:20:05.000000000 +0200 @@ -17,6 +17,12 @@ <method name="currentFile"> <arg type="s" direction="out" /> </method> + <method name="indexedFiles"> + <arg type="i" direction="out" /> + </method> + <method name="totalFiles"> + <arg type="i" direction="out" /> + </method> <method name="suspend" /> <method name="resume" /> <method name="updateFolder"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/services/fileindexer/fileindexer.cpp new/nepomuk-core-4.10.3/services/fileindexer/fileindexer.cpp --- old/nepomuk-core-4.10.2/services/fileindexer/fileindexer.cpp 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/services/fileindexer/fileindexer.cpp 2013-05-04 14:20:06.000000000 +0200 @@ -30,6 +30,9 @@ #include "resourcemanager.h" #include <QtCore/QTimer> +#include <Soprano/QueryResultIterator> +#include <Soprano/Model> +#include <Soprano/Node> Nepomuk2::FileIndexer::FileIndexer( QObject* parent, const QList<QVariant>& ) : Service( parent ) @@ -185,6 +188,32 @@ } } +int Nepomuk2::FileIndexer::indexedFiles() const +{ + QString query = QString::fromLatin1("select count(distinct ?r) where { ?r kext:indexingLevel ?t. " + " FILTER(?t >= %1) . }") + .arg( Soprano::Node::literalToN3( Soprano::LiteralValue(2) ) ); + + Soprano::Model* model = Nepomuk2::ResourceManager::instance()->mainModel(); + Soprano::QueryResultIterator it = model->executeQuery( query, Soprano::Query::QueryLanguageSparql ); + if( it.next() ) + return it[0].literal().toInt(); + + return 0; +} + +int Nepomuk2::FileIndexer::totalFiles() const +{ + QString query = QString::fromLatin1("select count(distinct ?r) where { ?r kext:indexingLevel ?t. }"); + + Soprano::Model* model = Nepomuk2::ResourceManager::instance()->mainModel(); + Soprano::QueryResultIterator it = model->executeQuery( query, Soprano::Query::QueryLanguageSparql ); + if( it.next() ) + return it[0].literal().toInt(); + + return 0; +} + void Nepomuk2::FileIndexer::updateAllFolders(bool forced) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/services/fileindexer/fileindexer.h new/nepomuk-core-4.10.3/services/fileindexer/fileindexer.h --- old/nepomuk-core-4.10.2/services/fileindexer/fileindexer.h 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/services/fileindexer/fileindexer.h 2013-05-04 14:20:06.000000000 +0200 @@ -68,6 +68,9 @@ QString currentFolder() const; QString currentFile() const; + Q_SCRIPTABLE int indexedFiles() const; + Q_SCRIPTABLE int totalFiles() const; + /** * Update folder \a path if it is configured to be indexed. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/services/fileindexer/indexer/CMakeLists.txt new/nepomuk-core-4.10.3/services/fileindexer/indexer/CMakeLists.txt --- old/nepomuk-core-4.10.2/services/fileindexer/indexer/CMakeLists.txt 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/services/fileindexer/indexer/CMakeLists.txt 2013-05-04 14:20:06.000000000 +0200 @@ -6,13 +6,21 @@ ${SOPRANO_INCLUDE_DIR} ) +kde4_add_library(nepomukextractor SHARED extractorplugin.cpp) + +target_link_libraries(nepomukextractor + ${QT_QTCORE_LIBRARY} + ${KDE4_KDECORE_LIBS} + nepomukcore +) + +install(TARGETS nepomukextractor EXPORT NepomukCoreLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) + set(indexer_SRCS main.cpp indexer.cpp simpleindexer.cpp - extractorplugin.cpp extractorpluginmanager.cpp - plaintextextractor.cpp ../util.cpp ../../../servicestub/priority.cpp ) @@ -24,7 +32,8 @@ target_link_libraries( nepomukindexer nepomukcommon nepomukcore - ${KDE4_KIO_LIBS} + nepomukextractor + ${KDE4_KDECORE_LIBS} ${SOPRANO_LIBRARIES} ) @@ -43,10 +52,11 @@ if(POPPLER_QT4_FOUND) include_directories( ${POPPLER_QT4_INCLUDE_DIR} ) - kde4_add_plugin( nepomukpopplerextractor popplerextractor.cpp extractorplugin.cpp ) + kde4_add_plugin( nepomukpopplerextractor popplerextractor.cpp ) target_link_libraries( nepomukpopplerextractor nepomukcore + nepomukextractor ${KDE4_KIO_LIBS} ${POPPLER_QT4_LIBRARIES} ) @@ -64,10 +74,11 @@ if(TAGLIB_FOUND) include_directories( ${TAGLIB_INCLUDES} ) - kde4_add_plugin( nepomuktaglibextractor taglibextractor.cpp extractorplugin.cpp ) + kde4_add_plugin( nepomuktaglibextractor taglibextractor.cpp ) target_link_libraries( nepomuktaglibextractor nepomukcore + nepomukextractor ${KDE4_KIO_LIBS} ${TAGLIB_LIBRARIES} ) @@ -89,10 +100,11 @@ COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" ) - kde4_add_plugin( nepomukexiv2extractor exiv2extractor.cpp extractorplugin.cpp ) + kde4_add_plugin( nepomukexiv2extractor exiv2extractor.cpp ) target_link_libraries( nepomukexiv2extractor nepomukcore + nepomukextractor ${KDE4_KIO_LIBS} ${EXIV2_LIBRARIES} ) @@ -110,10 +122,11 @@ if(FFMPEG_FOUND) include_directories( ${FFMPEG_INCLUDE_DIRS} ) - kde4_add_plugin( nepomukffmpegextractor ffmpegextractor.cpp extractorplugin.cpp ) + kde4_add_plugin( nepomukffmpegextractor ffmpegextractor.cpp ) target_link_libraries( nepomukffmpegextractor nepomukcore + nepomukextractor ${KDE4_KIO_LIBS} ${FFMPEG_LIBRARIES} ) @@ -129,10 +142,11 @@ endif(FFMPEG_FOUND) -kde4_add_plugin( nepomukplaintextextractor plaintextextractor.cpp extractorplugin.cpp ) +kde4_add_plugin( nepomukplaintextextractor plaintextextractor.cpp ) target_link_libraries( nepomukplaintextextractor nepomukcore + nepomukextractor ${KDE4_KIO_LIBS} ${FFMPEG_LIBRARIES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/services/fileindexer/indexer/exiv2extractor.cpp new/nepomuk-core-4.10.3/services/fileindexer/indexer/exiv2extractor.cpp --- old/nepomuk-core-4.10.2/services/fileindexer/indexer/exiv2extractor.cpp 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/services/fileindexer/indexer/exiv2extractor.cpp 2013-05-04 14:20:06.000000000 +0200 @@ -42,22 +42,22 @@ { QStringList types; - types << QLatin1String("image/jpeg") + types << QLatin1String("image/jp2") + << QLatin1String("image/jpeg") + << QLatin1String("image/pgf") + << QLatin1String("image/png") + << QLatin1String("image/tiff") << QLatin1String("image/x-exv") << QLatin1String("image/x-canon-cr2") << QLatin1String("image/x-canon-crw") + << QLatin1String("image/x-fuji-raf") << QLatin1String("image/x-minolta-mrw") - << QLatin1String("image/tiff") << QLatin1String("image/x-nikon-nef") - << QLatin1String("image/x-pentax-pef") - << QLatin1String("image/x-panasonic-rw2") - << QLatin1String("image/x-samsung-srw") << QLatin1String("image/x-olympus-orf") - << QLatin1String("image/png") - << QLatin1String("image/pgf") - << QLatin1String("image/x-fuji-raf") + << QLatin1String("image/x-panasonic-rw2") + << QLatin1String("image/x-pentax-pef") << QLatin1String("image/x-photoshop") - << QLatin1String("image/jp2"); + << QLatin1String("image/x-samsung-srw"); return types; } @@ -85,7 +85,7 @@ QVariant toVariantFloat(const Exiv2::Value& value) { // WARNING: Dbus does not recognize float, cast to double - if( value.typeId() == Exiv2::tiffFloat || value.typeId() == Exiv2::tiffDouble ) + if( value.typeId() == Exiv2::tiffFloat || value.typeId() == Exiv2::tiffDouble || value.typeId() == Exiv2::unsignedRational || value.typeId() == Exiv2::signedRational ) return QVariant( static_cast<double>(value.toFloat()) ); QString str( toString(value) ); @@ -229,6 +229,13 @@ fileRes.setProperty( NEXIF::exposureTime(), value ); } + it = data.findKey( Exiv2::ExifKey("Exif.Photo.FNumber") ); + if( it != data.end() ) { + QVariant value = toVariantFloat( it->value() ); + if( !value.isNull() ) + fileRes.setProperty( NEXIF::fNumber(), value ); + } + it = data.findKey( Exiv2::ExifKey("Exif.Photo.ApertureValue") ); if( it != data.end() ) { QVariant value = toVariantFloat( it->value() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/services/fileindexer/indexer/extractorplugin.cpp new/nepomuk-core-4.10.3/services/fileindexer/indexer/extractorplugin.cpp --- old/nepomuk-core-4.10.2/services/fileindexer/indexer/extractorplugin.cpp 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/services/fileindexer/indexer/extractorplugin.cpp 2013-05-04 14:20:06.000000000 +0200 @@ -61,7 +61,7 @@ QDateTime dateTime; if(!dateTime.isValid()) { dateTime = QDateTime::fromString(dateString, QLatin1String("yyyy-MM-dd")); dateTime.setTimeSpec(Qt::UTC); } - if(!dateTime.isValid()) { dateTime = QDateTime::fromString(dateString, QLatin1String("dd-MM-yyy")); dateTime.setTimeSpec(Qt::UTC); } + if(!dateTime.isValid()) { dateTime = QDateTime::fromString(dateString, QLatin1String("dd-MM-yyyy")); dateTime.setTimeSpec(Qt::UTC); } if(!dateTime.isValid()) { dateTime = QDateTime::fromString(dateString, QLatin1String("yyyy-MM")); dateTime.setTimeSpec(Qt::UTC); } if(!dateTime.isValid()) { dateTime = QDateTime::fromString(dateString, QLatin1String("MM-yyyy")); dateTime.setTimeSpec(Qt::UTC); } if(!dateTime.isValid()) { dateTime = QDateTime::fromString(dateString, QLatin1String("yyyy.MM.dd")); dateTime.setTimeSpec(Qt::UTC); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/services/fileindexer/indexer/extractorplugin.h new/nepomuk-core-4.10.3/services/fileindexer/indexer/extractorplugin.h --- old/nepomuk-core-4.10.2/services/fileindexer/indexer/extractorplugin.h 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/services/fileindexer/indexer/extractorplugin.h 2013-05-03 06:41:17.000000000 +0200 @@ -30,6 +30,19 @@ #include <KService> +#ifndef NEPOMUK_EXTRACTOR_EXPORT +# if defined(KDELIBS_STATIC_LIBS) + /* No export/import for static libraries */ +# define NEPOMUK_EXTRACTOR_EXPORT +# elif defined(MAKE_NEPOMUKEXTRACTOR_LIB) + /* We are building this library */ +# define NEPOMUK_EXTRACTOR_EXPORT KDE_EXPORT +# else + /* We are using this library */ +# define NEPOMUK_EXTRACTOR_EXPORT KDE_IMPORT +# endif +#endif + namespace Nepomuk2 { /** @@ -44,7 +57,7 @@ * * \author Vishesh Handa <[email protected]> */ - class NEPOMUK_EXPORT ExtractorPlugin : public QObject + class NEPOMUK_EXTRACTOR_EXPORT ExtractorPlugin : public QObject { Q_OBJECT public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.2/services/fileindexer/indexer/taglibextractor.cpp new/nepomuk-core-4.10.3/services/fileindexer/indexer/taglibextractor.cpp --- old/nepomuk-core-4.10.2/services/fileindexer/indexer/taglibextractor.cpp 2013-03-01 07:26:55.000000000 +0100 +++ new/nepomuk-core-4.10.3/services/fileindexer/indexer/taglibextractor.cpp 2013-05-04 14:20:06.000000000 +0200 @@ -116,13 +116,16 @@ } if( tags->year() ) { - QDateTime dt = QDateTime::currentDateTime(); + QDateTime dt; + dt.setUtcOffset(0); // Date must not be converted. QDate date = dt.date(); - date.setDate( tags->year(), date.month(), date.day() ); - if( date.year() < 0 ) - date.setDate( 1, date.month(), date.day() ); + // If there is only the year then January 1 it's used to complete the date. + date.setDate( tags->year(), 1, 1 ); + if( date.year() < 0 ) { + date.setDate( 1, 1, 1 ); + } dt.setDate( date ); - fileRes.setProperty( NIE::contentCreated(), dt ); + fileRes.setProperty( NMM::releaseDate(), dt ); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
