Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at 2012-08-07 08:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-runtime (Old) and /work/SRC/openSUSE:Factory/.akonadi-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-runtime", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-runtime/akonadi-runtime.changes 2012-04-20 15:10:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-runtime.new/akonadi-runtime.changes 2012-08-07 08:01:27.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 6 15:07:13 UTC 2012 - [email protected] + +- fix build failure with gcc41 + +------------------------------------------------------------------- New: ---- gcc41.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.qQM3Cg/_old 2012-08-07 08:01:38.000000000 +0200 +++ /var/tmp/diff_new_pack.qQM3Cg/_new 2012-08-07 08:01:38.000000000 +0200 @@ -25,6 +25,7 @@ Group: System/GUI/KDE Url: http://akonadi-project.org Source: ftp://ftp.kde.org/pub/kde/stable/akonadi/src/akonadi-%{rversion}.tar.bz2 +Patch0: gcc41.diff BuildRequires: automoc4 BuildRequires: boost-devel BuildRequires: cmake @@ -78,6 +79,7 @@ %prep %setup -q -n akonadi-%{rversion} +%patch0 %build %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc ++++++ gcc41.diff ++++++ --- server/src/nepomuk/queryserviceclient.h +++ server/src/nepomuk/queryserviceclient.h @@ -25,6 +25,8 @@ class QUrl; namespace Nepomuk { + typedef QHash<QString, QString> QStringHashMap; + namespace Query { class Result; @@ -78,7 +80,7 @@ * * \sa QueryParser */ - bool query( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() ); + bool query( const QString& query, const QStringHashMap &encodedRps = QStringHashMap() ); /** * Start a query using the Nepomuk user query language. @@ -96,7 +98,7 @@ * * \sa query(const QString&), close() */ - bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() ); + bool blockingQuery( const QString& query, const QStringHashMap &encodedRps = QStringHashMap() ); /** * Close the client, thus stop to monitor the query -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
