Attachment #201735 for bug #235501




# $FreeBSD$

PORTNAME=	soprano
DISTVERSION=	2.9.3-91
DISTVERSIONSUFFIX=	-gd7f30f1
PORTEPOCH=	1
CATEGORIES=	textproc
MASTER_SITES=	SF/${PORTNAME}/Soprano/${PORTVERSION}

MAINTAINER=	kde@FreeBSD.org
COMMENT=	Qt/C++ RDF framework

LICENSE=	GPLv2 LGPL20+
LICENSE_COMB=	dual

LIB_DEPENDS=	libraptor2.so:textproc/raptor2 \
		librasqal.so:textproc/rasqal \
		librdf.so:textproc/redland \
		libiodbc.so:databases/libiodbc

USES=		cmake pkgconfig qt:5 tar:bzip2
USE_QT=		buildtools_build core dbus help network qmake_build xml
USES=		cmake pkgconfig qt:4 tar:bzip2
CMAKE_ARGS+=	-DSOPRANO_DISABLE_CLUCENE_INDEX=yes \
		-DSOPRANO_DISABLE_SESAME2_BACKEND=yes
USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	KDE

CMAKE_ON=	SOPRANO_DISABLE_CLUCENE_INDEX \
		QT5_BUILD \
		SOPRANO_DISABLE_SESAME2_BACKEND

pre-configure:
	@${REINPLACE_CMD} -e 's,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig,' \
		${WRKSRC}/CMakeLists.txt
	@${REINPLACE_CMD} -e 's,soprano/cmake,cmake/Modules,' \

Lines 1-2 Link Here

(-)textproc/soprano/distinfo (-2 / +3 lines)
1	SHA256 (soprano-2.9.4.tar.bz2) = 64066fbd54e71d7ae4c8a4116997448a72808a2813cff3bb5d2c28f0fce9e0e5	1	TIMESTAMP = 1549345012
2	SIZE (soprano-2.9.4.tar.bz2) = 1958856	2	SHA256 (KDE-soprano-2.9.3-91-gd7f30f1_GH0.tar.gz) = 8136d83c63e6a76468159cc3c5316a00c92522662b946f62b3852fb77eee56dc
		3	SIZE (KDE-soprano-2.9.3-91-gd7f30f1_GH0.tar.gz) = 2092276




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" ) );
     }




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;




bin/onto2vocabularyclass
bin/sopranocmd
bin/sopranod
include/Soprano/Backend
include/Soprano/BackendFeature

include/soprano/backend.h
include/soprano/bindingset.h
include/soprano/datastream.h
include/soprano/dbusclient.h
include/soprano/dbusexportiterator.h
include/soprano/dbusexportmodel.h
include/soprano/dbusmodel.h
include/soprano/dbusnodeiterator.h
include/soprano/dbusqueryresultiterator.h
include/soprano/dbusstatementiterator.h
include/soprano/dummymodel.h
include/soprano/error.h
include/soprano/filtermodel.h

include/soprano/iteratorbackend.h
include/soprano/languagetag.h
include/soprano/literalvalue.h
include/soprano/localsocketclient.h
include/soprano/locator.h
include/soprano/model.h
include/soprano/mutexmodel.h

include/soprano/soprano_export.h
include/soprano/sopranomacros.h
include/soprano/sopranotypes.h
include/soprano/sparqlmodel.h
include/soprano/statement.h
include/soprano/statementiterator.h
include/soprano/statementpattern.h
include/soprano/storagemodel.h
include/soprano/tcpclient.h
include/soprano/version.h
include/soprano/vocabulary.h
include/soprano/xesam.h
include/soprano/xsd.h
lib/cmake/Soprano/SopranoConfig.cmake
lib/cmake/Soprano/SopranoConfigVersion.cmake
lib/cmake/Soprano/SopranoTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Soprano/SopranoTargets.cmake
lib/libsoprano.so
lib/libsoprano.so.4
lib/libsoprano.so.4.3.0
lib/libsoprano.so.5
lib/libsopranoclient.so.1
lib/libsopranoclient.so.1.2.0
lib/libsopranoserver.so
lib/libsopranoserver.so.1
lib/libsopranoserver.so.1.2.0
lib/libsopranoserver.so.2
lib/soprano/libsoprano_nquadparser.so
lib/soprano/libsoprano_nquadserializer.so
lib/soprano/libsoprano_raptorparser.so

