diff options
| -rw-r--r-- | extra/kde-runtime/.md5sum.i686 | 3 | ||||
| -rw-r--r-- | extra/kde-runtime/.md5sum.x86_64 | 3 | ||||
| -rwxr-xr-x | extra/kde-runtime/Pkgfile | 10 | ||||
| -rw-r--r-- | extra/kde-runtime/libqzeitgeist08.patch | 102 |
4 files changed, 112 insertions, 6 deletions
diff --git a/extra/kde-runtime/.md5sum.i686 b/extra/kde-runtime/.md5sum.i686 index 19670de2e..aa0470f0f 100644 --- a/extra/kde-runtime/.md5sum.i686 +++ b/extra/kde-runtime/.md5sum.i686 @@ -1 +1,2 @@ -16b11a96a7ad0b3c0a7175beb1fa943f kde-runtime-4.7.2.tar.bz2 +1b80879c37e7ab1d23e224d687e8e630 kde-runtime-4.7.3.tar.bz2 +7f334ed87f3f00fb809de6686ce1b1bb libqzeitgeist08.patch diff --git a/extra/kde-runtime/.md5sum.x86_64 b/extra/kde-runtime/.md5sum.x86_64 index 19670de2e..aa0470f0f 100644 --- a/extra/kde-runtime/.md5sum.x86_64 +++ b/extra/kde-runtime/.md5sum.x86_64 @@ -1 +1,2 @@ -16b11a96a7ad0b3c0a7175beb1fa943f kde-runtime-4.7.2.tar.bz2 +1b80879c37e7ab1d23e224d687e8e630 kde-runtime-4.7.3.tar.bz2 +7f334ed87f3f00fb809de6686ce1b1bb libqzeitgeist08.patch diff --git a/extra/kde-runtime/Pkgfile b/extra/kde-runtime/Pkgfile index 077e64a13..c591c0913 100755 --- a/extra/kde-runtime/Pkgfile +++ b/extra/kde-runtime/Pkgfile @@ -2,16 +2,18 @@ # URL: http://www.kde.org # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr -# Depends on: cmake,automoc4,kdelibs,kdepimlibs,libqzeitgeist,openslp,ntrack,libssh,libcanberra -# Run on: kdelibs,kdepimlibs,libqzeitgeist,openslp,ntrack,libssh,libcanberra +# Depends on: cmake,automoc4,kdelibs,kdepimlibs,openslp,ntrack,libssh,libcanberra +# Run on: kdelibs,kdepimlibs,openslp,ntrack,libssh,libcanberra name=kde-runtime -version=4.7.2 +version=4.7.3 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 + libqzeitgeist08.patch) build() { cd $name-* + patch -p1 -i ../libqzeitgeist08.patch mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/kde-runtime/libqzeitgeist08.patch b/extra/kde-runtime/libqzeitgeist08.patch new file mode 100644 index 000000000..d13a43058 --- /dev/null +++ b/extra/kde-runtime/libqzeitgeist08.patch @@ -0,0 +1,102 @@ +--- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~ 2011-10-29 15:46:55.003710230 +0000 ++++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt 2011-10-29 15:47:28.910716093 +0000 +@@ -21,7 +21,7 @@ + ) + endif(Nepomuk_FOUND) + +-# Checking for QtZeitgeist ++# Checking for QZeitgeist + macro_optional_find_package(QZeitgeist) + + if (QZEITGEIST_INCLUDE_DIR) +@@ -30,8 +30,8 @@ + + macro_log_feature( + QZeitgeist_FOUND +- "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" +- "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking") ++ "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" ++ "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking") + if (QZeitgeist_FOUND) + set(HAVE_QZEITGEIST 1) + include_directories(${QZEITGEIST_INCLUDE_DIR}) +--- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~ 2011-10-29 15:47:40.960836591 +0000 ++++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp 2011-10-29 15:48:57.034930073 +0000 +@@ -21,31 +21,31 @@ + + #ifndef HAVE_QZEITGEIST + #ifdef __GNUC__ +- #warning "No QtZeitgeist, disabling desktop events processing" ++ #warning "No QZeitgeist, disabling desktop events processing" + #endif + + #else // HAVE_QZEITGEIST + + #include "ZeitgeistEventBackend.h" + +-#include <QtZeitgeist/QtZeitgeist> +-#include <QtZeitgeist/Interpretation> +-#include <QtZeitgeist/Manifestation> ++#include <QZeitgeist/QZeitgeist> ++#include <QZeitgeist/Interpretation> ++#include <QZeitgeist/Manifestation> + + static QString eventInterpretation(Event::Type type) + { + switch (type) { + case Event::Accessed: +- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; ++ return QZeitgeist::Interpretation::Event::ZGAccessEvent; + + case Event::Opened: +- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; ++ return QZeitgeist::Interpretation::Event::ZGAccessEvent; + + case Event::Modified: +- return QtZeitgeist::Interpretation::Event::ZGModifyEvent; ++ return QZeitgeist::Interpretation::Event::ZGModifyEvent; + + case Event::Closed: +- return QtZeitgeist::Interpretation::Event::ZGLeaveEvent; ++ return QZeitgeist::Interpretation::Event::ZGLeaveEvent; + + } + +@@ -57,23 +57,23 @@ + { + switch (reason) { + case Event::User: +- return QtZeitgeist::Manifestation::Event::ZGUserActivity; ++ return QZeitgeist::Manifestation::Event::ZGUserActivity; + + case Event::Heuristic: +- return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity; ++ return QZeitgeist::Manifestation::Event::ZGHeuristicActivity; + + case Event::Scheduled: +- return QtZeitgeist::Manifestation::Event::ZGScheduledActivity; ++ return QZeitgeist::Manifestation::Event::ZGScheduledActivity; + + case Event::System: +- return QtZeitgeist::Manifestation::Event::ZGSystemNotification; ++ return QZeitgeist::Manifestation::Event::ZGSystemNotification; + + case Event::World: +- return QtZeitgeist::Manifestation::Event::ZGWorldActivity; ++ return QZeitgeist::Manifestation::Event::ZGWorldActivity; + } + + // shut up GCC +- return QtZeitgeist::Manifestation::Event::ZGUserActivity; ++ return QZeitgeist::Manifestation::Event::ZGUserActivity; + } + + static QString applicationUri(const QString & application) +@@ -84,7 +84,6 @@ + + ZeitgeistEventBackend::ZeitgeistEventBackend() + { +- QtZeitgeist::init(); + } + + void ZeitgeistEventBackend::addEvents(const EventList & events) |