Ticket #56294: boost_1.66.0_to_1.68.0.diff

File boost_1.66.0_to_1.68.0.diff, 1.9 KB (added by michaelld (Michael Dickens), 6 years ago)
  • devel/boost/Portfile

    diff --git a/devel/boost/Portfile b/devel/boost/Portfile
    index 2dcb576e44..2242c3e8a1 100644
    a b PortGroup active_variants 1.1 
    88
    99name            boost
    1010
    11 version         1.66.0
     11version         1.68.0
    1212# Revision is set below in the `if {$subport eq $name} { ... }` statement
    1313# The boost-numpy subport has its own revision number
    14 checksums       rmd160  ee5dafdfa49adf50a5333cef1f55dac4f70b4c14 \
    15                 sha256  5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9 \
    16                 size    85995778
     14checksums       rmd160  39c7f40eafd4de2c12c639534ef07df8bb520df0 \
     15                sha256  7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7 \
     16                size    92155315
    1717
    1818license         Boost-1
    1919categories      devel
    subport boost-numpy { 
    277277}
    278278
    279279if {$subport eq $name} {
    280     revision 3
     280    revision 0
    281281    patchfiles-append patch-disable-numpy-extension.diff
    282282
    283283    variant regex_match_extra description \
  • devel/boost/files/patch-boost-python3.diff

    diff --git a/devel/boost/files/patch-boost-python3.diff b/devel/boost/files/patch-boost-python3.diff
    index c226b2f44d..8b88db1b6b 100644
    a b  
    2020-    import mpi
    2121+    from . import mpi
    2222 
    23 --- libs/python/src/converter/builtin_converters.cpp.orig
    24 +++ libs/python/src/converter/builtin_converters.cpp
    25 @@ -45,11 +45,16 @@
    26    {
    27        return PyString_Check(obj) ? PyString_AsString(obj) : 0;
    28    }
    29 -#else
    30 +#elif PY_VERSION_HEX < 0x03070000
    31    void* convert_to_cstring(PyObject* obj)
    32    {
    33        return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0;
    34    }
    35 +#else
    36 +  void* convert_to_cstring(PyObject* obj)
    37 +  {
    38 +      return PyUnicode_Check(obj) ? const_cast<void*>(reinterpret_cast<const void*>(_PyUnicode_AsString(obj))) : 0;
    39 +  }
    40  #endif
    41 
    42    // Given a target type and a SlotPolicy describing how to perform a