[arch-commits] Commit in nepomuk-core/kde-unstable (PKGBUILD virtuoso617.patch)

[Andrea Scarpino]

    Date: Tuesday, August 6, 2013 @ 09:56:48
  Author: andrea
Revision: 192137

upgpkg: nepomuk-core 4.10.97-2

Support virtuoso 6.1.7

Added:
  nepomuk-core/kde-unstable/virtuoso617.patch
Modified:
  nepomuk-core/kde-unstable/PKGBUILD

-------------------+
 PKGBUILD          |   16 ++++++++++++----
 virtuoso617.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-06 07:39:19 UTC (rev 192136)
+++ PKGBUILD	2013-08-06 07:56:48 UTC (rev 192137)
@@ -3,18 +3,26 @@
 
 pkgname=nepomuk-core
 pkgver=4.10.97
-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')
 makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('b35fc166c07c1372d3ba73513780fc41c2005a8f')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'virtuoso617.patch')
+sha1sums=('b35fc166c07c1372d3ba73513780fc41c2005a8f'
+          '2643c311027c758dff635159c6b8a0ebb6088c3e')
 
+prepare() {
+  mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/virtuoso617.patch
+}
+
 build() {
-  mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \

Added: virtuoso617.patch
===================================================================
--- virtuoso617.patch	                        (rev 0)
+++ virtuoso617.patch	2013-08-06 07:56:48 UTC (rev 192137)
@@ -0,0 +1,29 @@
+From: Vishesh Handa <me at vhanda.in>
+Date: Sun, 28 Jul 2013 22:37:55 +0000
+Subject: Repository: Support virtuoso version 6.1.6 and beyond
+X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=0e01d5b59ab6ee566c4290b75d764c72e80c567d
+---
+Repository: Support virtuoso version 6.1.6 and beyond
+
+Not version 7 though
+
+BUG: 313834
+---
+
+
+--- a/services/storage/repository.cpp
++++ b/services/storage/repository.cpp
+@@ -193,8 +193,10 @@
+         return;
+     }
+ 
+-    if( !m_virtuosoVersion.startsWith("6.1.6") ) {
+-        kError() << "NepomukStorage only works with virtuoso 6.1.6";
++    // We accept virtuoso version 6.1.6+ Nepomuk hasn't really been tested with 7
++    QRegExp regex("(6\.1\.[6789])");
++    if( !m_virtuosoVersion.contains(regex) ) {
++        kError() << "NepomukStorage only works with virtuoso 6.1.6 and beyond";
+         return;
+     }
+ 
+