svn commit: r458298 - in head/textproc/soprano: . files

[Tobias C. Berner]

Author: tcberner
Date: Sat Jan  6 22:33:12 2018
New Revision: 458298
URL: https://svnweb.freebsd.org/changeset/ports/458298

Log:
  textproc/soprano, fix build with clang6
  
  PR:		224945
  Reported by:	jbeich

Added:
  head/textproc/soprano/files/
  head/textproc/soprano/files/patch-soprano_pluginmanager.cpp   (contents, props changed)
  head/textproc/soprano/files/patch-soprano_sopranodirs.cpp   (contents, props changed)
Modified:
  head/textproc/soprano/Makefile

Modified: head/textproc/soprano/Makefile
==============================================================================
--- head/textproc/soprano/Makefile	Sat Jan  6 22:11:58 2018	(r458297)
+++ head/textproc/soprano/Makefile	Sat Jan  6 22:33:12 2018	(r458298)
@@ -3,7 +3,7 @@
 
 PORTNAME=	soprano
 PORTVERSION=	2.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/Soprano/${PORTVERSION}
 

Added: head/textproc/soprano/files/patch-soprano_pluginmanager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/soprano/files/patch-soprano_pluginmanager.cpp	Sat Jan  6 22:33:12 2018	(r458298)
@@ -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" ) );
+     }

Added: head/textproc/soprano/files/patch-soprano_sopranodirs.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/soprano/files/patch-soprano_sopranodirs.cpp	Sat Jan  6 22:33:12 2018	(r458298)
@@ -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;