[med-svn] [cufflinks] 02/02: Fix gcc-6.1 build issue caused by an unmaintained code copy of liblemon.

[Andreas Tille]

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

tille pushed a commit to branch master
in repository cufflinks.

commit da5b4bd01a6cc62c3f2514bf01252797c6d16b37
Author: Andreas Tille <tille at debian.org>
Date:   Tue Aug 16 16:13:28 2016 +0200

    Fix gcc-6.1 build issue caused by an unmaintained code copy of liblemon.
---
 debian/changelog                                   |  8 +++++---
 .../fix_gcc-6.1_issue_in_liblemon_code_copy.patch  | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd112b9..977ec15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-cufflinks (2.2.1-3) UNRELEASED; urgency=medium
+cufflinks (2.2.1-3) unstable; urgency=medium
 
   * Use unversioned libboost.  (Thanks for the hint to Gianfranco Costamagna)
-  TODO: Fix build with gcc-6
+  * Fix gcc-6.1 build issue caused by an unmaintained code copy of liblemon.
+    Thanks for the hint to Graham Inggs <ginggs at debian.org>
+    Closes: #833493
 
- -- Andreas Tille <tille at debian.org>  Fri, 05 Aug 2016 08:56:59 +0200
+ -- Andreas Tille <tille at debian.org>  Tue, 16 Aug 2016 13:46:04 +0200
 
 cufflinks (2.2.1-2) unstable; urgency=medium
 
diff --git a/debian/patches/fix_gcc-6.1_issue_in_liblemon_code_copy.patch b/debian/patches/fix_gcc-6.1_issue_in_liblemon_code_copy.patch
new file mode 100644
index 0000000..a298b33
--- /dev/null
+++ b/debian/patches/fix_gcc-6.1_issue_in_liblemon_code_copy.patch
@@ -0,0 +1,23 @@
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: Mon, 15 Aug 2016 23:47:24 +0200
+Bug-Debian: https://bugs.debian.org/833493
+Description: Fix a build issue caused by an unmaintained code copy
+ of liblemon.
+ Remark: Cufflinks does not build with the current Debian packaged liblemon.
+         If you want to try you can use the branch use_debian_packaged_liblemon
+         in the packaging Git
+
+--- a/src/lemon/error.h
++++ b/src/lemon/error.h
+@@ -67,9 +67,9 @@ namespace lemon {
+     }
+ 
+     ExceptionMember& operator=(const ExceptionMember& copy) {
+-      if (ptr.get() == 0) return;
++      if (ptr.get() == 0) return NULL;
+       try {
+-	if (!copy.valid()) return;
++	if (!copy.valid()) return NULL;
+  	*ptr = copy.get();
+       } catch (...) {}
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 7f0e077..c8957a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ gffread_show_usage.patch
 0003-fix_includes_path.patch
 format-security.patch
 lib_eigen.patch
+fix_gcc-6.1_issue_in_liblemon_code_copy.patch

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