[arch-commits] Commit in nepomuk-core/repos (6 files)

Andrea Scarpino andrea at archlinux.org
Tue Oct 2 18:56:34 UTC 2012


    Date: Tuesday, October 2, 2012 @ 14:56:33
  Author: andrea
Revision: 167563

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  nepomuk-core/repos/testing-i686/
  nepomuk-core/repos/testing-i686/PKGBUILD
    (from rev 167562, nepomuk-core/trunk/PKGBUILD)
  nepomuk-core/repos/testing-i686/regression-crash.patch
    (from rev 167562, nepomuk-core/trunk/regression-crash.patch)
  nepomuk-core/repos/testing-x86_64/
  nepomuk-core/repos/testing-x86_64/PKGBUILD
    (from rev 167562, nepomuk-core/trunk/PKGBUILD)
  nepomuk-core/repos/testing-x86_64/regression-crash.patch
    (from rev 167562, nepomuk-core/trunk/regression-crash.patch)

---------------------------------------+
 testing-i686/PKGBUILD                 |   39 ++++++++++++++++++++++++++++++++
 testing-i686/regression-crash.patch   |   25 ++++++++++++++++++++
 testing-x86_64/PKGBUILD               |   39 ++++++++++++++++++++++++++++++++
 testing-x86_64/regression-crash.patch |   25 ++++++++++++++++++++
 4 files changed, 128 insertions(+)

Copied: nepomuk-core/repos/testing-i686/PKGBUILD (from rev 167562, nepomuk-core/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-10-02 18:56:33 UTC (rev 167563)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=nepomuk-core
+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"
+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'
+          'e6237844c0f9d5838b827068fe768394e0df0cff')
+
+build() {
+  # KDEBUG 307388
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/regression-crash.patch
+  cd ../
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  # Fix the python shebang
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
+}

Copied: nepomuk-core/repos/testing-i686/regression-crash.patch (from rev 167562, nepomuk-core/trunk/regression-crash.patch)
===================================================================
--- testing-i686/regression-crash.patch	                        (rev 0)
+++ testing-i686/regression-crash.patch	2012-10-02 18:56:33 UTC (rev 167563)
@@ -0,0 +1,25 @@
+commit 804e54f83ade8a377d392d350981ead07f60a9d3
+Author: David Faure <faure at 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();
+ }

Copied: nepomuk-core/repos/testing-x86_64/PKGBUILD (from rev 167562, nepomuk-core/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-10-02 18:56:33 UTC (rev 167563)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=nepomuk-core
+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"
+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'
+          'e6237844c0f9d5838b827068fe768394e0df0cff')
+
+build() {
+  # KDEBUG 307388
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/regression-crash.patch
+  cd ../
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  # Fix the python shebang
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
+}

Copied: nepomuk-core/repos/testing-x86_64/regression-crash.patch (from rev 167562, nepomuk-core/trunk/regression-crash.patch)
===================================================================
--- testing-x86_64/regression-crash.patch	                        (rev 0)
+++ testing-x86_64/regression-crash.patch	2012-10-02 18:56:33 UTC (rev 167563)
@@ -0,0 +1,25 @@
+commit 804e54f83ade8a377d392d350981ead07f60a9d3
+Author: David Faure <faure at 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();
+ }




More information about the arch-commits mailing list