[arch-commits] Commit in nepomuk-core/repos (6 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Tue Aug 6 07:57:08 UTC 2013
Date: Tuesday, August 6, 2013 @ 09:57:08
Author: andrea
Revision: 192138
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
nepomuk-core/repos/kde-unstable-i686/PKGBUILD
(from rev 192137, nepomuk-core/kde-unstable/PKGBUILD)
nepomuk-core/repos/kde-unstable-i686/virtuoso617.patch
(from rev 192137, nepomuk-core/kde-unstable/virtuoso617.patch)
nepomuk-core/repos/kde-unstable-x86_64/PKGBUILD
(from rev 192137, nepomuk-core/kde-unstable/PKGBUILD)
nepomuk-core/repos/kde-unstable-x86_64/virtuoso617.patch
(from rev 192137, nepomuk-core/kde-unstable/virtuoso617.patch)
Deleted:
nepomuk-core/repos/kde-unstable-i686/PKGBUILD
nepomuk-core/repos/kde-unstable-x86_64/PKGBUILD
---------------------------------------+
/PKGBUILD | 82 ++++++++++++++++++++++++++++++++
kde-unstable-i686/PKGBUILD | 33 ------------
kde-unstable-i686/virtuoso617.patch | 29 +++++++++++
kde-unstable-x86_64/PKGBUILD | 33 ------------
kde-unstable-x86_64/virtuoso617.patch | 29 +++++++++++
5 files changed, 140 insertions(+), 66 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2013-08-06 07:56:48 UTC (rev 192137)
+++ kde-unstable-i686/PKGBUILD 2013-08-06 07:57:08 UTC (rev 192138)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=nepomuk-core
-pkgver=4.10.97
-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')
-makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('b35fc166c07c1372d3ba73513780fc41c2005a8f')
-
-build() {
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd 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/kde-unstable-i686/PKGBUILD (from rev 192137, nepomuk-core/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2013-08-06 07:57:08 UTC (rev 192138)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=nepomuk-core
+pkgver=4.10.97
+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"
+ 'virtuoso617.patch')
+sha1sums=('b35fc166c07c1372d3ba73513780fc41c2005a8f'
+ '2643c311027c758dff635159c6b8a0ebb6088c3e')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/virtuoso617.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd 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/kde-unstable-i686/virtuoso617.patch (from rev 192137, nepomuk-core/kde-unstable/virtuoso617.patch)
===================================================================
--- kde-unstable-i686/virtuoso617.patch (rev 0)
+++ kde-unstable-i686/virtuoso617.patch 2013-08-06 07:57:08 UTC (rev 192138)
@@ -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;
+ }
+
+
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2013-08-06 07:56:48 UTC (rev 192137)
+++ kde-unstable-x86_64/PKGBUILD 2013-08-06 07:57:08 UTC (rev 192138)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=nepomuk-core
-pkgver=4.10.97
-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')
-makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('b35fc166c07c1372d3ba73513780fc41c2005a8f')
-
-build() {
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd 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/kde-unstable-x86_64/PKGBUILD (from rev 192137, nepomuk-core/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2013-08-06 07:57:08 UTC (rev 192138)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=nepomuk-core
+pkgver=4.10.97
+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"
+ 'virtuoso617.patch')
+sha1sums=('b35fc166c07c1372d3ba73513780fc41c2005a8f'
+ '2643c311027c758dff635159c6b8a0ebb6088c3e')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/virtuoso617.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd 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/kde-unstable-x86_64/virtuoso617.patch (from rev 192137, nepomuk-core/kde-unstable/virtuoso617.patch)
===================================================================
--- kde-unstable-x86_64/virtuoso617.patch (rev 0)
+++ kde-unstable-x86_64/virtuoso617.patch 2013-08-06 07:57:08 UTC (rev 192138)
@@ -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;
+ }
+
+
More information about the arch-commits
mailing list