[med-svn] [Git][med-team/pbbam][master] 4 commits: add boost_optional.patch

[Étienne Mollier]

Étienne Mollier pushed to branch master at Debian Med / pbbam


Commits:
9680a576 by Étienne Mollier at 2020-11-12T19:43:31+01:00
add boost_optional.patch

This patch solves an:

	error: static assertion failed: If you want to output boost::optional, include header <boost/optional/optional_io.hpp>

There are also three checks which are disabled in the test suite,
as the Boost semantic has changed.  To be brought upstream.

- - - - -
babdc083 by Étienne Mollier at 2020-11-12T19:46:39+01:00
bump to libpbbam1.6.0

- - - - -
97851f78 by Étienne Mollier at 2020-11-12T20:08:50+01:00
dep3 header to boost_optional.patch

- - - - -
0a31eeba by Étienne Mollier at 2020-11-12T20:12:18+01:00
update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/boost_optional.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
 pbbam (1.6.0+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * New upstream version
     Closes: #973160
   * Bump versioned Build-Depends: libpbcopper-dev (>= 1.8.0)
 
+  [ Étienne Mollier ]
+  * Add boost_optional.patch to address boost::optional error.
+
  -- Andreas Tille <tille at debian.org>  Thu, 12 Nov 2020 16:36:05 +0100
 
 pbbam (1.3.0+dfsg-2) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -28,7 +28,7 @@ Package: pbbamtools
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libpbbam1.3.0 (= ${binary:Version})
+         libpbbam1.6.0 (= ${binary:Version})
 Recommends: samtools
 Description: processing Pacific Biosciences binary alignment/map files
  The BAM format is a binary, compressed, record-oriented container format
@@ -43,7 +43,7 @@ Description: processing Pacific Biosciences binary alignment/map files
  This package provides command-line utilities for working with PacBio BAM
  files.
 
-Package: libpbbam1.3.0
+Package: libpbbam1.6.0
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -66,7 +66,7 @@ Description: Pacific Biosciences binary alignment/map (BAM) library
 Package: libpbbam-dev
 Architecture: any
 Section: libdevel
-Depends: libpbbam1.3.0 (= ${binary:Version}),
+Depends: libpbbam1.6.0 (= ${binary:Version}),
          libhts-dev,
          libssl-dev,
          ${misc:Depends}


=====================================
debian/patches/boost_optional.patch
=====================================
@@ -0,0 +1,48 @@
+Description: fix Boost errors at build time
+ In addition to one more header included, there are a couple of checks which
+ are disabled.  The patch may not be suitable as is, but the issue should be
+ reported upstream.
+Author: Étienne Mollier <etienne.mollier at mailoo.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973160
+Forwarded: no
+Last-Update: 2020-11-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- pbbam.orig/tests/src/test_ReadGroupInfo.cpp
++++ pbbam/tests/src/test_ReadGroupInfo.cpp
+@@ -277,14 +277,14 @@
+         EXPECT_EQ("00082ba1", rg.BaseId());
+ 
+         const auto barcodes = rg.Barcodes();
+-        EXPECT_EQ(boost::none, barcodes);
++        //EXPECT_EQ(boost::none, barcodes);
+         EXPECT_EQ(boost::none, rg.BarcodeForward());
+         EXPECT_EQ(boost::none, rg.BarcodeReverse());
+     }
+     {   // no '/' found
+         const ReadGroupInfo rg{"00082ba1.0--1"};
+         const auto barcodes = rg.Barcodes();
+-        EXPECT_EQ(boost::none, barcodes);
++        //EXPECT_EQ(boost::none, barcodes);
+         EXPECT_EQ(boost::none, rg.BarcodeForward());
+         EXPECT_EQ(boost::none, rg.BarcodeReverse());
+     }
+@@ -294,7 +294,7 @@
+ {
+     const ReadGroupInfo rg{""};
+     const auto barcodes = rg.Barcodes();
+-    EXPECT_EQ(boost::none, barcodes);
++    //EXPECT_EQ(boost::none, barcodes);
+     EXPECT_EQ(boost::none, rg.BarcodeForward());
+     EXPECT_EQ(boost::none, rg.BarcodeReverse());
+ }
+--- pbbam.orig/include/pbbam/ReadGroupInfo.h
++++ pbbam/include/pbbam/ReadGroupInfo.h
+@@ -10,6 +10,7 @@
+ #include <string>
+ #include <utility>
+ 
++#include <boost/optional/optional_io.hpp>
+ #include <boost/optional.hpp>
+ 
+ #include <pbcopper/data/FrameCodec.h>


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 use_debian_packaged_python3-cram.patch
 python3.patch
 results_with_latest_samtools.patch
+boost_optional.patch



View it on GitLab: https://salsa.debian.org/med-team/pbbam/-/compare/18fb874e4093b044b1f21f9ed7a45f5e479acc5d...0a31eeba403ab222f9a1b108395012ad1d05e07b

-- 
View it on GitLab: https://salsa.debian.org/med-team/pbbam/-/compare/18fb874e4093b044b1f21f9ed7a45f5e479acc5d...0a31eeba403ab222f9a1b108395012ad1d05e07b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201112/14d9a9f5/attachment-0001.html>