[DRE-commits] [passenger] 03/06: Drop fix_ftbfs_boost.patch, fixed upstream.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository passenger.

commit 6a22f90cd0acc9dc45f0a472abed938a9e55a801
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Apr 6 21:35:54 2016 +0200

    Drop fix_ftbfs_boost.patch, fixed upstream.
---
 debian/changelog                     |  1 +
 debian/patches/fix_ftbfs_boost.patch | 43 ------------------------------------
 debian/patches/series                |  1 -
 3 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00a79a1..5546b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 passenger (5.0.27-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop fix_ftbfs_boost.patch, fixed upstream.
   * Build against the libuv package instead of the bundled copy.
     (Closes: 815496)
 
diff --git a/debian/patches/fix_ftbfs_boost.patch b/debian/patches/fix_ftbfs_boost.patch
deleted file mode 100644
index 3218876..0000000
--- a/debian/patches/fix_ftbfs_boost.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fix FTBFS with gcc 5 on freebsd.
-Origin: upstream, https://svn.boost.org/trac/boost/ticket/10125
-
---- a/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once.hpp
-+++ b/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once.hpp
-@@ -42,7 +42,7 @@ namespace boost
-   }
- 
- #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-     template<typename Function, class ...ArgTypes>
-     inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
- #else
-@@ -65,7 +65,7 @@ namespace boost
-   private:
-       volatile thread_detail::uintmax_atomic_t epoch;
- 
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-       template<typename Function, class ...ArgTypes>
-       friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
- #else
-@@ -118,7 +118,7 @@ namespace boost
-     // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
- 
- 
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
- 
- 
-   template<typename Function, class ...ArgTypes>
---- a/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once_atomic.hpp
-+++ b/src/cxx_supportlib/vendor-modified/boost/thread/pthread/once_atomic.hpp
-@@ -115,7 +115,7 @@ namespace boost
- #endif
- 
- 
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
- 
-   template<typename Function, class ...ArgTypes>
-   inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)
diff --git a/debian/patches/series b/debian/patches/series
index 5463f3d..1c012a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 fix_install_path.patch
 bin_load_path.patch
 nodejs_bin_name.patch
-fix_ftbfs_boost.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/passenger.git