[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/soprano/2.4
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-03-01 9:59:02
Message-ID: 1267437542.415597.11108.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097409 by trueg:

Backport: Added pkgconfig files for sopranoclient, sopranoserver, and sopranoindex.


 M  +12 -2     CMakeLists.txt  
 M  +1 -0      ChangeLog  
 M  +6 -4      backends/virtuoso/virtuosotools.cpp  
 A             sopranoclient.pc.cmake  
 A             sopranoindex.pc.cmake  
 A             sopranoserver.pc.cmake  


--- branches/soprano/2.4/CMakeLists.txt #1097408:1097409
@@ -183,10 +183,20 @@
 add_subdirectory(cmake)
 
 
-##################  create pkgconfig file  ################################
+##################  create pkgconfig files  ################################
 if(NOT WIN32)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/soprano.pc.cmake \
                ${CMAKE_CURRENT_BINARY_DIR}/soprano.pc @ONLY)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/soprano.pc DESTINATION \
${PKGCONFIG_INSTALL_PREFIX}) +  \
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sopranoclient.pc.cmake \
${CMAKE_CURRENT_BINARY_DIR}/sopranoclient.pc @ONLY) +  \
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sopranoserver.pc.cmake \
${CMAKE_CURRENT_BINARY_DIR}/sopranoserver.pc @ONLY) +  \
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sopranoindex.pc.cmake \
${CMAKE_CURRENT_BINARY_DIR}/sopranoindex.pc @ONLY) +  install(
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/soprano.pc
+    ${CMAKE_CURRENT_BINARY_DIR}/sopranoclient.pc
+    ${CMAKE_CURRENT_BINARY_DIR}/sopranoserver.pc
+    ${CMAKE_CURRENT_BINARY_DIR}/sopranoindex.pc
+    DESTINATION
+    ${PKGCONFIG_INSTALL_PREFIX})
 endif(NOT WIN32)
 
 
--- branches/soprano/2.4/ChangeLog #1097408:1097409
@@ -6,6 +6,7 @@
  	    a checkpoint.
 	* Allow to build Soprano with -fvisibility=hidden -fvisibility-inlines-hidden \
(thanks to  Modestas Vainius of Debian for the patch)
+	* PkgConfig files for sopranoclient, sopranoserver, and sopranoindex.
 
 2.4.0.1
 	* Fixed a bug in the ClientConnection where mutex was deleted before it had been \
                unlocked.
--- branches/soprano/2.4/backends/virtuoso/virtuosotools.cpp #1097408:1097409
@@ -26,6 +26,8 @@
 // we have no support for a real default/empty graph, thus we fake one, hoping that \
nobody will ever use this otherwise  static const char* s_defaultGraph = \
"sopranofakes:/DEFAULTGRAPH";  static const char* s_openlinkVirtualGraph = \
"http://www.openlinksw.com/schemas/virtrdf#"; +static const char* s_fakeBooleanType = \
"sopranofakes:/booleanHackUntilVirtuosoProblemIsResolved"; +static const char* \
s_fakeBase64Type = "sopranofakes:/base64BinaryHackUntilVirtuosoProblemIsResolved";  
 
 Soprano::Error::Error Soprano::Virtuoso::convertSqlError( SQLSMALLINT handleType, \
SQLHANDLE handle, const QString& extraMessage ) @@ -64,23 +66,23 @@
 
 QUrl Soprano::Virtuoso::defaultGraph()
 {
-    return QUrl::fromEncoded( s_defaultGraph, QUrl::StrictMode );
+    return QUrl::fromEncoded( QByteArray::fromRawData( s_defaultGraph, qstrlen( \
s_defaultGraph ) ), QUrl::StrictMode );  }
 
 
 QUrl Soprano::Virtuoso::openlinkVirtualGraph()
 {
-    return QUrl::fromEncoded( s_openlinkVirtualGraph, QUrl::StrictMode );
+    return QUrl::fromEncoded( QByteArray::fromRawData( s_openlinkVirtualGraph, \
qstrlen( s_openlinkVirtualGraph ) ), QUrl::StrictMode );  }
 
 
 QUrl Soprano::Virtuoso::fakeBooleanType()
 {
-    return QUrl::fromEncoded( \
"sopranofakes:/booleanHackUntilVirtuosoProblemIsResolved", QUrl::StrictMode ); +    \
return QUrl::fromEncoded( QByteArray::fromRawData( s_fakeBooleanType, qstrlen( \
s_fakeBooleanType ) ), QUrl::StrictMode );  }
 
 
 QUrl Soprano::Virtuoso::fakeBase64BinaryType()
 {
-    return QUrl::fromEncoded( \
"sopranofakes:/base64BinaryHackUntilVirtuosoProblemIsResolved", QUrl::StrictMode ); + \
return QUrl::fromEncoded( QByteArray::fromRawData( s_fakeBase64Type, qstrlen( \
s_fakeBase64Type ) ), QUrl::StrictMode );  }


[prev in list] [next in list] [prev in thread] [next in thread]