diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-31 13:45:10 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-31 13:45:10 -0300 |
commit | 97a832ff546d30bb6eec34f23fd94aecab9ac738 (patch) | |
tree | 90bbef126bf86efce995dfa00dadd9707baa8222 /extra/kdebase-runtime | |
parent | 9879fa51372849ca7b637a1c22010584ca552274 (diff) | |
parent | f935ebf41c626e4832f86c5f3f7ed1cc35128f6b (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/egoboo/PKGBUILD
extra/gnutls/PKGBUILD
extra/kdelibs/PKGBUILD
extra/maxima/PKGBUILD
extra/phonon/PKGBUILD
extra/rest/PKGBUILD
extra/ristretto/PKGBUILD
extra/samba/PKGBUILD
extra/sbcl/PKGBUILD
extra/xfce4-clipman-plugin/PKGBUILD
extra/xfce4-notifyd/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/kdebase-runtime')
-rw-r--r-- | extra/kdebase-runtime/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/kdebase-runtime/libqzeitgeist08.patch | 102 |
2 files changed, 111 insertions, 4 deletions
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 184c783d3..4cca56251 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139898 2011-10-05 19:09:13Z andrea $ +# $Id: PKGBUILD 141343 2011-10-29 16:05:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime pkgver=4.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -16,10 +16,15 @@ optdepends=('htdig: to build the search index in khelpcenter' 'rarian: needed by khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2") -sha1sums=('4d0b1883a2f65cc9472c4788c24e6b241f3b8828') +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2" + 'libqzeitgeist08.patch') +sha1sums=('4d0b1883a2f65cc9472c4788c24e6b241f3b8828' + '164c9e4305029cb68a2101cfeeb76c7066c2fd39') build() { + cd "${srcdir}"/kde-runtime-${pkgver} + patch -p1 -i "${srcdir}"/libqzeitgeist08.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdebase-runtime/libqzeitgeist08.patch b/extra/kdebase-runtime/libqzeitgeist08.patch new file mode 100644 index 000000000..f832cd8b2 --- /dev/null +++ b/extra/kdebase-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) |