public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soprano-2.7.6, update patch

Browse Source 
svn path=/nixpkgs/trunk/; revision=34399
This commit is contained in:
Yury G. Kudryashov
2012-06-09 13:09:24 +00:00
parent 70316d4e42
commit ecc8549965
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/soprano/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
, pkgconfig }: , pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "soprano-2.7.5"; name = "soprano-2.7.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/soprano/${name}.tar.bz2"; url = "mirror://sourceforge/soprano/${name}.tar.bz2";
sha256 = "0g9vi4z82dwz0hkg3b9gvi11akji1mzphjxwz3fw55213c0f0a3c"; sha256 = "0cnprxc8wykl96aphsh2d3711h7cals7gnibbxpsmsqyqbnhbp98";
}; };
patches = [ ./find-virtuoso.patch ]; patches = [ ./find-virtuoso.patch ];
pkgs/development/libraries/soprano/find-virtuoso.patch
+15 -15
View File
@@ -7,10 +7,10 @@ Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH
2 files changed, 23 insertions(+), 10 deletions(-) 2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp
index c83605d..8c30c81 100644 index c245101..249958a 100644
--- a/backends/virtuoso/virtuosobackend.cpp --- a/backends/virtuoso/virtuosobackend.cpp
+++ b/backends/virtuoso/virtuosobackend.cpp +++ b/backends/virtuoso/virtuosobackend.cpp
@@ -27,6 +27,7 @@ @@ -28,6 +28,7 @@
#include "odbcconnectionpool.h" #include "odbcconnectionpool.h"
#include "sopranodirs.h" #include "sopranodirs.h"
@@ -18,7 +18,7 @@ index c83605d..8c30c81 100644
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
@@ -188,19 +189,19 @@ namespace { @@ -210,19 +211,19 @@ Soprano::BackendFeatures Soprano::Virtuoso::BackendPlugin::supportedFeatures() c
bool Soprano::Virtuoso::BackendPlugin::isAvailable() const bool Soprano::Virtuoso::BackendPlugin::isAvailable() const
{ {
@@ -29,14 +29,14 @@ index c83605d..8c30c81 100644
- } - }
-#endif -#endif
- -
QString virtuosoBin = VirtuosoController::locateVirtuosoBinary(); QString virtuosoBin = locateVirtuosoBinary();
if ( virtuosoBin.isEmpty() ) { if ( virtuosoBin.isEmpty() ) {
qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary";
return false; return false;
} }
+#ifndef Q_OS_WIN +#ifndef Q_OS_WIN
+ if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) { + if ( findVirtuosoDriver( virtuosoBin ).isEmpty() ) {
+ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; + qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver";
+ return false; + return false;
+ } + }
@@ -45,17 +45,17 @@ index c83605d..8c30c81 100644
QString vs = determineVirtuosoVersion( virtuosoBin ); QString vs = determineVirtuosoVersion( virtuosoBin );
if ( vs.isEmpty() ) { if ( vs.isEmpty() ) {
qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin;
@@ -217,9 +218,21 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const @@ -267,9 +268,21 @@ QString Soprano::Virtuoso::BackendPlugin::locateVirtuosoBinary()
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const // static
+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) const -QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver()
+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint )
{ {
- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); - return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) );
+ QString virtuosoBin; + QString virtuosoBin;
+ if (virtuosoBinHint.isEmpty()) + if (virtuosoBinHint.isEmpty())
+ virtuosoBin = VirtuosoController::locateVirtuosoBinary(); + virtuosoBin = locateVirtuosoBinary();
+ else + else
+ virtuosoBin = virtuosoBinHint; + virtuosoBin = virtuosoBinHint;
+ +
@@ -70,17 +70,17 @@ index c83605d..8c30c81 100644
#endif #endif
diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h
index 3971b83..0807e5d 100644 index 646b9f8..535fbb9 100644
--- a/backends/virtuoso/virtuosobackend.h --- a/backends/virtuoso/virtuosobackend.h
+++ b/backends/virtuoso/virtuosobackend.h +++ b/backends/virtuoso/virtuosobackend.h
@@ -50,7 +50,7 @@ namespace Soprano { @@ -52,7 +52,7 @@ namespace Soprano {
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
private: private:
- QString findVirtuosoDriver() const; - static QString findVirtuosoDriver();
+ QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()) const; + static QString findVirtuosoDriver(const QString &virtuosoBinHint = QString());
#endif #endif
}; };
} }
-- --
tg: (da390be..) t/find-virtuoso (depends on: master) tg: (2321148..) t/find-virtuoso (depends on: master)