[tango] 01/03: try to fic gcc5 problem

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit 883b05aa256cea002f0554219b8124c6af8a36fc
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Sep 13 09:24:14 2015 +0200

    try to fic gcc5 problem
---
 debian/patches/cxx11  | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series |  2 +-
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/debian/patches/cxx11 b/debian/patches/cxx11
new file mode 100644
index 0000000..d6aa1d5
--- /dev/null
+++ b/debian/patches/cxx11
@@ -0,0 +1,87 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ tango (8.1.2c+dfsg-6) unstable; urgency=medium
+ .
+   * Bump Standards-Version to 3.9.6 (nothing to do)
+   * debian/control
+     + Updated Vcs-Git
+   * debian/patches
+     + 0009-fix-gcc5-compilation.patch (Closes: #797285)
+   * GCC5 transistion
+     - Rename liblog4tango5 to liblog4tango5v5, triggered by the libstdc++6
+     - Rename libtango8 to libtango8v5, triggered by the libstdc++6
+     transition.
+     - Add Conflict/Replaces with the old libraries.
+     - Rename liblog4tango5-dbg to liblog4tango5v5-dbg.
+     - Rename libtango8-dbg to libtango8v5-dbg.
+Author: Picca Frédéric-Emmanuel <picca at debian.org>
+Bug-Debian: https://bugs.debian.org/797285
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- tango-8.1.2c+dfsg.orig/lib/cpp/server/tango_const.h
++++ tango-8.1.2c+dfsg/lib/cpp/server/tango_const.h
+@@ -950,18 +950,23 @@ typedef struct _OptAttrProp
+ 
+ 
+ // Ranges type-enum-string conversions
++#ifdef _GLIBCXX_USE_CXX11_ABI
++#define TANGO_CXX11_ABI __attribute((abi_tag("cxx11")))
++#else
++#define TANGO_CXX11_ABI
++#endif
+ 
+ template <typename T>
+ struct ranges_type2const
+ {
+ 	static CmdArgType enu;
+-	static string str;
++	static TANGO_CXX11_ABI string str;
+ };
+ 
+ template <CmdArgType>
+ struct ranges_const2type
+ {
+-	static string str;
++	static TANGO_CXX11_ABI string str;
+ };
+ 
+ #define RANGES_TYPE2CONST(type,constant) \
+@@ -969,17 +974,17 @@ struct ranges_const2type
+ 	struct ranges_type2const<type> \
+ 	{ \
+ 		static CmdArgType enu; \
+-		static string str; \
++		static TANGO_CXX11_ABI string str; \
+ 	}; \
+ 	CmdArgType ranges_type2const<type>::enu = constant; \
+-	string ranges_type2const<type>::str = #type; \
++	TANGO_CXX11_ABI string ranges_type2const<type>::str = #type; \
+ 	template<> \
+ 	struct ranges_const2type<Tango::constant> \
+ 	{ \
+ 		typedef type Type; \
+-		static string str; \
++		static TANGO_CXX11_ABI string str; \
+ 	}; \
+-	string ranges_const2type<Tango::constant>::str = #type;
++	TANGO_CXX11_ABI string ranges_const2type<Tango::constant>::str = #type;
+ 
+ /*
+  * List of strings used by the API as the DevError reason field.
diff --git a/debian/patches/series b/debian/patches/series
index 4fab63f..de3c9fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@
 0006-fix-upstream-p812_2.patch
 0007-fix-upstream-p812_3.patch
 0008-fix-upstream-p812_4.patch
-0009-fix-gcc5-compilation.patch
+cxx11

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git