kde4-kdebase-runtime-qzeitgeist.patch

   1 --- kde-runtime-4.7.4/activitymanager/CMakeLists.txt.orig       2011-12-02 00:25:05.000000000 +0100
   2 +++ kde-runtime-4.7.4/activitymanager/CMakeLists.txt    2011-12-30 02:27:41.851186489 +0100
   3 @@ -25,12 +25,12 @@
   4  macro_optional_find_package(QZeitgeist)
   5
   6  if (QZEITGEIST_INCLUDE_DIR)
   7 -    if (QZEITGEIST_VERSION VERSION_LESS 0.8.0)
   8 +    if (QZEITGEIST_VERSION VERSION_LESS 0.9.0)
   9          set(QZeitgeist_FOUND TRUE)
  10 -    else (QZEITGEIST_VERSION VERSION_LESS 0.8.0)
  11 -        message(STATUS "QZeitgeist 0.8.0 and greater are not supported")
  12 +    else (QZEITGEIST_VERSION VERSION_LESS 0.9.0)
  13 +        message(STATUS "QZeitgeist 0.9.0 and greater are not supported")
  14          set(QZeitgeist_FOUND FALSE)
  15 -    endif (QZEITGEIST_VERSION VERSION_LESS 0.8.0)
  16 +    endif (QZEITGEIST_VERSION VERSION_LESS 0.9.0)
  17  endif(QZEITGEIST_INCLUDE_DIR)
  18
  19  macro_log_feature(
  20 --- kde-runtime-4.7.4/activitymanager/ZeitgeistEventBackend.cpp.orig    2011-06-22 16:30:08.000000000 +0200
  21 +++ kde-runtime-4.7.4/activitymanager/ZeitgeistEventBackend.cpp 2011-12-30 02:27:41.853186489 +0100
  22 @@ -21,31 +21,31 @@
  23
  24  #ifndef HAVE_QZEITGEIST
  25  #ifdef __GNUC__
  26 -    #warning "No QtZeitgeist, disabling desktop events processing"
  27 +    #warning "No QZeitgeist, disabling desktop events processing"
  28  #endif
  29
  30  #else // HAVE_QZEITGEIST
  31
  32  #include "ZeitgeistEventBackend.h"
  33
  34 -#include <QtZeitgeist/QtZeitgeist>
  35 -#include <QtZeitgeist/Interpretation>
  36 -#include <QtZeitgeist/Manifestation>
  37 +#include <QZeitgeist/QZeitgeist>
  38 +#include <QZeitgeist/Interpretation>
  39 +#include <QZeitgeist/Manifestation>
  40
  41  static QString eventInterpretation(Event::Type type)
  42  {
  43      switch (type) {
  44          case Event::Accessed:
  45 -            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
  46 +            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
  47
  48          case Event::Opened:
  49 -            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
  50 +            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
  51
  52          case Event::Modified:
  53 -            return QtZeitgeist::Interpretation::Event::ZGModifyEvent;
  54 +            return QZeitgeist::Interpretation::Event::ZGModifyEvent;
  55
  56          case Event::Closed:
  57 -            return QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
  58 +            return QZeitgeist::Interpretation::Event::ZGLeaveEvent;
  59
  60      }
  61
  62 @@ -57,23 +57,23 @@
  63  {
  64      switch (reason) {
  65          case Event::User:
  66 -            return QtZeitgeist::Manifestation::Event::ZGUserActivity;
  67 +            return QZeitgeist::Manifestation::Event::ZGUserActivity;
  68
  69          case Event::Heuristic:
  70 -            return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity;
  71 +            return QZeitgeist::Manifestation::Event::ZGHeuristicActivity;
  72
  73          case Event::Scheduled:
  74 -            return QtZeitgeist::Manifestation::Event::ZGScheduledActivity;
  75 +            return QZeitgeist::Manifestation::Event::ZGScheduledActivity;
  76
  77          case Event::System:
  78 -            return QtZeitgeist::Manifestation::Event::ZGSystemNotification;
  79 +            return QZeitgeist::Manifestation::Event::ZGSystemNotification;
  80
  81          case Event::World:
  82 -            return QtZeitgeist::Manifestation::Event::ZGWorldActivity;
  83 +            return QZeitgeist::Manifestation::Event::ZGWorldActivity;
  84      }
  85
  86      // shut up GCC
  87 -    return QtZeitgeist::Manifestation::Event::ZGUserActivity;
  88 +    return QZeitgeist::Manifestation::Event::ZGUserActivity;
  89  }
  90
  91  static QString applicationUri(const QString & application)
  92 @@ -84,7 +84,7 @@
  93
  94  ZeitgeistEventBackend::ZeitgeistEventBackend()
  95  {
  96 -    QtZeitgeist::init();
  97 +
  98  }
  99
 100  void ZeitgeistEventBackend::addEvents(const EventList & events)