[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Monday, April 28, 2014 @ 12:46:55
Author: andrea
Revision: 211856
upgpkg: nepomuk-core 4.13.0-2
Add missing baloo dependence
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-28 10:32:20 UTC (rev 211855)
+++ PKGBUILD2014-04-28 10:46:55 UTC (rev 211856)
@@ -3,12 +3,13 @@
pkgname=nepomuk-core
pkgver=4.13.0
-pkgrel=1
+pkgrel=2
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')
license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools'
'kdegraphics-mobipocket' 'shared-desktop-ontologies')
+depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools'
+ 'kdegraphics-mobipocket' 'shared-desktop-ontologies' 'baloo')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
sha1sums=('44e65063138088be91f03c8bb7ff8be7cd255984')
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Friday, April 11, 2014 @ 19:07:31
Author: andrea
Revision: 210206
Ship this to provide nepomukbaloomigrator
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-11 16:54:08 UTC (rev 210205)
+++ PKGBUILD2014-04-11 17:07:31 UTC (rev 210206)
@@ -2,16 +2,16 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.12.4
+pkgver=4.13.0
pkgrel=1
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')
license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools'
'kdegraphics-mobipocket')
+depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools'
'kdegraphics-mobipocket' 'shared-desktop-ontologies')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('ab97b1ec27d834e0e2d27fc1a96c4f838f2d2f93')
+sha1sums=('44e65063138088be91f03c8bb7ff8be7cd255984')
prepare() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Monday, March 31, 2014 @ 11:56:08
Author: svenstaro
Revision: 209275
upgpkg: nepomuk-core 4.12.4-1
kde 4.12.4 release
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-31 09:55:39 UTC (rev 209274)
+++ PKGBUILD2014-03-31 09:56:08 UTC (rev 209275)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.12.3
+pkgver=4.12.4
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools'
'kdegraphics-mobipocket')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('35c24f160a94552f73a489fe0c3ae89195b69a99')
+sha1sums=('ab97b1ec27d834e0e2d27fc1a96c4f838f2d2f93')
prepare() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Tuesday, February 4, 2014 @ 14:47:39
Author: svenstaro
Revision: 205092
upgpkg: nepomuk-core 4.12.2-1
upstream release 4.12.2
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-04 13:47:37 UTC (rev 205091)
+++ PKGBUILD2014-02-04 13:47:39 UTC (rev 205092)
@@ -2,8 +2,8 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.12.1
-pkgrel=2
+pkgver=4.12.2
+pkgrel=1
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')
@@ -11,7 +11,7 @@
depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools'
'kdegraphics-mobipocket')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('61f06d7044fb5bd3adf2b09820f95cb898604540')
+sha1sums=('1970ac31b0a73afbebc682cb8310d2b49affc65f')
prepare() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Friday, January 24, 2014 @ 12:08:50
Author: andyrtr
Revision: 204622
upgpkg: nepomuk-core 4.12.1-2
rebuild for exiv2
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-24 11:03:29 UTC (rev 204621)
+++ PKGBUILD2014-01-24 11:08:50 UTC (rev 204622)
@@ -3,7 +3,7 @@
pkgname=nepomuk-core
pkgver=4.12.1
-pkgrel=1
+pkgrel=2
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')
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Tuesday, January 14, 2014 @ 08:34:17
Author: svenstaro
Revision: 203686
upgpkg: nepomuk-core 4.12.1-1
upstream release 4.12.1
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-14 07:34:15 UTC (rev 203685)
+++ PKGBUILD2014-01-14 07:34:17 UTC (rev 203686)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.12.0
+pkgver=4.12.1
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools'
'kdegraphics-mobipocket')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('2b4ec16c5e664ae7dcd4035229000b8d7712181d')
+sha1sums=('61f06d7044fb5bd3adf2b09820f95cb898604540')
prepare() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Friday, December 6, 2013 @ 13:14:35
Author: svenstaro
Revision: 200868
upgpkg: nepomuk-core 4.11.4-1
KDE 4.11.4
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-06 12:14:34 UTC (rev 200867)
+++ PKGBUILD2013-12-06 12:14:35 UTC (rev 200868)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.11.3
+pkgver=4.11.4
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('9d97cb731728a43037eb208e2322b6e0b4e8b7e5')
+sha1sums=('982e3de5e6a2a18fadb9a11f44fdc302f3b6f5e0')
prepare() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Tuesday, October 1, 2013 @ 17:13:04
Author: svenstaro
Revision: 195495
upgpkg: nepomuk-core 4.11.2-1
kde 4.11.2 release
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-01 15:13:00 UTC (rev 195494)
+++ PKGBUILD2013-10-01 15:13:04 UTC (rev 195495)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.11.1
+pkgver=4.11.2
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('a4ca9b755ffd667f8fd7277d0ef3355dbf9e0298')
+sha1sums=('d5a320b39edda61f82ad24da1745238bfcdfe73c')
prepare() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Monday, July 15, 2013 @ 22:10:54
Author: svenstaro
Revision: 190116
upgpkg: nepomuk-core 4.10.5-2
ffmpeg 2.0 rebuild
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-15 20:06:47 UTC (rev 190115)
+++ PKGBUILD2013-07-15 20:10:54 UTC (rev 190116)
@@ -3,7 +3,7 @@
pkgname=nepomuk-core
pkgver=4.10.5
-pkgrel=1
+pkgrel=2
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')
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Tuesday, May 7, 2013 @ 15:26:36
Author: andrea
Revision: 184469
KDE 4.10.3
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-07 13:26:35 UTC (rev 184468)
+++ PKGBUILD2013-05-07 13:26:36 UTC (rev 184469)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.10.2
+pkgver=4.10.3
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('e17ca2b7eb3b1745806be7576d6340777f4ce0d0')
+sha1sums=('205cb87512c3d24f41295a534770779e41051a29')
build() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Thursday, April 4, 2013 @ 05:33:01
Author: svenstaro
Revision: 181386
upgpkg: nepomuk-core 4.10.2-1
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-04 03:32:38 UTC (rev 181385)
+++ PKGBUILD2013-04-04 03:33:01 UTC (rev 181386)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.10.1
+pkgver=4.10.2
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('23661174669b32b12e7c930d700b08a4f7efd275')
+sha1sums=('e17ca2b7eb3b1745806be7576d6340777f4ce0d0')
build() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD fix-crash-on-new-install.patch)
Date: Monday, February 25, 2013 @ 11:11:44
Author: andrea
Revision: 178525
upgpkg: nepomuk-core 4.10.0-4
Fix crash on new install (FS#34015)
Added:
nepomuk-core/trunk/fix-crash-on-new-install.patch
Modified:
nepomuk-core/trunk/PKGBUILD
+
PKGBUILD |9 ++---
fix-crash-on-new-install.patch | 37 +
2 files changed, 43 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 10:11:29 UTC (rev 178524)
+++ PKGBUILD2013-02-25 10:11:44 UTC (rev 178525)
@@ -3,7 +3,7 @@
pkgname=nepomuk-core
pkgver=4.10.0
-pkgrel=3
+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')
@@ -11,13 +11,16 @@
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
Added: fix-crash-on-new-install.patch
===
--- fix-crash-on-new-install.patch (rev 0)
+++ fix-crash-on-new-install.patch 2013-02-25 10:11:44 UTC (rev 178525)
@@ -0,0 +1,37 @@
+commit b94e9f73bd86593928988e5626511acea805b7be
+Author: Edward Toroshchin k...@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 );
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Wednesday, February 13, 2013 @ 17:32:59
Author: andrea
Revision: 178013
upgpkg: nepomuk-core 4.10.0-3
ffmpeg rebuild
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-13 16:03:52 UTC (rev 178012)
+++ PKGBUILD2013-02-13 16:32:59 UTC (rev 178013)
@@ -3,7 +3,7 @@
pkgname=nepomuk-core
pkgver=4.10.0
-pkgrel=2
+pkgrel=3
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')
@@ -30,7 +30,7 @@
}
package() {
- cd ${srcdir}/build
+ cd build
make DESTDIR=${pkgdir} install
# Fix the python shebang
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD fix-recursive-indexing.patch)
Date: Saturday, February 9, 2013 @ 07:06:03
Author: andrea
Revision: 177800
upgpkg: nepomuk-core 4.10.0-2
Fix recursive indexing (FS#33776)
Added:
nepomuk-core/trunk/fix-recursive-indexing.patch
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD | 12 +++-
fix-recursive-indexing.patch | 103 +
2 files changed, 112 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-09 02:58:49 UTC (rev 177799)
+++ PKGBUILD2013-02-09 06:06:03 UTC (rev 177800)
@@ -3,17 +3,23 @@
pkgname=nepomuk-core
pkgver=4.10.0
-pkgrel=1
+pkgrel=2
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')
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;)
-sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264')
+source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
+'fix-recursive-indexing.patch')
+sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264'
+ 'faa0f661fe642af01ac72eda7347dfc659e091e1')
build() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ${srcdir}/fix-recursive-indexing.patch
+ cd ../
+
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
Added: fix-recursive-indexing.patch
===
--- fix-recursive-indexing.patch(rev 0)
+++ fix-recursive-indexing.patch2013-02-09 06:06:03 UTC (rev 177800)
@@ -0,0 +1,103 @@
+From: Vishesh Handa m...@vhanda.in
+Date: Fri, 08 Feb 2013 20:58:33 +
+Subject: Revert BasicIndexingQueue: Use stacks instead of queues
+X-Git-Url:
http://quickgit.kde.org/?p=nepomuk-core.gita=commitdiffh=b651f9231ac30072418bb06d602951f0f05da22c
+---
+Revert BasicIndexingQueue: Use stacks instead of queues
+
+This reverts commit 2f33141aa6716550e38b11ec9a0b000dd74eea79.
+
+The commit breaks recursive indexing. Doh!
+
+BUG: 314559
+---
+
+
+--- a/services/fileindexer/basicindexingqueue.cpp
b/services/fileindexer/basicindexingqueue.cpp
+@@ -54,14 +54,14 @@
+
+ void BasicIndexingQueue::clear(const QString path)
+ {
+-QMutableVectorIterator QPairQString, UpdateDirFlags it( m_paths );
++QMutableListIterator QPairQString, UpdateDirFlags it( m_paths );
+ while( it.hasNext() ) {
+ it.next();
+ if( it.value().first.startsWith( path ) )
+ it.remove();
+ }
+
+-QMutableVectorIterator QPairQDirIterator*, UpdateDirFlags iter(
m_iterators );
++QMutableListIterator QPairQDirIterator*, UpdateDirFlags iter(
m_iterators );
+ while( iter.hasNext() ) {
+ QDirIterator* dirIter = iter.next().first;
+
+@@ -100,7 +100,7 @@
+ {
+ kDebug() path;
+ bool wasEmpty = m_paths.empty();
+-m_paths.push( qMakePair( path, flags ) );
++m_paths.enqueue( qMakePair( path, flags ) );
+ callForNextIteration();
+
+ if( wasEmpty )
+@@ -120,12 +120,12 @@
+ processingFile = process( dirIt-next(), pair.second );
+ }
+ else {
+-delete m_iterators.pop().first;
++delete m_iterators.dequeue().first;
+ }
+ }
+
+ else if( !m_paths.isEmpty() ) {
+-QPair QString, UpdateDirFlags pair = m_paths.pop();
++QPair QString, UpdateDirFlags pair = m_paths.dequeue();
+ processingFile = process( pair.first, pair.second );
+ }
+
+@@ -161,7 +161,7 @@
+ QDir::Filters dirFilter =
QDir::NoDotAndDotDot|QDir::Readable|QDir::Files|QDir::Dirs;
+
+ QPairQDirIterator*, UpdateDirFlags pair = qMakePair( new
QDirIterator( path, dirFilter ), flags );
+-m_iterators.push( pair );
++m_iterators.enqueue( pair );
+ }
+ }
+ else if( info.isFile() (forced || indexingRequired) ) {
+@@ -259,12 +259,6 @@
+
+ emit endIndexingFile( url );
+
+-// Give back the memory
+-if( m_paths.isEmpty() )
+-m_paths.clear();
+-if( m_iterators.isEmpty() )
+-m_iterators.clear();
+-
+ // Continue the queue
+ finishIteration();
+ }
+
+--- a/services/fileindexer/basicindexingqueue.h
b/services/fileindexer/basicindexingqueue.h
+@@ -23,7 +23,6 @@
+
+ #include indexingqueue.h
+ #include KJob
+-#include QtCore/QStack
+
+ namespace Nepomuk2 {
+
+@@ -106,8 +105,8 @@
+ */
+ bool process(const QString path, Nepomuk2::UpdateDirFlags flags);
+
+-QStack QPairQString, UpdateDirFlags m_paths;
+-QStack QPairQDirIterator*, UpdateDirFlags m_iterators;
++QQueue QPairQString, UpdateDirFlags m_paths;
++QQueue
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Wednesday, January 2, 2013 @ 05:59:38
Author: andrea
Revision: 174034
KDE 4.9.5
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-01-02 10:59:35 UTC (rev 174033)
+++ PKGBUILD2013-01-02 10:59:38 UTC (rev 174034)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.9.4
+pkgver=4.9.5
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('f48b29dbbaec3938930176d3225fe292c26c9fce')
+sha1sums=('082626d17f4759df079a688406e9b96167f0ef15')
build() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Sunday, December 2, 2012 @ 02:42:01
Author: andrea
Revision: 172199
KDE 4.9.4
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-12-02 07:41:57 UTC (rev 172198)
+++ PKGBUILD2012-12-02 07:42:01 UTC (rev 172199)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.9.3
+pkgver=4.9.4
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('d235f033206fdd6d0dbad63143bfa89dde99b19d')
+sha1sums=('f48b29dbbaec3938930176d3225fe292c26c9fce')
build() {
mkdir build
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD regression-crash.patch)
Date: Tuesday, November 6, 2012 @ 08:29:52
Author: andrea
Revision: 170350
KDE 4.9.3
Modified:
nepomuk-core/trunk/PKGBUILD
Deleted:
nepomuk-core/trunk/regression-crash.patch
+
PKGBUILD | 15 ++---
regression-crash.patch | 73 ---
2 files changed, 4 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-06 13:29:48 UTC (rev 170349)
+++ PKGBUILD2012-11-06 13:29:52 UTC (rev 170350)
@@ -2,25 +2,18 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
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')
license=('GPL' 'LGPL' 'FDL')
depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'doxygen')
-source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
-'regression-crash.patch')
-sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
- 'f49436046cfd98b172a53eeaffb0d5df6bf5e1ee')
+source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
+sha1sums=('d235f033206fdd6d0dbad63143bfa89dde99b19d')
build() {
- # KDEBUG 307388
- cd ${pkgname}-${pkgver}
- patch -p1 -i ${srcdir}/regression-crash.patch
- cd ../
-
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
Deleted: regression-crash.patch
===
--- regression-crash.patch 2012-11-06 13:29:48 UTC (rev 170349)
+++ regression-crash.patch 2012-11-06 13:29:52 UTC (rev 170350)
@@ -1,73 +0,0 @@
-From: David Faure fa...@kde.org
-Date: Tue, 02 Oct 2012 18:27:03 +
-Subject: Fix crash when watchUserLimitReached() leads to deleting the KInotify
instance
-X-Git-Url:
http://quickgit.kde.org/?p=nepomuk-core.gitamp;a=commitdiffamp;h=804e54f83ade8a377d392d350981ead07f60a9d3
-Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-
-... which emitted the signal. So don't use a direct delete.
-
-BUG: 307388
-FIXED-IN: 4.9.3
-
-
a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -323,7 +323,8 @@
- void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
- {
- // we do it the brutal way for now hoping with new kernels and defaults
this will never happen
--delete m_dirWatch;
-+// Delete the KInotify and switch to KDirNotify dbus signals
-+m_dirWatch-deleteLater();
- m_dirWatch = 0;
- connectToKDirWatch();
- }
-
-From: Dan Vrátil dvra...@redhat.com
-Date: Wed, 03 Oct 2012 11:27:22 +
-Subject: Add null-crash guards for m_dirWatch to FileWatch
-X-Git-Url:
http://quickgit.kde.org/?p=nepomuk-core.gitamp;a=commitdiffamp;h=32b44881dda4f243932c59c11bf39c91f30c224b
-Add null-crash guards for m_dirWatch to FileWatch
-
-BUG: 307388
-
-
a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -114,6 +114,7 @@
-
- Nepomuk2::FileWatch::FileWatch( QObject* parent, const QListQVariant )
- : Service( parent )
-+, m_dirWatch( 0 )
- {
- // Create the configuration instance singleton (for thread-safety)
- // ==
-@@ -324,8 +325,10 @@
- {
- // we do it the brutal way for now hoping with new kernels and defaults
this will never happen
- // Delete the KInotify and switch to KDirNotify dbus signals
--m_dirWatch-deleteLater();
--m_dirWatch = 0;
-+if( m_dirWatch ) {
-+m_dirWatch-deleteLater();
-+m_dirWatch = 0;
-+}
- connectToKDirWatch();
- }
- #endif
-@@ -413,7 +416,9 @@
- void Nepomuk2::FileWatch::slotDeviceTeardownRequested(const
Nepomuk2::RemovableMediaCache::Entry* entry )
- {
- #ifdef BUILD_KINOTIFY
--m_dirWatch-removeWatch( entry-mountPath() );
-+if( m_dirWatch ) {
-+m_dirWatch-removeWatch( entry-mountPath() );
-+}
- #endif
- }
-
-
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD regression-crash.patch)
Date: Wednesday, October 3, 2012 @ 10:35:13
Author: andrea
Revision: 167754
upgpkg: nepomuk-core 4.9.2-2
New version of the patch
Modified:
nepomuk-core/trunk/PKGBUILD
nepomuk-core/trunk/regression-crash.patch
+
PKGBUILD |4 +-
regression-crash.patch | 72 +++
2 files changed, 62 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-03 14:34:12 UTC (rev 167753)
+++ PKGBUILD2012-10-03 14:35:13 UTC (rev 167754)
@@ -3,7 +3,7 @@
pkgname=nepomuk-core
pkgver=4.9.2
-pkgrel=1
+pkgrel=2
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')
@@ -13,7 +13,7 @@
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
'regression-crash.patch')
sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
- 'e6237844c0f9d5838b827068fe768394e0df0cff')
+ 'f49436046cfd98b172a53eeaffb0d5df6bf5e1ee')
build() {
# KDEBUG 307388
Modified: regression-crash.patch
===
--- regression-crash.patch 2012-10-03 14:34:12 UTC (rev 167753)
+++ regression-crash.patch 2012-10-03 14:35:13 UTC (rev 167754)
@@ -1,19 +1,20 @@
-commit 804e54f83ade8a377d392d350981ead07f60a9d3
-Author: David Faure fa...@kde.org
-Date: Tue Oct 2 20:27:03 2012 +0200
+From: David Faure fa...@kde.org
+Date: Tue, 02 Oct 2012 18:27:03 +
+Subject: Fix crash when watchUserLimitReached() leads to deleting the KInotify
instance
+X-Git-Url:
http://quickgit.kde.org/?p=nepomuk-core.gitamp;a=commitdiffamp;h=804e54f83ade8a377d392d350981ead07f60a9d3
+---
+Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-Fix crash when watchUserLimitReached() leads to deleting the KInotify
instance
-
-... which emitted the signal. So don't use a direct delete.
-
-BUG: 307388
-FIXED-IN: 4.9.3
+... which emitted the signal. So don't use a direct delete.
-diff --git a/services/filewatch/nepomukfilewatch.cpp
b/services/filewatch/nepomukfilewatch.cpp
-index 9fd5d9c..94db504 100644
+BUG: 307388
+FIXED-IN: 4.9.3
+---
+
+
--- a/services/filewatch/nepomukfilewatch.cpp
+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch()
+@@ -323,7 +323,8 @@
void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
{
// we do it the brutal way for now hoping with new kernels and defaults
this will never happen
@@ -23,3 +24,50 @@
m_dirWatch = 0;
connectToKDirWatch();
}
+
+From: Dan Vrátil dvra...@redhat.com
+Date: Wed, 03 Oct 2012 11:27:22 +
+Subject: Add null-crash guards for m_dirWatch to FileWatch
+X-Git-Url:
http://quickgit.kde.org/?p=nepomuk-core.gitamp;a=commitdiffamp;h=32b44881dda4f243932c59c11bf39c91f30c224b
+---
+Add null-crash guards for m_dirWatch to FileWatch
+
+BUG: 307388
+---
+
+
+--- a/services/filewatch/nepomukfilewatch.cpp
b/services/filewatch/nepomukfilewatch.cpp
+@@ -114,6 +114,7 @@
+
+ Nepomuk2::FileWatch::FileWatch( QObject* parent, const QListQVariant )
+ : Service( parent )
++, m_dirWatch( 0 )
+ {
+ // Create the configuration instance singleton (for thread-safety)
+ // ==
+@@ -324,8 +325,10 @@
+ {
+ // we do it the brutal way for now hoping with new kernels and defaults
this will never happen
+ // Delete the KInotify and switch to KDirNotify dbus signals
+-m_dirWatch-deleteLater();
+-m_dirWatch = 0;
++if( m_dirWatch ) {
++m_dirWatch-deleteLater();
++m_dirWatch = 0;
++}
+ connectToKDirWatch();
+ }
+ #endif
+@@ -413,7 +416,9 @@
+ void Nepomuk2::FileWatch::slotDeviceTeardownRequested(const
Nepomuk2::RemovableMediaCache::Entry* entry )
+ {
+ #ifdef BUILD_KINOTIFY
+-m_dirWatch-removeWatch( entry-mountPath() );
++if( m_dirWatch ) {
++m_dirWatch-removeWatch( entry-mountPath() );
++}
+ #endif
+ }
+
+
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Tuesday, October 2, 2012 @ 05:09:17
Author: andrea
Revision: 167428
KDE 4.9.2
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-02 09:09:14 UTC (rev 167427)
+++ PKGBUILD2012-10-02 09:09:17 UTC (rev 167428)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.9.1
+pkgver=4.9.2
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('1dbb4467b7d4ec50133e5ce86c3837b57b95794d')
+sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b')
build() {
cd ${srcdir}
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD regression-crash.patch)
Date: Tuesday, October 2, 2012 @ 14:41:06
Author: andrea
Revision: 167555
Fix regression
Added:
nepomuk-core/trunk/regression-crash.patch
Modified:
nepomuk-core/trunk/PKGBUILD
+
PKGBUILD | 12 +---
regression-crash.patch | 25 +
2 files changed, 34 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-02 18:35:41 UTC (rev 167554)
+++ PKGBUILD2012-10-02 18:41:06 UTC (rev 167555)
@@ -10,11 +10,17 @@
license=('GPL' 'LGPL' 'FDL')
depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'doxygen')
-source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b')
+source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;
+'regression-crash.patch')
+sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
+ 'e6237844c0f9d5838b827068fe768394e0df0cff')
build() {
- cd ${srcdir}
+ # KDEBUG 307388
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ${srcdir}/regression-crash.patch
+ cd ../
+
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
Added: regression-crash.patch
===
--- regression-crash.patch (rev 0)
+++ regression-crash.patch 2012-10-02 18:41:06 UTC (rev 167555)
@@ -0,0 +1,25 @@
+commit 804e54f83ade8a377d392d350981ead07f60a9d3
+Author: David Faure fa...@kde.org
+Date: Tue Oct 2 20:27:03 2012 +0200
+
+Fix crash when watchUserLimitReached() leads to deleting the KInotify
instance
+
+... which emitted the signal. So don't use a direct delete.
+
+BUG: 307388
+FIXED-IN: 4.9.3
+
+diff --git a/services/filewatch/nepomukfilewatch.cpp
b/services/filewatch/nepomukfilewatch.cpp
+index 9fd5d9c..94db504 100644
+--- a/services/filewatch/nepomukfilewatch.cpp
b/services/filewatch/nepomukfilewatch.cpp
+@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch()
+ void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
+ {
+ // we do it the brutal way for now hoping with new kernels and defaults
this will never happen
+-delete m_dirWatch;
++// Delete the KInotify and switch to KDirNotify dbus signals
++m_dirWatch-deleteLater();
+ m_dirWatch = 0;
+ connectToKDirWatch();
+ }
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Monday, September 3, 2012 @ 17:48:24
Author: andrea
Revision: 165924
KDE 4.9.1
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-03 21:48:20 UTC (rev 165923)
+++ PKGBUILD2012-09-03 21:48:24 UTC (rev 165924)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino and...@archlinux.org
pkgname=nepomuk-core
-pkgver=4.9.0
+pkgver=4.9.1
pkgrel=1
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;
@@ -11,7 +11,7 @@
depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('55dc228d5155220052c4a5d38984092a90a9cae7')
+sha1sums=('1dbb4467b7d4ec50133e5ce86c3837b57b95794d')
build() {
cd ${srcdir}
[arch-commits] Commit in nepomuk-core/trunk (PKGBUILD)
Date: Tuesday, July 31, 2012 @ 09:27:13
Author: andrea
Revision: 164351
New tarball
Modified:
nepomuk-core/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-31 09:59:25 UTC (rev 164350)
+++ PKGBUILD2012-07-31 13:27:13 UTC (rev 164351)
@@ -11,7 +11,7 @@
depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'doxygen')
source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz;)
-sha1sums=('aaeea69c7246050ceb02c0361d9260224a406ef1')
+sha1sums=('55dc228d5155220052c4a5d38984092a90a9cae7')
build() {
cd ${srcdir}
