mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

textproc/soprano, fix build with clang6

Browse Source 
PR:		224945
Reported by:	jbeich
This commit is contained in:
Tobias C. Berner 2018-01-06 22:33:12 +00:00
parent 8987c1a6de
commit 5ef6a4d857
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=458298
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
textproc/soprano/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= soprano
PORTVERSION= 2.9.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/Soprano/${PORTVERSION}

17
textproc/soprano/files/patch-soprano_pluginmanager.cpp Normal file
View File

@ -0,0 +1,17 @@
error: invalid suffix on literal; C++11 requires a space between literal and identifier
[-Wreserved-user-defined-literal]
fileSearchPaths << file.fileName().section( "/", 0, -5,
QString::SectionIncludeTrailingSep ) + QLatin1String( "lib"SOPRANO_LIB_SUFFIX );
^
--- soprano/pluginmanager.cpp.orig 2013-10-09 17:22:28 UTC
+++ soprano/pluginmanager.cpp
@@ -43,7 +43,7 @@ namespace {
fileSearchPaths << file.fileName().section( '/', 0, -2 );
#ifndef Q_OS_WIN
// the lib folder in the same prefix
- fileSearchPaths << file.fileName().section( "/", 0, -5, QString::SectionIncludeTrailingSep ) + QLatin1String( "lib"SOPRANO_LIB_SUFFIX );
+ fileSearchPaths << file.fileName().section( "/", 0, -5, QString::SectionIncludeTrailingSep ) + QLatin1String( "lib" SOPRANO_LIB_SUFFIX );
#endif
return Soprano::findLibraryPath( file.library(), fileSearchPaths, QStringList() << QLatin1String( "soprano" ) );
}

25
textproc/soprano/files/patch-soprano_sopranodirs.cpp Normal file
View File

@ -0,0 +1,25 @@
error: invalid suffix on literal; C++11 requires a space between literal and identifier
paths << QLatin1String( SOPRANO_PREFIX"/lib"SOPRANO_LIB_SUFFIX );
^
--- soprano/sopranodirs.cpp.orig 2018-01-06 22:23:48 UTC
+++ soprano/sopranodirs.cpp
@@ -124,14 +124,14 @@ QStringList Soprano::envDirList( const char* var )
QStringList Soprano::libDirs()
{
QStringList paths = QCoreApplication::libraryPaths();
- paths << QLatin1String( SOPRANO_PREFIX"/lib"SOPRANO_LIB_SUFFIX );
+ paths << QLatin1String( SOPRANO_PREFIX "/lib" SOPRANO_LIB_SUFFIX );
#ifdef Q_OS_WIN
- paths << QLatin1String( SOPRANO_PREFIX"/bin" );
+ paths << QLatin1String( SOPRANO_PREFIX "/bin" );
paths << getWinPrefix() + QLatin1String( "/bin" );
- paths << getWinPrefix() + QLatin1String( "/lib"SOPRANO_LIB_SUFFIX );
+ paths << getWinPrefix() + QLatin1String( "/lib" SOPRANO_LIB_SUFFIX );
#else
- paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX );
- paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX );
+ paths << QLatin1String( "/usr/lib" SOPRANO_LIB_SUFFIX );
+ paths << QLatin1String( "/usr/local/lib" SOPRANO_LIB_SUFFIX );
paths += Soprano::envDirList( "LD_LIBRARY_PATH" );
#endif
return paths;