[Debichem-devel] Bug#777969: Fix build using GCC 5

[Matthias Klose]

Control: tags -1 + patch pending

attached is the patch for this and the two other issues, uploading to delayed.

-------------- next part --------------
diff -Nru libpwiz-3.0.6585/debian/changelog libpwiz-3.0.6585/debian/changelog
--- libpwiz-3.0.6585/debian/changelog	2014-08-18 12:35:48.000000000 +0000
+++ libpwiz-3.0.6585/debian/changelog	2015-07-09 12:43:41.000000000 +0000
@@ -1,3 +1,17 @@
+libpwiz (3.0.6585-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Matthias Klose ]
+  * Fix build using GCC 5. Closes: #777969.
+  * Build-depend on libgd-dev. Closes: #791841.
+
+  [ Arthur Marble ]
+  * Fix FTBFS with clang. Closes: #758322.
+    - Fixed Visibility does not match previous declaration error.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 09 Jul 2015 14:03:07 +0200
+
 libpwiz (3.0.6585-2) unstable; urgency=medium
 
   * mv upstream upstream/metadata
diff -Nru libpwiz-3.0.6585/debian/control libpwiz-3.0.6585/debian/control
--- libpwiz-3.0.6585/debian/control	2014-08-18 12:35:48.000000000 +0000
+++ libpwiz-3.0.6585/debian/control	2015-07-09 12:43:41.000000000 +0000
@@ -16,7 +16,7 @@
                libboost-thread-dev (>= 1.54.0),
                libboost-system-dev (>= 1.54.0),
                libfftw3-dev (>= 3.3.2),
-               libgd2-xpm-dev (>= 2.0.35),
+               libgd-dev,
                autotools-dev (>= 20130515.1)
 Standards-Version: 3.9.5
 Section: libs
diff -Nru libpwiz-3.0.6585/debian/patches/clang-ftbfs.diff libpwiz-3.0.6585/debian/patches/clang-ftbfs.diff
--- libpwiz-3.0.6585/debian/patches/clang-ftbfs.diff	1970-01-01 00:00:00.000000000 +0000
+++ libpwiz-3.0.6585/debian/patches/clang-ftbfs.diff	2015-07-09 12:43:41.000000000 +0000
@@ -0,0 +1,23 @@
+--- a/libraries/boost_aux/boost/utility/singleton.hpp
++++ b/libraries/boost_aux/boost/utility/singleton.hpp
+@@ -22,7 +22,9 @@
+ #       include <boost/thread/once.hpp>
+ #   endif
+ 
+-#   if defined(__GNUC__) && __GNUC__ >= 4
++#   if defined(__clang__)
++#     define BOOST_UTILITY_SINGLETON_API
++#   elif defined(__GNUC__) && __GNUC__ >= 4
+ #     define BOOST_UTILITY_SINGLETON_API __attribute__ ((visibility("default")))
+ #     pragma GCC visibility push(hidden)
+ #   else
+@@ -204,7 +206,8 @@ namespace boost
+ 
+ } // namespace boost
+ 
+-#   if defined(__GNUC__) && __GNUC__ >= 4
++#   if defined(__clang__)
++#   elif defined(__GNUC__) && __GNUC__ >= 4
+ #     pragma GCC visibility pop
+ #   endif
+ 
diff -Nru libpwiz-3.0.6585/debian/patches/gcc5.diff libpwiz-3.0.6585/debian/patches/gcc5.diff
--- libpwiz-3.0.6585/debian/patches/gcc5.diff	1970-01-01 00:00:00.000000000 +0000
+++ libpwiz-3.0.6585/debian/patches/gcc5.diff	2015-07-09 12:43:41.000000000 +0000
@@ -0,0 +1,13 @@
+Index: b/autotools/boost.m4
+===================================================================
+--- a/autotools/boost.m4
++++ b/autotools/boost.m4
+@@ -72,7 +72,7 @@ dnl strip `\n' with backquotes, not the
+ dnl boost_cv_lib_version='1_37\r' for instance, which breaks
+ dnl everything else.
+ dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
+-(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
++(eval "$ac_cpp -P conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+   tr -d '\r' |
+   $SED -n -e "$1" >conftest.i 2>&1],
+   [$3],
diff -Nru libpwiz-3.0.6585/debian/patches/series libpwiz-3.0.6585/debian/patches/series
--- libpwiz-3.0.6585/debian/patches/series	2014-08-18 12:35:48.000000000 +0000
+++ libpwiz-3.0.6585/debian/patches/series	2015-07-09 12:43:41.000000000 +0000
@@ -1,2 +1,3 @@
 build-system-fixes.patch
-
+gcc5.diff
+clang-ftbfs.diff