[arch-commits] Commit in boost/trunk (4 files)

[Evangelos Foutras]

    Date: Saturday, June 2, 2018 @ 21:56:56
  Author: foutrelis
Revision: 325559

upgpkg: boost 1.67.0-3

lockfree/spsc_queue.hpp: include missing header

Added:
  boost/trunk/fix-return-var-qualifier-in-svm_ptr-get_context.patch
    (from rev 325558, boost/trunk/776.patch)
  boost/trunk/lockfree-add-include-boost-next_prior.patch
Modified:
  boost/trunk/PKGBUILD
Deleted:
  boost/trunk/776.patch

-------------------------------------------------------+
 776.patch                                             |   23 ----------------
 PKGBUILD                                              |   12 ++++----
 fix-return-var-qualifier-in-svm_ptr-get_context.patch |   23 ++++++++++++++++
 lockfree-add-include-boost-next_prior.patch           |   21 ++++++++++++++
 4 files changed, 51 insertions(+), 28 deletions(-)

Deleted: 776.patch
===================================================================
--- 776.patch	2018-06-02 18:18:49 UTC (rev 325558)
+++ 776.patch	2018-06-02 21:56:56 UTC (rev 325559)
@@ -1,23 +0,0 @@
-From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
-From: pradeep <pradeep at arrayfire.com>
-Date: Tue, 8 May 2018 14:53:38 +0530
-Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context
-
-Lack of `const` qualifier is throwing errors with GCC 8.1
----
- include/boost/compute/memory/svm_ptr.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp
-index c8753f5b..56cf1268 100644
---- a/include/boost/compute/memory/svm_ptr.hpp
-+++ b/include/boost/compute/memory/svm_ptr.hpp
-@@ -126,7 +126,7 @@ class svm_ptr
-         return m_ptr - other.m_ptr;
-     }
- 
--    context& get_context() const
-+    const context& get_context() const
-     {
-         return m_context;
-     }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-02 18:18:49 UTC (rev 325558)
+++ PKGBUILD	2018-06-02 21:56:56 UTC (rev 325559)
@@ -11,20 +11,22 @@
 pkgname=('boost-libs' 'boost')
 pkgver=1.67.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=3
 url='http://www.boost.org/'
 arch=('x86_64')
 license=('custom')
 makedepends=('icu' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi')
 source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2
-        776.patch)
+        lockfree-add-include-boost-next_prior.patch
+        fix-return-var-qualifier-in-svm_ptr-get_context.patch)
 sha256sums=('2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba'
+            '2639c43e33f9279ffbebf270be0e0951b9f0e7a8264f8c3bfebb5b9901da2db6'
             '43cdc2081f90d2acc7e4d9de6689bce07b2a1b4754e85dc7fa50872afa330ffa')
 
 prepare() {
-   cd ${pkgbase}_${_boostver}/boost
-
-   patch -Np3 -i "$srcdir"/776.patch
+   cd ${pkgbase}_${_boostver}
+   patch -Np2 -i ../lockfree-add-include-boost-next_prior.patch
+   patch -Np2 -i ../fix-return-var-qualifier-in-svm_ptr-get_context.patch
 }
 
 build() {

Copied: boost/trunk/fix-return-var-qualifier-in-svm_ptr-get_context.patch (from rev 325558, boost/trunk/776.patch)
===================================================================
--- fix-return-var-qualifier-in-svm_ptr-get_context.patch	                        (rev 0)
+++ fix-return-var-qualifier-in-svm_ptr-get_context.patch	2018-06-02 21:56:56 UTC (rev 325559)
@@ -0,0 +1,23 @@
+From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
+From: pradeep <pradeep at arrayfire.com>
+Date: Tue, 8 May 2018 14:53:38 +0530
+Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context
+
+Lack of `const` qualifier is throwing errors with GCC 8.1
+---
+ include/boost/compute/memory/svm_ptr.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp
+index c8753f5b..56cf1268 100644
+--- a/include/boost/compute/memory/svm_ptr.hpp
++++ b/include/boost/compute/memory/svm_ptr.hpp
+@@ -126,7 +126,7 @@ class svm_ptr
+         return m_ptr - other.m_ptr;
+     }
+ 
+-    context& get_context() const
++    const context& get_context() const
+     {
+         return m_context;
+     }

Added: lockfree-add-include-boost-next_prior.patch
===================================================================
--- lockfree-add-include-boost-next_prior.patch	                        (rev 0)
+++ lockfree-add-include-boost-next_prior.patch	2018-06-02 21:56:56 UTC (rev 325559)
@@ -0,0 +1,21 @@
+From 12726cda009a855073b9bedbdce57b6ce7763da2 Mon Sep 17 00:00:00 2001
+From: Peter Dimov <pdimov at pdimov.com>
+Date: Sat, 2 Dec 2017 04:10:46 +0200
+Subject: [PATCH] Add #include <boost/next_prior.hpp>; no longer in utility.hpp
+
+---
+ include/boost/lockfree/spsc_queue.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/boost/lockfree/spsc_queue.hpp b/include/boost/lockfree/spsc_queue.hpp
+index 7903d2c..c7f2953 100644
+--- a/include/boost/lockfree/spsc_queue.hpp
++++ b/include/boost/lockfree/spsc_queue.hpp
+@@ -17,6 +17,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/static_assert.hpp>
+ #include <boost/utility.hpp>
++#include <boost/next_prior.hpp>
+ #include <boost/utility/enable_if.hpp>
+ #include <boost/config.hpp> // for BOOST_LIKELY
+