Return to bug 235501

Lines 2-30 Link Here

(-)textproc/soprano/Makefile (-11 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= soprano	4	PORTNAME= soprano
5	PORTVERSION= 2.9.4	5	DISTVERSION= 2.9.3-91
6	PORTREVISION= 2	6	DISTVERSIONSUFFIX= -gd7f30f1
		7	PORTEPOCH= 1
7	CATEGORIES= textproc	8	CATEGORIES= textproc
8	MASTER_SITES= SF/${PORTNAME}/Soprano/${PORTVERSION}
9		9
10	MAINTAINER= kde@FreeBSD.org	10	MAINTAINER= kde@FreeBSD.org
11	COMMENT= Qt/C++ RDF framework	11	COMMENT= Qt/C++ RDF framework
12		12
13	DEPRECATED= Qt4 has been EOL since december 2015	13	LICENSE= GPLv2 LGPL20+
14	EXPIRATION_DATE= 2019-03-15	14	LICENSE_COMB= dual
15		15
16	LIB_DEPENDS= libraptor2.so:textproc/raptor2 \	16	LIB_DEPENDS= libraptor2.so:textproc/raptor2 \
		17	librasqal.so:textproc/rasqal \
17	librdf.so:textproc/redland \	18	librdf.so:textproc/redland \
18	libiodbc.so:databases/libiodbc	19	libiodbc.so:databases/libiodbc
19		20
20	USE_QT= corelib dbus network qtestlib_build xml \	21	USES= cmake pkgconfig qt:5 tar:bzip2
21	qmake_build moc_build uic_build rcc_build	22	USE_QT= buildtools_build core dbus help network qmake_build xml
22	USES= cmake pkgconfig qt:4 tar:bzip2
23	CMAKE_ARGS+= -DSOPRANO_DISABLE_CLUCENE_INDEX=yes \
24	-DSOPRANO_DISABLE_SESAME2_BACKEND=yes
25	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
26		24
27	post-patch:	25	USE_GITHUB= yes
		26	GH_ACCOUNT= KDE
		27
		28	CMAKE_ON= SOPRANO_DISABLE_CLUCENE_INDEX \
		29	QT5_BUILD \
		30	SOPRANO_DISABLE_SESAME2_BACKEND
		31
		32	pre-configure:
28	@${REINPLACE_CMD} -e 's,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig,' \	33	@${REINPLACE_CMD} -e 's,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig,' \
29	${WRKSRC}/CMakeLists.txt	34	${WRKSRC}/CMakeLists.txt
30	@${REINPLACE_CMD} -e 's,soprano/cmake,cmake/Modules,' \	35	@${REINPLACE_CMD} -e 's,soprano/cmake,cmake/Modules,' \

Lines 1-17 Link Here

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

Lines 1-25 Link Here

(-)textproc/soprano/files/patch-soprano_sopranodirs.cpp (-25 lines)
1	error: invalid suffix on literal; C++11 requires a space between literal and identifier
2	paths << QLatin1String( SOPRANO_PREFIX"/lib"SOPRANO_LIB_SUFFIX );
3	^
4	--- soprano/sopranodirs.cpp.orig 2018-01-06 22:23:48 UTC
5	+++ soprano/sopranodirs.cpp
6	@@ -124,14 +124,14 @@ QStringList Soprano::envDirList( const char* var )
7	QStringList Soprano::libDirs()
8	{
9	QStringList paths = QCoreApplication::libraryPaths();
10	- paths << QLatin1String( SOPRANO_PREFIX"/lib"SOPRANO_LIB_SUFFIX );
11	+ paths << QLatin1String( SOPRANO_PREFIX "/lib" SOPRANO_LIB_SUFFIX );
12	#ifdef Q_OS_WIN
13	- paths << QLatin1String( SOPRANO_PREFIX"/bin" );
14	+ paths << QLatin1String( SOPRANO_PREFIX "/bin" );
15	paths << getWinPrefix() + QLatin1String( "/bin" );
16	- paths << getWinPrefix() + QLatin1String( "/lib"SOPRANO_LIB_SUFFIX );
17	+ paths << getWinPrefix() + QLatin1String( "/lib" SOPRANO_LIB_SUFFIX );
18	#else
19	- paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX );
20	- paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX );
21	+ paths << QLatin1String( "/usr/lib" SOPRANO_LIB_SUFFIX );
22	+ paths << QLatin1String( "/usr/local/lib" SOPRANO_LIB_SUFFIX );
23	paths += Soprano::envDirList( "LD_LIBRARY_PATH" );
24	#endif
25	return paths;

