← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/soprano/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/redland_raptor2_support.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-08-05 12:08:04 UTC
  • mfrom: (1.1.36 upstream)
  • Revision ID: james.westby@ubuntu.com-20110805120804-6pixm5dccrh1rvbt
Tags: 2.7.0+dfsg.1-0ubuntu1
* New upstream release.
* Refresh symbols.
* Build-depend on libraptor2-dev >= 2.0.4 instead of libraptor1-dev.
* Drop redland_raptor2_support.h patch, not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/redland_raptor2_support.h
1
 
From: Luigi Toscano <luigi.toscano@tiscali.it>
2
 
From: Modestas Vainius <modax@debian.org>
3
 
Subject: Add support for raptor V2 to the redland backend
4
 
Forwarded: no
5
 
Origin: other
6
 
Last-Update: 2011-06-23
7
 
 
8
 
This patch should be considered as pretty dirty FTBFS fix.
9
 
 
10
 
--- a/backends/redland/redlandbackend.cpp
11
 
+++ b/backends/redland/redlandbackend.cpp
12
 
@@ -24,6 +24,7 @@
13
 
 
14
 
 #include "redlandbackend.h"
15
 
 
16
 
+#include <raptor2/raptor.h>
17
 
 #include <redland.h>
18
 
 
19
 
 #include "redlandworld.h"
20
 
--- a/backends/redland/redlandmodel.h
21
 
+++ b/backends/redland/redlandmodel.h
22
 
@@ -28,6 +28,7 @@
23
 
 #include <QtCore/QtGlobal>
24
 
 #include <QtCore/QTextStream>
25
 
 
26
 
+#include <raptor2/raptor.h>
27
 
 #include <redland.h>
28
 
 
29
 
 #include "storagemodel.h"
30
 
--- a/backends/redland/redlandnodeiteratorbackend.h
31
 
+++ b/backends/redland/redlandnodeiteratorbackend.h
32
 
@@ -24,6 +24,7 @@
33
 
 
34
 
 #include "iteratorbackend.h"
35
 
 
36
 
+#include <raptor2/raptor.h>
37
 
 #include <redland.h>
38
 
 
39
 
 #include <QtCore/QSharedDataPointer>
40
 
--- a/backends/redland/redlandqueryresult.h
41
 
+++ b/backends/redland/redlandqueryresult.h
42
 
@@ -23,6 +23,7 @@
43
 
 #ifndef SOPRANO_BACKEND_REDLAND_QUERY_RESULT_H
44
 
 #define SOPRANO_BACKEND_REDLAND_QUERY_RESULT_H
45
 
 
46
 
+#include <raptor2/raptor.h>
47
 
 #include <redland.h>
48
 
 #include <QString>
49
 
 
50
 
--- a/backends/redland/redlandstatementiterator.h
51
 
+++ b/backends/redland/redlandstatementiterator.h
52
 
@@ -23,6 +23,7 @@
53
 
 #ifndef SOPRANO_BACKEND_REDLAND_STATEMENT_ITERATOR_H
54
 
 #define SOPRANO_BACKEND_REDLAND_STATEMENT_ITERATOR_H
55
 
 
56
 
+#include <raptor2/raptor.h>
57
 
 #include <redland.h>
58
 
 
59
 
 #include "iteratorbackend.h"
60
 
--- a/backends/redland/redlandworld.h
61
 
+++ b/backends/redland/redlandworld.h
62
 
@@ -23,6 +23,7 @@
63
 
 #ifndef SOPRANO_BACKEND_REDLAND_WORLD_H
64
 
 #define SOPRANO_BACKEND_REDLAND_WORLD_H
65
 
 
66
 
+#include <raptor2/raptor.h>
67
 
 #include <redland.h>
68
 
 
69
 
 #include "error.h"
70
 
--- a/cmake/modules/FindRedland.cmake
71
 
+++ b/cmake/modules/FindRedland.cmake
72
 
@@ -44,6 +44,7 @@ if(REDLAND_CONFIG_EXECUTABLE)
73
 
     execute_process(
74
 
       COMMAND ${REDLAND_CONFIG_EXECUTABLE} --cflags
75
 
       OUTPUT_VARIABLE redland_LIBS_ARGS)
76
 
+    set(REDLAND_CFLAGS ${redland_LIBS_ARGS})
77
 
     string( REPLACE " " ";" redland_LIBS_ARGS ${redland_LIBS_ARGS} )
78
 
     foreach( _ARG ${redland_LIBS_ARGS} )
79
 
       if(${_ARG} MATCHES "^-I")