Date: Wednesday, November 2, 2011 @ 14:12:10 Author: andrea Revision: 141748
db-move: moved kdebase-runtime from [staging] to [extra] (i686) Added: kdebase-runtime/repos/extra-i686/PKGBUILD (from rev 141742, kdebase-runtime/repos/staging-i686/PKGBUILD) kdebase-runtime/repos/extra-i686/kdebase-runtime.install (from rev 141742, kdebase-runtime/repos/staging-i686/kdebase-runtime.install) kdebase-runtime/repos/extra-i686/libqzeitgeist08.patch (from rev 141742, kdebase-runtime/repos/staging-i686/libqzeitgeist08.patch) Deleted: kdebase-runtime/repos/extra-i686/PKGBUILD kdebase-runtime/repos/extra-i686/kdebase-runtime.install kdebase-runtime/repos/extra-i686/libqzeitgeist08.patch kdebase-runtime/repos/staging-i686/ -------------------------+ PKGBUILD | 86 +++++++++---------- kdebase-runtime.install | 24 ++--- libqzeitgeist08.patch | 204 +++++++++++++++++++++++----------------------- 3 files changed, 157 insertions(+), 157 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-11-02 18:12:08 UTC (rev 141747) +++ extra-i686/PKGBUILD 2011-11-02 18:12:10 UTC (rev 141748) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=kdebase-runtime -pkgver=4.7.2 -pkgrel=2 -pkgdesc="KDE Base Runtime Environment" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' - 'xorg-xauth' 'hicolor-icon-theme') -makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib') -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" - 'libqzeitgeist08.patch') -sha1sums=('4d0b1883a2f65cc9472c4788c24e6b241f3b8828' - '164c9e4305029cb68a2101cfeeb76c7066c2fd39') - -build() { - cd "${srcdir}"/kde-runtime-${pkgver} - patch -p1 -i "${srcdir}"/libqzeitgeist08.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../kde-runtime-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install - rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" - ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" -} Copied: kdebase-runtime/repos/extra-i686/PKGBUILD (from rev 141742, kdebase-runtime/repos/staging-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-11-02 18:12:10 UTC (rev 141748) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdebase-runtime +pkgver=4.7.3 +pkgrel=1 +pkgdesc="KDE Base Runtime Environment" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' + 'xorg-xauth' 'hicolor-icon-theme') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib') +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" + 'libqzeitgeist08.patch') +sha1sums=('293dec26e0d7278396d2ad0240d14aeea6060970' + '164c9e4305029cb68a2101cfeeb76c7066c2fd39') + +build() { + cd "${srcdir}"/kde-runtime-${pkgver} + patch -p1 -i "${srcdir}"/libqzeitgeist08.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" +} Deleted: extra-i686/kdebase-runtime.install =================================================================== --- extra-i686/kdebase-runtime.install 2011-11-02 18:12:08 UTC (rev 141747) +++ extra-i686/kdebase-runtime.install 2011-11-02 18:12:10 UTC (rev 141748) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: kdebase-runtime/repos/extra-i686/kdebase-runtime.install (from rev 141742, kdebase-runtime/repos/staging-i686/kdebase-runtime.install) =================================================================== --- extra-i686/kdebase-runtime.install (rev 0) +++ extra-i686/kdebase-runtime.install 2011-11-02 18:12:10 UTC (rev 141748) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/libqzeitgeist08.patch =================================================================== --- extra-i686/libqzeitgeist08.patch 2011-11-02 18:12:08 UTC (rev 141747) +++ extra-i686/libqzeitgeist08.patch 2011-11-02 18:12:10 UTC (rev 141748) @@ -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) Copied: kdebase-runtime/repos/extra-i686/libqzeitgeist08.patch (from rev 141742, kdebase-runtime/repos/staging-i686/libqzeitgeist08.patch) =================================================================== --- extra-i686/libqzeitgeist08.patch (rev 0) +++ extra-i686/libqzeitgeist08.patch 2011-11-02 18:12:10 UTC (rev 141748) @@ -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)