diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-23 20:37:42 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-23 20:37:42 +0200 |
| commit | 52679e66a52461bc48188dc4c30490aba2a87595 (patch) | |
| tree | 619ec3e7b4a99d70dca436875d050ad13faad195 | |
| parent | f0b4b5a06867fd1ac71fd8f32ac837245fbbcd03 (diff) | |
blackbox: fix build issue with gcc 4.6+
Fixes http://autobuild.buildroot.net/results/e99b292047b780d379f1123e61177c234d5d3351
Patch from Debian.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch | 34 |
1 files changed, 34 insertions, 0 deletions
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 <jacmet@sunsite.dk> + +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk <jwilk@debian.org> +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 <X11/Xutil.h> ++ + #include <limits.h> + #include <string> + +@@ -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 + |