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

[Andreas Tille]

Author: tille
Date: 2013-11-04 22:34:27 +0000 (Mon, 04 Nov 2013)
New Revision: 15095

Added:
   trunk/packages/R/r-bioc-xvector/trunk/debian/patches/define_missing_struct__new_htab.patch
Modified:
   trunk/packages/R/r-bioc-xvector/trunk/debian/control
   trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series
Log:
Need to update biocgenerics before this package can be built


Modified: trunk/packages/R/r-bioc-xvector/trunk/debian/control
===================================================================
--- trunk/packages/R/r-bioc-xvector/trunk/debian/control	2013-11-04 22:06:15 UTC (rev 15094)
+++ trunk/packages/R/r-bioc-xvector/trunk/debian/control	2013-11-04 22:34:27 UTC (rev 15095)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 9),
                cdbs,
                r-base-dev,
-               r-bioc-biocgenerics,
+               r-bioc-biocgenerics (>= 0.7.2),
                r-bioc-iranges
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-bioc-xvector/trunk/

Added: trunk/packages/R/r-bioc-xvector/trunk/debian/patches/define_missing_struct__new_htab.patch
===================================================================
--- trunk/packages/R/r-bioc-xvector/trunk/debian/patches/define_missing_struct__new_htab.patch	                        (rev 0)
+++ trunk/packages/R/r-bioc-xvector/trunk/debian/patches/define_missing_struct__new_htab.patch	2013-11-04 22:34:27 UTC (rev 15095)
@@ -0,0 +1,23 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Mon, 04 Nov 2013 17:24:35 +0100
+Description: Fix some C issues
+
+--- XVector.orig/src/XVector.h
++++ XVector/src/XVector.h
+@@ -691,3 +691,5 @@
+ 	SEXP method
+ );
+ 
++struct htab new_htab(int n);
++
+--- XVector.orig/src/SharedVector_class.c
++++ XVector/src/SharedVector_class.c
+@@ -234,7 +234,7 @@
+ 	nelt = INTEGER(width)[0];
+ 
+ 	PROTECT(ans = NEW_INTEGER(1));
+-	INTEGER(ans)[0] = vector_memcmp(tag1, offset1, tag2, offset2, nelt);
++	INTEGER(ans)[0] = _vector_memcmp(tag1, offset1, tag2, offset2, nelt);
+ 	UNPROTECT(1);
+ 	return ans;
+ }

Modified: trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series
===================================================================
--- trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series	2013-11-04 22:06:15 UTC (rev 15094)
+++ trunk/packages/R/r-bioc-xvector/trunk/debian/patches/series	2013-11-04 22:34:27 UTC (rev 15095)
@@ -1 +1,2 @@
 prefer_iranges_defines_to_avoid_duplicate_definition.patch
+define_missing_struct__new_htab.patch