diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | fix-printf.patch | 13 |
3 files changed, 24 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = r-flowcore pkgdesc = Basic structures for flow cytometry data pkgver = 2.14.2 - pkgrel = 1 + pkgrel = 3 url = https://bioconductor.org/packages/flowCore arch = x86_64 license = Artistic-2.0 @@ -27,10 +27,13 @@ pkgbase = r-flowcore optdepends = r-rgraphviz optdepends = r-testthat source = https://bioconductor.org/packages/release/bioc/src/contrib/flowCore_2.14.2.tar.gz + source = fix-printf.patch source = fix-build.patch md5sums = dcf8d4670f2a8f3af6f10328a2bbe941 + md5sums = 6b3e7e965d1305b7035d3073119e5b42 md5sums = 219c62c718ad269fd5e832397a354e83 b2sums = 17b804fb3f269734eed0ffabb416951e4959f747530584a51e74388fdad449923d15ab059c3fe990f77d978ccd2b65931ed24e5533dc2d0326a29dedfe1f8267 + b2sums = 6e4036981d60a5a037bc04176bcc3fd3a7b0a1a34dd81b09addd85dbcf0075934206dfa4c8bef9b9fb7b2d5f855c34fc3fcaeecbb76214a8d08f3cd7f9cde591 b2sums = 6bc038d5c185faa94b6a85d6f884cdefd3e614c26c4e5240cbb217179385d26eec40b329e14ab6d4d9bae2e60d1b49faedc6fffe9e36f271d33c2db92b10d447 pkgname = r-flowcore @@ -6,7 +6,7 @@ _pkgname=flowCore _pkgver=2.14.2 pkgname=r-${_pkgname,,} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=3 pkgdesc="Basic structures for flow cytometry data" arch=(x86_64) url="https://bioconductor.org/packages/$_pkgname" @@ -41,13 +41,19 @@ optdepends=( r-testthat ) source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz" + "fix-printf.patch" "fix-build.patch") md5sums=('dcf8d4670f2a8f3af6f10328a2bbe941' + '6b3e7e965d1305b7035d3073119e5b42' '219c62c718ad269fd5e832397a354e83') b2sums=('17b804fb3f269734eed0ffabb416951e4959f747530584a51e74388fdad449923d15ab059c3fe990f77d978ccd2b65931ed24e5533dc2d0326a29dedfe1f8267' + '6e4036981d60a5a037bc04176bcc3fd3a7b0a1a34dd81b09addd85dbcf0075934206dfa4c8bef9b9fb7b2d5f855c34fc3fcaeecbb76214a8d08f3cd7f9cde591' '6bc038d5c185faa94b6a85d6f884cdefd3e614c26c4e5240cbb217179385d26eec40b329e14ab6d4d9bae2e60d1b49faedc6fffe9e36f271d33c2db92b10d447') prepare() { + # fix format string errors + patch -Np1 -i fix-printf.patch + # fix build and remove unnecessary import from tests patch -Np1 -i fix-build.patch } diff --git a/fix-printf.patch b/fix-printf.patch new file mode 100644 index 000000000000..28f7aed461f4 --- /dev/null +++ b/fix-printf.patch @@ -0,0 +1,13 @@ +diff --git a/flowCore/src/fcsTextParse.cpp b/flowCore/src/fcsTextParse.cpp +index 524f9ad..8cd6b7a 100644 +--- a/flowCore/src/fcsTextParse.cpp ++++ b/flowCore/src/fcsTextParse.cpp +@@ -128,7 +128,7 @@ typedef std::vector<myPair> myPairs; + std::string serror = "uneven number of tokens: "; + serror.append(boost::lexical_cast<std::string>(j)); + serror.append("\n"); +- Rprintf(serror.data()); ++ Rprintf("%s", serror.data()); + Rprintf("The last keyword is dropped.\n"); + + } |