CVS commit: pkgsrc/wm/wmctrl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 23 20:03:22 UTC 2025

Modified Files:
        pkgsrc/wm/wmctrl: Makefile distinfo
        pkgsrc/wm/wmctrl/patches: patch-aa

Log Message:
wmctrl: fix 64 bit architecture implementation of 32 bit data

>From Robert Bagdan via wip.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/wm/wmctrl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/wmctrl/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/wm/wmctrl/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/wmctrl/Makefile
diff -u pkgsrc/wm/wmctrl/Makefile:1.20 pkgsrc/wm/wmctrl/Makefile:1.21
--- pkgsrc/wm/wmctrl/Makefile:1.20      Wed Dec  8 16:06:52 2021
+++ pkgsrc/wm/wmctrl/Makefile   Thu Jan 23 20:03:21 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2021/12/08 16:06:52 adam Exp $
+# $NetBSD: Makefile,v 1.21 2025/01/23 20:03:21 wiz Exp $
 
 DISTNAME=              wmctrl-1.07
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            wm
 MASTER_SITES=          https://sites.google.com/site/tstyblo/wmctrl/
 

Index: pkgsrc/wm/wmctrl/distinfo
diff -u pkgsrc/wm/wmctrl/distinfo:1.6 pkgsrc/wm/wmctrl/distinfo:1.7
--- pkgsrc/wm/wmctrl/distinfo:1.6       Tue Oct 26 11:25:20 2021
+++ pkgsrc/wm/wmctrl/distinfo   Thu Jan 23 20:03:21 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:25:20 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/01/23 20:03:21 wiz Exp $
 
 BLAKE2s (wmctrl-1.07.tar.gz) = 3d8f31f82c6b6d3aea6f606529405892a0d99131a65a39c90df6db1b5e9df759
 SHA512 (wmctrl-1.07.tar.gz) = 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
 Size (wmctrl-1.07.tar.gz) = 87820 bytes
-SHA1 (patch-aa) = 1531a6a6f02d195c10d4ead305aacb6aef1ce66a
+SHA1 (patch-aa) = 67995df18aa47c62ca06f3286f0e1eb9d5c4799e

Index: pkgsrc/wm/wmctrl/patches/patch-aa
diff -u pkgsrc/wm/wmctrl/patches/patch-aa:1.1.1.1 pkgsrc/wm/wmctrl/patches/patch-aa:1.2
--- pkgsrc/wm/wmctrl/patches/patch-aa:1.1.1.1   Wed Jan 28 22:42:58 2004
+++ pkgsrc/wm/wmctrl/patches/patch-aa   Thu Jan 23 20:03:21 2025
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/28 22:42:58 snj Exp $
+$NetBSD: patch-aa,v 1.2 2025/01/23 20:03:21 wiz Exp $
 
---- main.c.orig        2004-01-27 12:52:49.000000000 -0800
-+++ main.c     2004-01-27 13:01:52.000000000 -0800
-@@ -145,6 +145,8 @@
+* Support undecorated properties
+* Fix 64 bit data from debian
+
+--- main.c.orig        2005-01-29 03:31:33.000000000 +0000
++++ main.c
+@@ -159,6 +159,8 @@ Free Software Foundation, Inc., 675 Mass
  "                           shaded, skip_taskbar, skip_pager, hidden,\n" \
  "                           fullscreen, above, below\n" \
  "\n" \
@@ -11,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/28 2
  "Workarounds:\n" \
  "\n" \
  "  DESKTOP_TITLES_INVALID_UTF8      Print non-ASCII desktop titles correctly\n" \
-@@ -736,7 +738,11 @@
+@@ -776,7 +778,11 @@ static int window_state (Display *disp, 
                  fputs("Invalid zero length property.\n", stderr);
                  return EXIT_FAILURE;
              }
@@ -24,7 +27,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/28 2
              p_verbose("State 2: %s\n", tmp_prop2); 
              prop2 = XInternAtom(disp, tmp_prop2, False);
              g_free(tmp2);
-@@ -748,7 +754,11 @@
+@@ -788,7 +794,11 @@ static int window_state (Display *disp, 
              fputs("Invalid zero length property.\n", stderr);
              return EXIT_FAILURE;
          }
@@ -37,3 +40,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/28 2
          p_verbose("State 1: %s\n", tmp_prop1); 
          prop1 = XInternAtom(disp, tmp_prop1, False);
          g_free(tmp1);
+@@ -1425,6 +1435,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 +1461,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';