Lines 1-5 Link Here

(-)textproc/soprano/pkg-plist (-14 / +6 lines)
1	bin/onto2vocabularyclass	1	bin/onto2vocabularyclass
2	bin/sopranocmd
3	bin/sopranod	2	bin/sopranod
4	include/Soprano/Backend	3	include/Soprano/Backend
5	include/Soprano/BackendFeature	4	include/Soprano/BackendFeature
Lines 78-90 Link Here
78	include/soprano/backend.h	77	include/soprano/backend.h
79	include/soprano/bindingset.h	78	include/soprano/bindingset.h
80	include/soprano/datastream.h	79	include/soprano/datastream.h
81	include/soprano/dbusclient.h
82	include/soprano/dbusexportiterator.h	80	include/soprano/dbusexportiterator.h
83	include/soprano/dbusexportmodel.h	81	include/soprano/dbusexportmodel.h
84	include/soprano/dbusmodel.h
85	include/soprano/dbusnodeiterator.h
86	include/soprano/dbusqueryresultiterator.h
87	include/soprano/dbusstatementiterator.h
88	include/soprano/dummymodel.h	82	include/soprano/dummymodel.h
89	include/soprano/error.h	83	include/soprano/error.h
90	include/soprano/filtermodel.h	84	include/soprano/filtermodel.h
Lines 98-104 Link Here
98	include/soprano/iteratorbackend.h	92	include/soprano/iteratorbackend.h
99	include/soprano/languagetag.h	93	include/soprano/languagetag.h
100	include/soprano/literalvalue.h	94	include/soprano/literalvalue.h
101	include/soprano/localsocketclient.h
102	include/soprano/locator.h	95	include/soprano/locator.h
103	include/soprano/model.h	96	include/soprano/model.h
104	include/soprano/mutexmodel.h	97	include/soprano/mutexmodel.h
Lines 128-152 Link Here
128	include/soprano/soprano_export.h	121	include/soprano/soprano_export.h
129	include/soprano/sopranomacros.h	122	include/soprano/sopranomacros.h
130	include/soprano/sopranotypes.h	123	include/soprano/sopranotypes.h
131	include/soprano/sparqlmodel.h
132	include/soprano/statement.h	124	include/soprano/statement.h
133	include/soprano/statementiterator.h	125	include/soprano/statementiterator.h
134	include/soprano/statementpattern.h	126	include/soprano/statementpattern.h
135	include/soprano/storagemodel.h	127	include/soprano/storagemodel.h
136	include/soprano/tcpclient.h
137	include/soprano/version.h	128	include/soprano/version.h
138	include/soprano/vocabulary.h	129	include/soprano/vocabulary.h
139	include/soprano/xesam.h	130	include/soprano/xesam.h
140	include/soprano/xsd.h	131	include/soprano/xsd.h
		132	lib/cmake/Soprano/SopranoConfig.cmake
		133	lib/cmake/Soprano/SopranoConfigVersion.cmake
		134	lib/cmake/Soprano/SopranoTargets-%%CMAKE_BUILD_TYPE%%.cmake
		135	lib/cmake/Soprano/SopranoTargets.cmake
141	lib/libsoprano.so	136	lib/libsoprano.so
142	lib/libsoprano.so.4
143	lib/libsoprano.so.4.3.0	137	lib/libsoprano.so.4.3.0
144	lib/libsopranoclient.so	138	lib/libsoprano.so.5
145	lib/libsopranoclient.so.1
146	lib/libsopranoclient.so.1.2.0
147	lib/libsopranoserver.so	139	lib/libsopranoserver.so
148	lib/libsopranoserver.so.1
149	lib/libsopranoserver.so.1.2.0	140	lib/libsopranoserver.so.1.2.0
		141	lib/libsopranoserver.so.2
150	lib/soprano/libsoprano_nquadparser.so	142	lib/soprano/libsoprano_nquadparser.so
151	lib/soprano/libsoprano_nquadserializer.so	143	lib/soprano/libsoprano_nquadserializer.so
152	lib/soprano/libsoprano_raptorparser.so	144	lib/soprano/libsoprano_raptorparser.so