odfmetadata4: #i108911#: patch by cmc: remove second redland patch:

 redland: remove
    redland-1.0.8.patch.storage_hashes_context_serialize_get_statement.
 unordf: work around by extending librdf_GraphResult with a context pointer.

redland/redland/makefile.mk

@@ -58,7 +58,6 @@ OOO_PATCH_FILES= \
 
 
 PATCH_FILES=$(OOO_PATCH_FILES) \
-    $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \
     $(TARFILE_NAME).patch.storage_hashes_list_duplicates \
 
 

redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement

---- misc/redland-1.0.8/librdf/rdf_storage_hashes.c	Tue Jul  1 05:10:26 2008
-+++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c	Thu Nov  6 12:44:39 2008
-@@ -1593,7 +1661,6 @@
- {
-   librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context;
-   librdf_hash_datum* v;
--  librdf_node** cnp=NULL;
- 
-   switch(flags) {
-     case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT:
-@@ -1606,20 +1673,14 @@
-           return scontext->context_node;
-       }
- 
--      /* current stuff is out of date - get new cached answers */
--      if(scontext->index_contexts) {
--        if(scontext->context_node)
--          librdf_free_node(scontext->context_node);
--        scontext->context_node=NULL;
--        cnp=&scontext->context_node;
--      }
--      
-+      /* note: scontext->context_node is still valid */
-+
-       librdf_statement_clear(&scontext->current);
- 
-       v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator);
--      
-+
-       /* decode value content and optional context */
--      if(!librdf_statement_decode_parts(&scontext->current, cnp,
-+      if(!librdf_statement_decode_parts(&scontext->current, NULL,
-                                         (unsigned char*)v->data, v->size)) {
-         return NULL;
-       }