From 52679e66a52461bc48188dc4c30490aba2a87595 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 23 Sep 2012 20:37:42 +0200 Subject: blackbox: fix build issue with gcc 4.6+ Fixes http://autobuild.buildroot.net/results/e99b292047b780d379f1123e61177c234d5d3351 Patch from Debian. Signed-off-by: Peter Korsgaard --- ...lackbox-0.70.1-gcc46-textpropertytostring.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch (limited to 'package') diff --git a/package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch b/package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch new file mode 100644 index 000000000..af03be4b9 --- /dev/null +++ b/package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch @@ -0,0 +1,34 @@ +[PATCH] fix build issue with gcc 4.6+ + +Debian patch from http://patch-tracker.debian.org/patch/series/dl/blackbox/0.70.1-13/textpropertytostring-unconditional.diff + +Signed-off-by: Peter Korsgaard + +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk +Forwarded: no +Bug-Debian: http://bugs.debian.org/614468 +Last-Update: 2011-03-12 + +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include ++ + #include + #include + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt + -- cgit v1.2.3