Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

2 files changed, 45 insertions, 5 deletions

diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index 984aa32cc..fe79ed3a3 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177801 2013-02-09 06:06:12Z andrea $
+# $Id: PKGBUILD 178526 2013-02-25 10:11:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-core
 pkgver=4.10.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,13 +11,16 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
 makedepends=('cmake' 'automoc4' 'doxygen')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'fix-recursive-indexing.patch')
+        'fix-recursive-indexing.patch'
+        'fix-crash-on-new-install.patch')
 sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264'
-          'faa0f661fe642af01ac72eda7347dfc659e091e1')
+          'faa0f661fe642af01ac72eda7347dfc659e091e1'
+          '5e3b84f0d0f8a868d4aafedf0f3c7ab631ee4263')
 
 build() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/fix-recursive-indexing.patch
+  patch -p1 -i "${srcdir}"/fix-crash-on-new-install.patch
   cd ../
 
   mkdir build
@@ -30,7 +33,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 
   # Fix the python shebang
diff --git a/extra/nepomuk-core/fix-crash-on-new-install.patch b/extra/nepomuk-core/fix-crash-on-new-install.patch
new file mode 100644
index 000000000..4e921fb52
--- /dev/null
+++ b/extra/nepomuk-core/fix-crash-on-new-install.patch
@@ -0,0 +1,37 @@
+commit b94e9f73bd86593928988e5626511acea805b7be
+Author: Edward Toroshchin <kde@hades.name>
+Date:   Sun Feb 3 17:57:23 2013 +0100
+
+    fileindexer: initialize objects in correct order
+    
+    The IndexCleaner job created in IndexScheduler could complete before
+    m_eventMonitor is initialized, which leads to crash in slotCleaningDone.
+    
+    REVIEW: 108754
+
+diff --git a/services/fileindexer/indexscheduler.cpp b/services/fileindexer/indexscheduler.cpp
+index a13de1b..3ad7819 100644
+--- a/services/fileindexer/indexscheduler.cpp
++++ b/services/fileindexer/indexscheduler.cpp
+@@ -51,10 +51,6 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent )
+         QFile::remove(KStandardDirs::locateLocal("data", QLatin1String("nepomuk/file-indexer-error-log")));
+     }
+ 
+-    m_cleaner = new IndexCleaner(this);
+-    connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) );
+-    m_cleaner->start();
+-
+     FileIndexerConfig* indexConfig = FileIndexerConfig::self();
+     connect( indexConfig, SIGNAL(includeFolderListChanged(QStringList,QStringList)),
+              this, SLOT(slotIncludeFolderListChanged(QStringList,QStringList)) );
+@@ -106,6 +102,10 @@ Nepomuk2::IndexScheduler::IndexScheduler( QObject* parent )
+     connect( m_eventMonitor, SIGNAL(powerManagementStatusChanged(bool)),
+              this, SLOT(slotScheduleIndexing()) );
+ 
++    m_cleaner = new IndexCleaner(this);
++    connect( m_cleaner, SIGNAL(finished(KJob*)), this, SLOT(slotCleaningDone()) );
++    m_cleaner->start();
++
+     // Special settings for the queues
+     KConfig config( "nepomukstrigirc" );
+     KConfigGroup cfg = config.group( "Indexing" );