[med-svn] [libbpp-core] 05/05: Update patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libbpp-core.

commit c3362aa1dedd7fe43bb8a93d73e5dfb68ec33922
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jun 1 16:02:49 2017 +0200

    Update patches
---
 debian/patches/gcc-6.patch            |  4 ++--
 debian/patches/unforce-cxxflags.patch | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
index 0907df2..0ce7336 100644
--- a/debian/patches/gcc-6.patch
+++ b/debian/patches/gcc-6.patch
@@ -5,7 +5,7 @@ Bug-Debian: https://bugs.debian.org/811657
 
 --- a/src/Bpp/Io/FileTools.cpp
 +++ b/src/Bpp/Io/FileTools.cpp
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ char FileTools::DIR_SEP = '/';
  bool FileTools::fileExists(const std::string& filename)
  {
    ifstream file(filename.c_str());
@@ -14,7 +14,7 @@ Bug-Debian: https://bugs.debian.org/811657
    file.close();
    return test;
  }
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ bool FileTools::fileExists(const std::st
  bool FileTools::directoryExists(const std::string& path)
  {
    ifstream file(path.c_str());
diff --git a/debian/patches/unforce-cxxflags.patch b/debian/patches/unforce-cxxflags.patch
index 56fc9a8..3a2a53d 100644
--- a/debian/patches/unforce-cxxflags.patch
+++ b/debian/patches/unforce-cxxflags.patch
@@ -1,15 +1,17 @@
 From: Gert Wollny <gw.fossdev at gmail.com>
 Date: Wed, 29 Jun 2014 16:52:43 +0200
 Subject: Do not override Debian CXX flags
+Comment: Upstream version 2.3.0 now has additional -std=c++11 which might
+         be needed to be added explicitly
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@
-       FORCE)
- ENDIF(NOT CMAKE_BUILD_TYPE)
+@@ -9,7 +9,7 @@ cmake_minimum_required (VERSION 2.8.11)
+ project (bpp-core CXX)
  
--SET(CMAKE_CXX_FLAGS "-Wall -Weffc++ -Wshadow -Wconversion")
-+#SET(CMAKE_CXX_FLAGS "-Wall -Weffc++ -Wshadow -Wconversion")
- IF(NOT NO_VIRTUAL_COV)
-   SET(NO_VIRTUAL_COV FALSE CACHE BOOL
-       "Disable covariant return type with virtual inheritance, for compilers that do not support it."
+ # Compile options
+-set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
++# set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
+ 
+ IF(NOT CMAKE_BUILD_TYPE)
+   SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-core.git