summaryrefslogtreecommitdiff
path: root/libre/blackbox-libre/textpropertytostring-unconditional.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <andre@pc-01.localdomain>2012-05-10 14:21:47 -0300
committerAndré Fabian Silva Delgado <andre@pc-01.localdomain>2012-05-10 14:21:47 -0300
commitdf9dd9f8f99cc2c95205586007317919bd159f67 (patch)
treebb3f50434bc849d1cab6402594cdfd3d5dc0563f /libre/blackbox-libre/textpropertytostring-unconditional.patch
parentdec5b581d8a4f26912f8488edf3483a32b3da00d (diff)
parentb5a445c3812dbacdd87f0251effe4ce835187f46 (diff)
downloadabslibre-df9dd9f8f99cc2c95205586007317919bd159f67.tar.gz
abslibre-df9dd9f8f99cc2c95205586007317919bd159f67.tar.bz2
abslibre-df9dd9f8f99cc2c95205586007317919bd159f67.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/blackbox-libre/textpropertytostring-unconditional.patch')
-rw-r--r--libre/blackbox-libre/textpropertytostring-unconditional.patch28
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
+