[med-svn] [ball] 06/08: Try to fix #777791 by cherry picking from upstream but other build issue (related to boost) occures

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ball.

commit 5cafeaea90d86e9b20d085db18cce6e187c3ea69
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jan 7 09:51:40 2016 +0100

    Try to fix #777791 by cherry picking from upstream but other build issue (related to boost) occures
---
 debian/changelog                      |  2 +
 debian/patches/more-gcc5_issues.patch | 72 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 75 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a1b2c0e..221f543 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ball (1.4.2+20140406-2) UNRELEASED; urgency=medium
   * New homepage
   * Moved to Github
   * Adapt watch file to Github
+  * Cherry-pick from upstream "Use c++11 on Clang"
+    Closes: #777791
 
  -- Andreas Tille <tille at debian.org>  Thu, 07 Jan 2016 08:47:19 +0100
 
diff --git a/debian/patches/more-gcc5_issues.patch b/debian/patches/more-gcc5_issues.patch
new file mode 100644
index 0000000..e797e25
--- /dev/null
+++ b/debian/patches/more-gcc5_issues.patch
@@ -0,0 +1,72 @@
+From: Andreas Hildebrandt <andreas.hildebrandt at uni-mainz.de>
+Date: Fri, 4 Apr 2014 14:34:42 +0200
+Bug-Debian: https://bugs.debian.org/777791
+Origin: upstream, cherry picked from
+        https://github.com/BALL-Project/ball/commit/6700400576521250cbe4f8d201391168eb80e0df.patch
+Subject: Use c++11 on Clang.
+ The patch was changed for source/FORMAT/molFileFactory.C
+
+--- a/cmake/BALLCompilerSpecific.cmake
++++ b/cmake/BALLCompilerSpecific.cmake
+@@ -178,4 +178,7 @@ ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQU
+ 		CXX_COMPILER_VERSION_MINOR ${CXX_COMPILER_VERSION})
+ 
+ 	SET(CXX_COMPILER_VERSION "${CXX_COMPILER_VERSION_MAJOR}.${CXX_COMPILER_VERSION_MINOR}")
++
++	## Clang should use c++-11 - mode 
++	ADD_BALL_DEFINITIONS("-std=c++11")
+ ENDIF()
+--- a/source/PYTHON/EXTENSIONS/BALL/file.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/file.sip
+@@ -22,14 +22,14 @@ class File
+ 	#include <BALL/SYSTEM/file.h>
+ 	using namespace BALL;
+ 
+-/*
+-	const File::OpenMode BALL_File__IN = File::MODE_IN;
+-	const File::OpenMode BALL_File__OUT = File::MODE_OUT;
+-	const File::OpenMode BALL_File__APP = File::MODE_APP;
+-	const File::OpenMode BALL_File__BINARY = File::MODE_BINARY;
+-	const File::OpenMode BALL_File__ATE = File::MODE_ATE;
+-	const File::OpenMode BALL_File__TRUNC = File::MODE_TRUNC;
+-*/
++	/*
++	const File::OpenMode MODE_IN     = std::ios::in;
++	const File::OpenMode MODE_OUT    = std::ios::out;
++	const File::OpenMode MODE_APP    = std::ios::app;
++	const File::OpenMode MODE_BINARY = std::ios::binary;
++	const File::OpenMode MODE_ATE    = std::ios::ate;
++	const File::OpenMode MODE_TRUNC  = std::ios::trunc;
++	*/
+ 
+ %End
+   public:
+@@ -44,7 +44,8 @@ class File
+ 	};
+ 
+ 
+-	enum {
++	/*
++	unsigned enum {
+ 		MODE_IN,
+ 		MODE_OUT,
+ 		MODE_APP,
+@@ -52,6 +53,7 @@ class File
+ 		MODE_ATE,
+ 		MODE_TRUNC
+ 	};
++	*/
+ 
+ 
+   File();
+--- a/source/FORMAT/molFileFactory.C
++++ b/source/FORMAT/molFileFactory.C
+@@ -39,7 +39,7 @@ namespace BALL
+ 			try
+ 			{
+ 				string s;
+-				if (std::getline(in,s)) ok = true;
++				if (bool(std::getline(in,s))) ok = true;
+ 			}
+ 			catch (const boost::iostreams::gzip_error& e)
+ 			{
diff --git a/debian/patches/series b/debian/patches/series
index 0b8451a..ff239f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ HelpSipAmbiguity.patch
 link_against_x11.patch
 findsip.patch
 gcc5.diff
+more-gcc5_issues.patch

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