Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/i3-wm/PKGBUILD
	community/jack2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	community/qc-usb-messenger/PKGBUILD
	community/sword/PKGBUILD
	community/virtualbox/PKGBUILD
	community/vuze/PKGBUILD
	extra/archboot/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/digikam/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdebindings/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-blinken/kdeedu-blinken.install
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-cantor/kdeedu-cantor.install
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalgebra/kdeedu-kalgebra.install
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kalzium/kdeedu-kalzium.install
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kanagram/kdeedu-kanagram.install
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kbruch/kdeedu-kbruch.install
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-kgeography/kdeedu-kgeography.install
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-khangman/kdeedu-khangman.install
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kig/kdeedu-kig.install
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-kiten/kdeedu-kiten.install
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-klettres/kdeedu-klettres.install
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kmplot/kdeedu-kmplot.install
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-kstars/kdeedu-kstars.install
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-ktouch/kdeedu-ktouch.install
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kturtle/kdeedu-kturtle.install
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-marble/gpsd-2.96.patch
	extra/kdeedu-marble/kdeedu-marble.install
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-parley/kdeedu-parley.install
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdeedu-step/kdeedu-step.install
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-gwenview/kdegraphics-gwenview.install
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-kruler/kdegraphics-kruler.install
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-okular/kdegraphics-okular.install
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kate/kdebase-kwrite.install
	extra/kdesdk-kate/kdesdk-kate.install
	extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
	extra/kdeutils/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/koffice/PKGBUILD
	extra/konq-plugins/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdcraw/libkdcraw.install
	extra/libkdeedu/PKGBUILD
	extra/libkdeedu/libkdeedu.install
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkipi/libkipi.install
	extra/libksane/PKGBUILD
	extra/libksane/libksane.install
	extra/liblrdf/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mysql/PKGBUILD
	extra/partitionmanager/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/samba/PKGBUILD
	extra/sbcl/PKGBUILD
	extra/texlive-bin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	testing/mesa/PKGBUILD
	~fauno/notmuch/PKGBUILD

2 files changed, 0 insertions, 188 deletions

