diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
commit | 2699a201e0f70a2e1c2f7a0cab8725321649893d (patch) | |
tree | b9f1b7eaa65592b658bb922714a975725e244d3c /extra/kdebase-runtime | |
parent | 8d1750d5bec9ffb69b499a8452d7c2c52cea70e5 (diff) | |
parent | 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bacula/PKGBUILD
community/clementine/PKGBUILD
community/dbus-sharp-glib/PKGBUILD
community/dockmanager/PKGBUILD
community/docky/PKGBUILD
community/flightgear-atlas/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/openmovieeditor/PKGBUILD
community/perl-crypt-openssl-bignum/PKGBUILD
community/perl-crypt-openssl-random/PKGBUILD
community/perl-crypt-openssl-rsa/PKGBUILD
community/tucan/PKGBUILD
core/btrfs-progs-unstable/PKGBUILD
core/module-init-tools/PKGBUILD
core/sqlite3/PKGBUILD.mips64el
extra/bogofilter/PKGBUILD
extra/dirmngr/PKGBUILD
extra/gluezilla/PKGBUILD
extra/gnupg/PKGBUILD
extra/gnupg2/PKGBUILD
extra/gpgme/PKGBUILD
extra/kdeaccessibility/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libassuan/PKGBUILD
extra/libksba/PKGBUILD
extra/oxygen-gtk/PKGBUILD
extra/pinentry/PKGBUILD
extra/pth/PKGBUILD
extra/smplayer-themes/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/linux-libre.preset.mips64el
Diffstat (limited to 'extra/kdebase-runtime')
-rw-r--r-- | extra/kdebase-runtime/libqzeitgeist08.patch | 102 |
1 files changed, 0 insertions, 102 deletions
diff --git a/extra/kdebase-runtime/libqzeitgeist08.patch b/extra/kdebase-runtime/libqzeitgeist08.patch deleted file mode 100644 index f832cd8b2..000000000 --- a/extra/kdebase-runtime/libqzeitgeist08.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- 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) |