Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Thu Apr 21 12:02:54 CEST 2011. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2011-03-14 16:00:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/akonadi-runtime/akonadi-runtime.changes 2011-04-07 17:37:59.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 7 15:28:49 UTC 2011 - cgiboudeaux@gmx.com + +- Update to 1.5.2: + - Fix XdgBaseDirs reporting duplicated paths. + - Use correct database name when using internal MySQL. + - Unbreak searching with Nepomuk 4.6. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- akonadi-1.5.0.tar.bz2 fix_nepo_search.diff New: ---- akonadi-1.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.jgpCzw/_old 2011-04-21 12:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.jgpCzw/_new 2011-04-21 12:02:05.000000000 +0200 @@ -21,8 +21,8 @@ BuildRequires: cmake kde4-filesystem libmysqlclient-devel BuildRequires: automoc4 boost-devel libsoprano-devel libxslt mysql shared-mime-info BuildRequires: fdupes -Version: 1.5.0 -Release: 6 +Version: 1.5.2 +Release: 1 %define rversion %version License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,7 +32,6 @@ # http://download.akonadi-project.org Source0: akonadi-%rversion.tar.bz2 Patch0: 1_5_BRANCH.diff -Patch1: fix_nepo_search.diff Requires: libqt4 >= %(rpm -q --queryformat '%{VERSION}' libqt4) Requires(post): shared-mime-info Requires(postun): shared-mime-info @@ -93,8 +92,6 @@ %prep %setup -q -n akonadi-%rversion -#%patch0 -%patch1 -p1 %build %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc ++++++ akonadi-1.5.0.tar.bz2 -> akonadi-1.5.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/CMakeLists.txt new/akonadi-1.5.2/CMakeLists.txt --- old/akonadi-1.5.0/CMakeLists.txt 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/CMakeLists.txt 2011-04-05 14:22:20.000000000 +0200 @@ -55,7 +55,7 @@ set(AKONADI_VERSION_MAJOR "1") set(AKONADI_VERSION_MINOR "5") -set(AKONADI_VERSION_PATCH "0") +set(AKONADI_VERSION_PATCH "2") set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}") set(AKONADI_VERSION_STRING "${AKONADI_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/Mainpage.dox new/akonadi-1.5.2/Mainpage.dox --- old/akonadi-1.5.0/Mainpage.dox 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/Mainpage.dox 2011-04-05 14:22:20.000000000 +0200 @@ -315,6 +315,6 @@ // DOXYGEN_EXCLUDE = sqlplugin server/control server/akonadictl server/tests // DOXYGEN_PROJECTNAME=Akonadi -// DOXYGEN_PROJECTVERSION=1.5.0 +// DOXYGEN_PROJECTVERSION=1.5.2 // vim:ts=4:sw=4:expandtab:filetype=doxygen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/NEWS new/akonadi-1.5.2/NEWS --- old/akonadi-1.5.0/NEWS 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/NEWS 2011-04-05 14:22:20.000000000 +0200 @@ -1,3 +1,12 @@ +1.5.2 05-April-2011 +--------------------------------------------- +- Fix XdgBaseDirs reporting duplicated paths. +- Use correct database name when using internal MySQL. + +1.5.1 28-February-2011 +--------------------------------------------- +- Unbreak searching with Nepomuk 4.6. + 1.5.0 22-January-2011 --------------------------------------------- - Fix Boost related build issues on Windows. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/libs/xdgbasedirs.cpp new/akonadi-1.5.2/libs/xdgbasedirs.cpp --- old/akonadi-1.5.0/libs/xdgbasedirs.cpp 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/libs/xdgbasedirs.cpp 2011-04-05 14:22:20.000000000 +0200 @@ -397,7 +397,10 @@ foreach ( const QString &path, systemPathList( resource ) ) { fileInfo = QFileInfo( path + QLatin1Char( '/' ) + relPath ); if ( fileInfo.exists() && fileInfo.isDir() && fileInfo.isReadable() ) { - resultList << fileInfo.absoluteFilePath(); + const QString absPath = fileInfo.absoluteFilePath(); + if ( !resultList.contains( absPath ) ) { + resultList << absPath; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/server/CMakeLists.txt new/akonadi-1.5.2/server/CMakeLists.txt --- old/akonadi-1.5.0/server/CMakeLists.txt 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/server/CMakeLists.txt 2011-04-05 14:22:20.000000000 +0200 @@ -139,7 +139,7 @@ src/nepomuk/result.cpp ) - set_source_files_properties(src/nepomuk/org.kde.nepomuk.QueryService.xml PROPERTIES INCLUDE "querymetatype.h") + set_source_files_properties(src/nepomuk/org.kde.nepomuk.QueryService.xml PROPERTIES INCLUDE "dbusoperators.h") set_source_files_properties(src/nepomuk/org.kde.nepomuk.Query.xml PROPERTIES INCLUDE "result.h") qt4_add_dbus_interface(libakonadiprivate_SRCS src/nepomuk/org.kde.nepomuk.QueryService.xml queryserviceinterface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/server/src/nepomuk/dbusoperators.cpp new/akonadi-1.5.2/server/src/nepomuk/dbusoperators.cpp --- old/akonadi-1.5.0/server/src/nepomuk/dbusoperators.cpp 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/server/src/nepomuk/dbusoperators.cpp 2011-04-05 14:22:20.000000000 +0200 @@ -19,16 +19,12 @@ */ #include "dbusoperators.h" -#include "querymetatype.h" - -#include <soprano/version.h> #include <QtDBus/QDBusMetaType> -Q_DECLARE_METATYPE(Nepomuk::Query::Result) -Q_DECLARE_METATYPE(Soprano::Node) -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<Nepomuk::Query::Result>) +#include <Soprano/Node> +#include <Soprano/BindingSet> + void Nepomuk::Query::registerDBusTypes() { @@ -38,10 +34,11 @@ qDBusRegisterMetaType<RequestPropertyMapDBus>(); } + QDBusArgument& operator<<( QDBusArgument& arg, const Nepomuk::Query::Result& result ) { // - // Signature: (sda{s(isss)}s) + // Signature: (sda{s(isss)}a{s(isss)}s) // arg.beginStructure(); @@ -49,19 +46,28 @@ // resource URI and score arg << QString::fromAscii( result.resourceUri().toEncoded() ) << result.score(); - arg.beginMap( QVariant::String, qMetaTypeId<Soprano::Node>() ); - // request properties + arg.beginMap( QVariant::String, qMetaTypeId<Soprano::Node>() ); QHash<QUrl, Soprano::Node> rp = result.requestProperties(); for ( QHash<QUrl, Soprano::Node>::const_iterator it = rp.constBegin(); it != rp.constEnd(); ++it ) { arg.beginMapEntry(); arg << QString::fromAscii( it.key().toEncoded() ) << it.value(); arg.endMapEntry(); } + arg.endMap(); + // additional bindings + arg.beginMap( QVariant::String, qMetaTypeId<Soprano::Node>() ); + const Soprano::BindingSet additionalBindings; // = result.additionalBindings(); + foreach( const QString& binding, additionalBindings.bindingNames() ) { + arg.beginMapEntry(); + arg << binding << additionalBindings[binding]; + arg.endMapEntry(); + } arg.endMap(); - arg << QString(); // excerpt + // full text search excerpt + arg << QString();//<< result.excerpt(); arg.endStructure(); @@ -72,7 +78,7 @@ const QDBusArgument& operator>>( const QDBusArgument& arg, Nepomuk::Query::Result& result ) { // - // Signature: (sda{s(isss)}) + // Signature: (sda{s(isss)}s) // arg.beginStructure(); @@ -89,16 +95,30 @@ arg.beginMapEntry(); arg >> rs >> node; arg.endMapEntry(); - if( !rs.startsWith(QLatin1String("|")) ) - result.addRequestProperty( QUrl::fromEncoded( rs.toAscii() ), node ); + result.addRequestProperty( QUrl::fromEncoded( rs.toAscii() ), node ); + } + arg.endMap(); + + Soprano::BindingSet additionalBindings; + arg.beginMap(); + while ( !arg.atEnd() ) { + QString binding; + Soprano::Node node; + arg.beginMapEntry(); + arg >> binding >> node; + arg.endMapEntry(); + additionalBindings.insert( binding, node ); } arg.endMap(); QString excerpt; arg >> excerpt; +// result.setExcerpt( excerpt ); arg.endStructure(); +// result.setAdditionalBindings( additionalBindings ); + return arg; } @@ -129,14 +149,10 @@ QString value, language, dataTypeUri; arg >> type >> value >> language >> dataTypeUri; if ( type == Soprano::Node::LiteralNode ) { -#if SOPRANO_IS_VERSION( 2, 3, 0 ) if ( dataTypeUri.isEmpty() ) node = Soprano::Node( Soprano::LiteralValue::createPlainLiteral( value, language ) ); else node = Soprano::Node( Soprano::LiteralValue::fromString( value, QUrl::fromEncoded( dataTypeUri.toAscii() ) ) ); -#else - node = Soprano::Node( Soprano::LiteralValue::fromString( value, dataTypeUri ), language ); -#endif } else if ( type == Soprano::Node::ResourceNode ) { node = Soprano::Node( QUrl::fromEncoded( value.toAscii() ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/server/src/nepomuk/dbusoperators.h new/akonadi-1.5.2/server/src/nepomuk/dbusoperators.h --- old/akonadi-1.5.0/server/src/nepomuk/dbusoperators.h 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/server/src/nepomuk/dbusoperators.h 2011-04-05 14:22:20.000000000 +0200 @@ -1,19 +1,21 @@ /* - Copyright (c) 2008 Sebastian Trueg <trueg@kde.org> + Copyright (c) 2008-2009 Sebastian Trueg <trueg@kde.org> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _NEPOMUK_SEARCH_DBUS_OPERATORS_H_ @@ -22,17 +24,30 @@ #include <QtDBus/QDBusArgument> #include "result.h" +#include "nepomukquery_export.h" + +Q_DECLARE_METATYPE(Nepomuk::Query::Result) +Q_DECLARE_METATYPE(Soprano::Node) +Q_DECLARE_METATYPE(QList<Nepomuk::Query::Result>) +typedef QHash<QString, QString> RequestPropertyMapDBus; +Q_DECLARE_METATYPE( RequestPropertyMapDBus ) namespace Nepomuk { namespace Query { - void registerDBusTypes(); + /** + * Register the DBus types necessary for communication with the Nepomuk + * query service. This method is only made public for the query service + * itself which links to this library, too. + */ + NEPOMUKQUERY_EXPORT void registerDBusTypes(); } } -QDBusArgument& operator<<( QDBusArgument& arg, const Soprano::Node& ); -const QDBusArgument& operator>>( const QDBusArgument& arg, Soprano::Node& ); +// We export the non-public operators so that we do not need duplicated code in kdebase +NEPOMUKQUERY_EXPORT QDBusArgument& operator<<( QDBusArgument& arg, const Soprano::Node& ); +NEPOMUKQUERY_EXPORT const QDBusArgument& operator>>( const QDBusArgument& arg, Soprano::Node& ); -QDBusArgument& operator<<( QDBusArgument& arg, const Nepomuk::Query::Result& ); -const QDBusArgument& operator>>( const QDBusArgument& arg, Nepomuk::Query::Result& ); +NEPOMUKQUERY_EXPORT QDBusArgument& operator<<( QDBusArgument& arg, const Nepomuk::Query::Result& ); +NEPOMUKQUERY_EXPORT const QDBusArgument& operator>>( const QDBusArgument& arg, Nepomuk::Query::Result& ); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/server/src/nepomuk/nepomukquery_export.h new/akonadi-1.5.2/server/src/nepomuk/nepomukquery_export.h --- old/akonadi-1.5.0/server/src/nepomuk/nepomukquery_export.h 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-1.5.2/server/src/nepomuk/nepomukquery_export.h 2011-04-05 14:22:20.000000000 +0200 @@ -0,0 +1,8 @@ +#ifndef NEPOMUKQUERY_EXPORT_H +#define NEPOMUKQUERY_EXPORT_H + +#ifndef NEPOMUKQUERY_EXPORT +#define NEPOMUKQUERY_EXPORT +#endif + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/server/src/nepomuk/org.kde.nepomuk.Query.xml new/akonadi-1.5.2/server/src/nepomuk/org.kde.nepomuk.Query.xml --- old/akonadi-1.5.0/server/src/nepomuk/org.kde.nepomuk.Query.xml 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/server/src/nepomuk/org.kde.nepomuk.Query.xml 2011-04-05 14:22:20.000000000 +0200 @@ -12,7 +12,7 @@ <arg type="s" direction="out" /> </method> <signal name="newEntries"> - <arg name="entries" type="a(sda{s(isss)})" /> + <arg name="entries" type="a(sda{s(isss)}s)" /> <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QList<Nepomuk::Query::Result>" /> </signal> <signal name="entriesRemoved"> @@ -21,9 +21,6 @@ <signal name="resultCount"> <arg name="count" type="i" /> </signal> - <signal name="totalResultCount"> - <arg name="count" type="i" /> - </signal> <signal name="finishedListing" /> </interface> </node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/server/src/nepomuk/querymetatype.h new/akonadi-1.5.2/server/src/nepomuk/querymetatype.h --- old/akonadi-1.5.0/server/src/nepomuk/querymetatype.h 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/server/src/nepomuk/querymetatype.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* - Copyright (C) 2008-2009 by Sebastian Trueg <trueg at kde.org> - - 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; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -/* - * This file looks very weird but is the only way to get the Query metatype - * into the service interface when generated via qdbusxml2cpp. - */ - -#ifndef _NEPOMUK_QUERY_META_TYPE_H_ -#define _NEPOMUK_QUERY_META_TYPE_H_ - -typedef QHash<QString, QString> RequestPropertyMapDBus; -Q_DECLARE_METATYPE( RequestPropertyMapDBus ) - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.0/server/src/storage/dbconfigmysql.cpp new/akonadi-1.5.2/server/src/storage/dbconfigmysql.cpp --- old/akonadi-1.5.0/server/src/storage/dbconfigmysql.cpp 2011-01-22 15:35:30.000000000 +0100 +++ new/akonadi-1.5.2/server/src/storage/dbconfigmysql.cpp 2011-04-05 14:22:20.000000000 +0200 @@ -111,8 +111,10 @@ settings.endGroup(); // verify settings and apply permanent changes (written out below) - if ( mInternalServer ) + if ( mInternalServer ) { mConnectionOptions = defaultOptions; + mDatabaseName = defaultDbName; + } if ( mInternalServer && (mServerPath.isEmpty() || !QFile::exists( mServerPath ) ) ) mServerPath = defaultServerPath; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org