diff --git a/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch b/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch
deleted file mode 100644
index 545072807..000000000
--- a/kde-unstable/kdebase-runtime/fix-nepomuk-cpu-usage.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-commit 327ec9a67af653467b670115ebb3e26b00183c1d
-Author: Sebastian Trueg <trueg@kde.org>
-Date:   Thu Jul 7 17:33:23 2011 +0200
-
-    Throttle the IndexCleaner the same way we do with the IndexScheduler.
-    
-    BUG: 276593
-
-diff --git a/nepomuk/services/strigi/indexcleaner.cpp b/nepomuk/services/strigi/indexcleaner.cpp
-index 5c604ab..9198d0b 100644
---- a/nepomuk/services/strigi/indexcleaner.cpp
-+++ b/nepomuk/services/strigi/indexcleaner.cpp
-@@ -47,7 +47,8 @@ using namespace Soprano::Vocabulary;
- 
- 
- Nepomuk::IndexCleaner::IndexCleaner(QObject* parent)
--    : KJob(parent)
-+    : KJob(parent),
-+      m_delay(0)
- {
-     setCapabilities( Suspendable );
- }
-@@ -268,7 +269,7 @@ void Nepomuk::IndexCleaner::slotRemoveResourcesDone(KJob* job)
- 
-     QMutexLocker lock(&m_stateMutex);
-     if( !m_suspended ) {
--        clearNextBatch();
-+        QTimer::singleShot(m_delay, this, SLOT(clearNextBatch()));
-     }
- }
- 
-@@ -313,4 +314,9 @@ bool Nepomuk::IndexCleaner::doResume()
-     return true;
- }
- 
-+void Nepomuk::IndexCleaner::setDelay(int msecs)
-+{
-+    m_delay = msecs;
-+}
-+
- #include "indexcleaner.moc"
-diff --git a/nepomuk/services/strigi/indexcleaner.h b/nepomuk/services/strigi/indexcleaner.h
-index e1c38ca..bf0713e 100644
---- a/nepomuk/services/strigi/indexcleaner.h
-+++ b/nepomuk/services/strigi/indexcleaner.h
-@@ -41,6 +41,16 @@ namespace Nepomuk {
-         virtual bool doSuspend();
-         virtual bool doResume();
- 
-+    public slots:
-+        /**
-+         * Set the delay between the cleanup queries.
-+         * Used for throtteling the cleaner to not grab too
-+         * many resources. Default is 0.
-+         *
-+         * \sa IndexScheduler::setIndexingSpeed()
-+         */
-+        void setDelay(int msecs);
-+
-     private slots:
-         void clearNextBatch();
-         void slotRemoveResourcesDone(KJob* job);
-@@ -52,6 +62,7 @@ namespace Nepomuk {
- 
-         QMutex m_stateMutex;
-         bool m_suspended;
-+        int m_delay;
-     };
- }
- 
-diff --git a/nepomuk/services/strigi/indexscheduler.cpp b/nepomuk/services/strigi/indexscheduler.cpp
-index 3c92657..f3c6c36 100644
---- a/nepomuk/services/strigi/indexscheduler.cpp
-+++ b/nepomuk/services/strigi/indexscheduler.cpp
-@@ -208,7 +208,7 @@ Nepomuk::IndexScheduler::IndexScheduler( QObject* parent )
-     : QObject( parent ),
-       m_suspended( false ),
-       m_indexing( false ),
--      m_speed( FullSpeed )
-+      m_indexingDelay( 0 )
- {
-     m_cleaner = new IndexCleaner(this);
-     connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) );
-@@ -266,7 +266,13 @@ void Nepomuk::IndexScheduler::setSuspended( bool suspended )
- void Nepomuk::IndexScheduler::setIndexingSpeed( IndexingSpeed speed )
- {
-     kDebug() << speed;
--    m_speed = speed;
-+    m_indexingDelay = 0;
-+    if ( speed != FullSpeed ) {
-+        m_indexingDelay = (speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
-+    }
-+    if( m_cleaner ) {
-+        m_cleaner->setDelay(m_indexingDelay);
-+    }
- }
- 
- 
-@@ -481,11 +487,7 @@ bool Nepomuk::IndexScheduler::analyzeDir( const QString& dir_, Nepomuk::IndexSch
- void Nepomuk::IndexScheduler::callDoIndexing()
- {
-     if( !m_suspended ) {
--        uint delay = 0;
--        if ( m_speed != FullSpeed ) {
--            delay = (m_speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
--        }
--        QTimer::singleShot( delay, this, SLOT(doIndexing()) );
-+        QTimer::singleShot( m_indexingDelay, this, SLOT(doIndexing()) );
-     }
- }
- 
-diff --git a/nepomuk/services/strigi/indexscheduler.h b/nepomuk/services/strigi/indexscheduler.h
-index 9ae1f18..8756206 100644
---- a/nepomuk/services/strigi/indexscheduler.h
-+++ b/nepomuk/services/strigi/indexscheduler.h
-@@ -121,8 +121,6 @@ namespace Nepomuk {
-             SnailPace
-         };
- 
--        IndexingSpeed currentSpeed() const { return m_speed; }
--
-     public Q_SLOTS:
-         void suspend();
-         void resume();
-@@ -226,7 +224,7 @@ namespace Nepomuk {
-         QString m_currentFolder;
-         KUrl m_currentUrl;
- 
--        IndexingSpeed m_speed;
-+        int m_indexingDelay;
-         IndexCleaner* m_cleaner;
-     };
- 
diff --git a/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch b/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch
deleted file mode 100644
index 31ea4a606..000000000
--- a/kde-unstable/kdemultimedia/fix-memleak-in-kmix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
-===================================================================
---- kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241345)
-+++ kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241346)
-@@ -754,7 +754,12 @@
-         return;
-     }
-     addDevice((*map)[index]);
--    emit controlsReconfigured(_mixer->id());
-+    // Do not emit directly to ensure all connected slots are executed
-+    // in their own event loop.
-+    QMetaObject::invokeMethod(this,
-+                              "controlsReconfigured",
-+                              Qt::QueuedConnection,
-+                              Q_ARG(QString, _mixer->id()));
- }
- 
- void Mixer_PULSE::removeWidget(int index)
-@@ -778,7 +783,12 @@
-         {
-             delete *iter;
-             m_mixDevices.erase(iter);
--            emit controlsReconfigured(_mixer->id());
-+            // Do not emit directly to ensure all connected slots are executed
-+            // in their own event loop.
-+            QMetaObject::invokeMethod(this,
-+                                      "controlsReconfigured",
-+                                      Qt::QueuedConnection,
-+                                      Q_ARG(QString, _mixer->id()));
-             return;
-         }
-     }
-@@ -799,7 +809,12 @@
-         delete *iter;
-         m_mixDevices.erase(iter);
-     }
--    emit controlsReconfigured(_mixer->id());
-+    // Do not emit directly to ensure all connected slots are executed
-+    // in their own event loop.
-+    QMetaObject::invokeMethod(this,
-+                              "controlsReconfigured",
-+                              Qt::QueuedConnection,
-+                              Q_ARG(QString, _mixer->id()));
- }
- 
- void Mixer_PULSE::addDevice(devinfo& dev)
-@@ -990,7 +1005,7 @@
-         kDebug(67100) <<  "Using PulseAudio for mixer: " << m_mixerName;
-         m_isOpen = true;
-     }
-- 
-+
-     return 0;
- }
-