Debian Codegraph @

debian/patches/2001_shared_redland.patch

raw
1 Description: Link with system-shared Redland
2 Author: Jonas Smedegaard <[email protected]>
3 Last-Update: 2019-10-08
4 ---
5 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
6 --- a/Konclude.pro
7 +++ b/Konclude.pro
8 @@ -28,15 +28,10 @@
9 #Include file(s)
10 include(Konclude.pri)
11
12 -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librdf.a
13 -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libraptor2.a
14 -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librasqal.a
15 -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libxml2.a
16 -unix: LIBS += $$PWD/External/jemalloc/Linux/x64/lib/release/libjemalloc.a
17 -unix: LIBS += -lz -lltdl -lgmp -ldl -L External/jemalloc/Linux/x64/lib/release/ -ljemalloc
18 -
19 -unix: INCLUDEPATH += $$PWD/External/librdf/Linux/x64/include
20 -unix: DEPENDPATH += $$PWD/External/librdf/Linux/x64/include
21 +unix {
22 + CONFIG += link_pkgconfig
23 + PKGCONFIG += redland raptor2 rasqal jemalloc
24 +}
25
26
27 win32: LIBS += "C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x64\kernel32.Lib"
28 --- a/Source/Parser/CRDFRedlandRaptorParser.h
29 +++ b/Source/Parser/CRDFRedlandRaptorParser.h
30 @@ -23,7 +23,7 @@
31 #define KONCLUDE_PARSER_CRDFREDLANDRAPTORPARSER_H
32
33 // Libraries includes
34 -#include <Redland.h>
35 +#include <librdf.h>
36 #include <rasqal.h>
37 #include <stdio.h>
38 #include <ios>
39 --- a/Source/Reasoner/Triples/CRedlandNodeHasher.h
40 +++ b/Source/Reasoner/Triples/CRedlandNodeHasher.h
41 @@ -24,7 +24,7 @@
42
43 // Libraries includes
44 #include <QHash>
45 -#include <Redland.h>
46 +#include <librdf.h>
47
48 // Namespace includes
49 #include "TriplesSettings.h"
50 --- a/Source/Reasoner/Triples/CRedlandStoredTriplesData.h
51 +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesData.h
52 @@ -23,7 +23,7 @@
53 #define KONCLUDE_REASONER_TRIPLES_CREDLANDSTOREDTRIPLESDATA_H
54
55 // Libraries includes
56 -#include <Redland.h>
57 +#include <librdf.h>
58
59
60 // Namespace includes
61 --- a/Source/Reasoner/Triples/CRedlandStoredTriplesIndividualAssertionIndexCache.h
62 +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesIndividualAssertionIndexCache.h
63 @@ -27,7 +27,7 @@
64 #include <QHash>
65 #include <QUrl>
66
67 -#include <Redland.h>
68 +#include <librdf.h>
69
70 // Namespace includes
71 #include "TriplesSettings.h"
72 --- a/Source/Reasoner/Triples/CRedlandUriHasher.h
73 +++ b/Source/Reasoner/Triples/CRedlandUriHasher.h
74 @@ -25,7 +25,7 @@
75
76 // Libraries includes
77 #include <QHash>
78 -#include <Redland.h>
79 +#include <librdf.h>
80
81 // Namespace includes
82 #include "TriplesSettings.h"
83 --- a/Source/Reasoner/Triples/CRedlandStoredTriplesRepresentativeTagSet.h
84 +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesRepresentativeTagSet.h
85 @@ -25,7 +25,7 @@
86 // Libraries includes
87 #include <QMap>
88 #include <QHash>
89 -#include <Redland.h>
90 +#include <librdf.h>
91
92 // Namespace includes
93 #include "TriplesSettings.h"
94 --- a/Source/Parser/CRDFRedlandExternalTriplesDSNConnectingParser.h
95 +++ b/Source/Parser/CRDFRedlandExternalTriplesDSNConnectingParser.h
96 @@ -23,7 +23,7 @@
97 #define KONCLUDE_PARSER_CRDFREDLANDEXTERNALTRIPLESDSNCONNECTINGPARSER_H
98
99 // Libraries includes
100 -#include <Redland.h>
101 +#include <librdf.h>
102 #include <rasqal.h>
103 #include <stdio.h>
104 #include <ios>
105 --- a/Source/Parser/CSPARQLRedlandRasqalQueryParser.h
106 +++ b/Source/Parser/CSPARQLRedlandRasqalQueryParser.h
107 @@ -25,7 +25,7 @@
108 #define KONCLUDE_PARSER_CSPARQLREDLANDRASQALQUERYPARSER_H
109
110 // Libraries includes
111 -#include <Redland.h>
112 +#include <librdf.h>
113
114
115 // Namespace includes
116 --- a/Source/Parser/CSPARQLRedlandRasqalReasoningBGPQueryParser.h
117 +++ b/Source/Parser/CSPARQLRedlandRasqalReasoningBGPQueryParser.h
118 @@ -25,7 +25,7 @@
119 #define KONCLUDE_PARSER_CSPARQLREDLANDRASQALREASONINGBGPQUERYPARSER_H
120
121 // Libraries includes
122 -#include <Redland.h>
123 +#include <librdf.h>
124 #include <QRegularExpression>
125
126
127 --- a/Source/Reasoner/Answerer/CRedlandRasqalLiteralHasher.h
128 +++ b/Source/Reasoner/Answerer/CRedlandRasqalLiteralHasher.h
129 @@ -24,7 +24,7 @@
130
131 // Libraries includes
132 #include <QHash>
133 -#include <Redland.h>
134 +#include <librdf.h>
135
136 // Namespace includes
137 #include "AnswererSettings.h"
138 --- a/Source/Reasoner/Answerer/CRedlandRasqalModelSubQueryResolver.h
139 +++ b/Source/Reasoner/Answerer/CRedlandRasqalModelSubQueryResolver.h
140 @@ -23,7 +23,7 @@
141 #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALMODELSUBQUERYRESOLVER_H
142
143 // Libraries includes
144 -#include <Redland.h>
145 +#include <librdf.h>
146
147
148 // Namespace includes
149 --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHash.h
150 +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHash.h
151 @@ -23,7 +23,7 @@
152 #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBINDINGPOSITIONRESOLVINGHASH_H
153
154 // Libraries includes
155 -#include <Redland.h>
156 +#include <librdf.h>
157
158
159 // Namespace includes
160 --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHashData.h
161 +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHashData.h
162 @@ -23,7 +23,7 @@
163 #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBINDINGPOSITIONRESOLVINGHASHDATA_H
164
165 // Libraries includes
166 -#include <Redland.h>
167 +#include <librdf.h>
168
169
170 // Namespace includes
171 --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHash.h
172 +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHash.h
173 @@ -23,7 +23,7 @@
174 #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBOUNDNODERESOLVINGHASH_H
175
176 // Libraries includes
177 -#include <Redland.h>
178 +#include <librdf.h>
179
180
181 // Namespace includes
182 --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHashData.h
183 +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHashData.h
184 @@ -23,7 +23,7 @@
185 #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBOUNDNODERESOLVINGHASHDATA_H
186
187 // Libraries includes
188 -#include <Redland.h>
189 +#include <librdf.h>
190
191
192 // Namespace includes
193 --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryProcessingData.h
194 +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryProcessingData.h
195 @@ -23,7 +23,7 @@
196 #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYPROCESSINGDATA_H
197
198 // Libraries includes
199 -#include <Redland.h>
200 +#include <librdf.h>
201
202
203 // Namespace includes
204 --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryTripleResolvingData.h
205 +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryTripleResolvingData.h
206 @@ -23,7 +23,7 @@
207 #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYTRIPLERESOLVINGDATA_H
208
209 // Libraries includes
210 -#include <Redland.h>
211 +#include <librdf.h>
212
213
214 // Namespace includes
215 --- a/Source/Reasoner/Query/CRedlandRasqalBGPsCompositionQuery.h
216 +++ b/Source/Reasoner/Query/CRedlandRasqalBGPsCompositionQuery.h
217 @@ -23,7 +23,7 @@
218 #define KONCLUDE_REASONER_QUERY_CREDLANDRASQALBGPSCOMPOSITIONQUERY_H
219
220 // Libraries includes
221 -#include <Redland.h>
222 +#include <librdf.h>
223
224 // Namespace includes
225 #include "CComplexAnsweringCompositionQuery.h"
226 --- a/Source/Parser/CRDFRedlandRaptorSimpleConcurrentParser.h
227 +++ b/Source/Parser/CRDFRedlandRaptorSimpleConcurrentParser.h
228 @@ -23,7 +23,7 @@
229 #define KONCLUDE_PARSER_CRDFREDLANDRAPTORSIMPLECONCURRENTPARSER_H
230
231 // Libraries includes
232 -#include <Redland.h>
233 +#include <librdf.h>
234 #include <rasqal.h>
235 #include <stdio.h>
236 #include <ios>
237 --- a/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseBatchLinker.h
238 +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseBatchLinker.h
239 @@ -23,7 +23,7 @@
240 #define KONCLUDE_REASONER_TRIPLES_CREDLANDSTOREDTRIPLESINDEXINGBASEBATCHLINKER_H
241
242 // Libraries includes
243 -#include <Redland.h>
244 +#include <librdf.h>
245
246
247 // Namespace includes
248 --- a/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseResolvingLinker.h
249 +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseResolvingLinker.h
250 @@ -23,7 +23,7 @@
251 #define KONCLUDE_REASONER_TRIPLES_CREDLANDSTOREDTRIPLESINDEXINGBASERESOLVINGLINKER_H
252
253 // Libraries includes
254 -#include <Redland.h>
255 +#include <librdf.h>
256
257
258 // Namespace includes