diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 22:45:31 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 22:45:31 -0300 |
commit | 27a90a9d957b56dac972c9df0febb6262fb90dce (patch) | |
tree | 79251bdfb00539a1ddf1592d80eacd47971dcf24 /libre/blackbox-libre/textpropertytostring-unconditional.patch | |
parent | 87b9cca463a1dbf2b5026c9dc770b5591b2d3fdc (diff) | |
parent | 8185891e28635bdb83fdf4ba4391030912dae596 (diff) |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
libre/audacious-plugins-libre/PKGBUILD
libre/linux-libre/PKGBUILD
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 + |