aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/wmctrl-64-fix.patch
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2014-12-05 00:22:04 +0300
committerAlex Kost <alezost@gmail.com>2014-12-10 00:37:46 +0300
commit2e88e089da7cb0d1937e020ce1f7efdf72739a74 (patch)
tree860193750c4368c0671c79377ac5d35c6390a974 /gnu/packages/patches/wmctrl-64-fix.patch
parent426fde9ae1e9869a295764da5936d5a085c12ed3 (diff)
downloadguix-2e88e089da7cb0d1937e020ce1f7efdf72739a74.tar
guix-2e88e089da7cb0d1937e020ce1f7efdf72739a74.tar.gz
gnu: Add wmctrl.
* gnu/packages/xdisorg.scm (wmctrl): New variable. * gnu/packages/patches/wmctrl-64-fix.patch: New file. * gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches/wmctrl-64-fix.patch')
-rw-r--r--gnu/packages/patches/wmctrl-64-fix.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/gnu/packages/patches/wmctrl-64-fix.patch b/gnu/packages/patches/wmctrl-64-fix.patch
new file mode 100644
index 0000000000..3ec1c913ff
--- /dev/null
+++ b/gnu/packages/patches/wmctrl-64-fix.patch
@@ -0,0 +1,32 @@
+Description: Correct 64 Architecture implementation of 32 bit data
+Author: Chris Donoghue <cdonoghu@gmail.com>
+Bug-Debian: http://bugs.debian.org/362068
+
+--- wmctrl-1.07.orig/main.c
++++ wmctrl-1.07/main.c
+@@ -1425,6 +1425,16 @@ static gchar *get_property (Display *dis
+ *
+ * long_length = Specifies the length in 32-bit multiples of the
+ * data to be retrieved.
++ *
++ * NOTE: see
++ * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
++ * In particular:
++ *
++ * When the X window system was ported to 64-bit architectures, a
++ * rather peculiar design decision was made. 32-bit quantities such
++ * as Window IDs, atoms, etc, were kept as longs in the client side
++ * APIs, even when long was changed to 64 bits.
++ *
+ */
+ if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False,
+ xa_prop_type, &xa_ret_type, &ret_format,
+@@ -1441,6 +1451,8 @@ static gchar *get_property (Display *dis
+
+ /* null terminate the result to make string handling easier */
+ tmp_size = (ret_format / 8) * ret_nitems;
++ /* Correct 64 Architecture implementation of 32 bit data */
++ if(ret_format==32) tmp_size *= sizeof(long)/4;
+ ret = g_malloc(tmp_size + 1);
+ memcpy(ret, ret_prop, tmp_size);
+ ret[tmp_size] = '\0';