build issues in akonadi

[Pavel Heimlich, a.k.a. hajma]

2010/6/6 Pavel Heimlich, a.k.a. hajma <tropikhajma at gmail.com>:
> Hi,
> since May 15 kdepimlibs is failing with
> ...
> [ 68%] Building CXX object
> akonadi/contact/CMakeFiles/akonadi-contact.dir/akonadi-contact_automoc.o
>
> "/.../builddir-SunOS-CMake-2.6.4-sunstudio-12.1-cmake-2.6.4/akonadi/contact/../../../srcdir/akonadi/contact/contactstreemodel.h",
> line 166: Error: Redefining Akonadi::EntityTreeModel::UserRole after
> use in Akonadi::ContactsTreeModel.
>
> 1 Error(s) detected.
>
> This is using the Sun Studio compiler on opensolaris, it is usually
> more picky than gcc.
>
> asking at the irc I was pointed at this revision
> http://websvn.kde.org/trunk/KDE/kdepimlibs/akonadi/contact/contactstreemodel.h?r1=1113719&r2=1127039
> but I don't have the knowledge to figure out what's wrong and what the
> intention was.
>
> this prevents me from building most of kde, so any hints are welcome


thanks, this helped:

$ svn diff
Index: akonadi/contact/contactstreemodel.h
===================================================================
--- akonadi/contact/contactstreemodel.h (revision 1135611)
+++ akonadi/contact/contactstreemodel.h (working copy)
@@ -161,7 +161,7 @@
      */
     enum Roles
     {
-      DateRole = UserRole + 1,   ///< The QDate object for the current index.
+      DateRole = EntityTreeModel::UserRole + 1,   ///< The QDate
object for the current index.
       UserRole = DateRole + 42
     };

P.

(forgot to mention that I'm not subscribed to the list, please cc me
when replying)

>
>
> P.
>