diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 02:04:13 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 02:04:13 -0300 |
commit | 0a088f3c285e53ee377271f42c16071e3ee5bafd (patch) | |
tree | ee094061e4ec6cd7808201f3c75c7f343ef3ba3a /libre/blackbox/textpropertytostring-unconditional.patch | |
parent | 0be822175bb3cef0534b9a0597e84ae1ee6374ec (diff) | |
parent | 035f2fd609cd247ac0430f15cad3af94ce79f5f8 (diff) | |
download | abslibre-0a088f3c285e53ee377271f42c16071e3ee5bafd.tar.gz abslibre-0a088f3c285e53ee377271f42c16071e3ee5bafd.tar.bz2 abslibre-0a088f3c285e53ee377271f42c16071e3ee5bafd.zip |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre/blackbox/textpropertytostring-unconditional.patch')
-rw-r--r-- | libre/blackbox/textpropertytostring-unconditional.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libre/blackbox/textpropertytostring-unconditional.patch b/libre/blackbox/textpropertytostring-unconditional.patch new file mode 100644 index 000000000..ed320388a --- /dev/null +++ b/libre/blackbox/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 + |