[med-svn] r15094 - in trunk/packages/R/r-bioc-xvector/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-11-04 22:06:15 +0000 (Mon, 04 Nov 2013)
New Revision: 15094

Added:
   trunk/packages/R/r-bioc-xvector/trunk/debian/patches/
   trunk/packages/R/r-bioc-xvector/trunk/debian/patches/prefer_iranges_defines_to_avoid_duplicate_definition.patch
   trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series
Log:
Avoid duplicate definition of types


Added: trunk/packages/R/r-bioc-xvector/trunk/debian/patches/prefer_iranges_defines_to_avoid_duplicate_definition.patch
===================================================================
--- trunk/packages/R/r-bioc-xvector/trunk/debian/patches/prefer_iranges_defines_to_avoid_duplicate_definition.patch	                        (rev 0)
+++ trunk/packages/R/r-bioc-xvector/trunk/debian/patches/prefer_iranges_defines_to_avoid_duplicate_definition.patch	2013-11-04 22:06:15 UTC (rev 15094)
@@ -0,0 +1,25 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Mon, 04 Nov 2013 17:24:35 +0100
+Description: Avoid duplicate definition of types
+ The header file of the dependency r-bioc-iranges
+   /usr/lib/R/site-library/IRanges/include/IRanges_defines.h
+ defines the very same types as inst/include/XVector_defines.h.
+ This patches suppresses the redefinition.
+
+--- XVector.orig/inst/include/XVector_defines.h
++++ XVector/inst/include/XVector_defines.h
+@@ -20,7 +20,7 @@
+ #include <Rdefines.h>
+ #include <R_ext/Rdynload.h>
+ 
+-
++#ifndef IRANGES_DEFINES_H
+ typedef struct cached_charseq {
+ 	const char *seq;
+ 	int length;
+@@ -47,3 +47,5 @@
+ } cachedXVectorList;
+ 
+ #endif
++
++#endif

Added: trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series
===================================================================
--- trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series	2013-11-04 22:06:15 UTC (rev 15094)
@@ -0,0 +1 @@
+prefer_iranges_defines_to_avoid_duplicate_definition.patch