diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 22:54:10 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 22:54:10 -0300 |
| commit | 4ce84837520f8c56ae998d5d2d98380faf3e3eb5 (patch) | |
| tree | b22e90f4dc9b313fbc814852c874e4fb31a8d0c7 /libre/blackbox-libre/textpropertytostring-unconditional.patch | |
| parent | 5f74139e49aec90fef556447373608db10d9f1e6 (diff) | |
| parent | 96b3ccdea0907e8df071273f302e1640b05d07c6 (diff) | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/blackbox-libre/textpropertytostring-unconditional.patch')
| -rw-r--r-- | libre/blackbox-libre/textpropertytostring-unconditional.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox-libre/textpropertytostring-unconditional.patch new file mode 100644 index 000000000..ed320388a --- /dev/null +++ b/libre/blackbox-libre/textpropertytostring-unconditional.patch @@ -0,0 +1,28 @@ +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 + |