- add patch for 64bit platforms (taken from gentoo)

- rel 2

Changed files:
    wmctrl-64bit.patch -> 1.1
    wmctrl.spec -> 1.13

diff --git a/wmctrl-64bit.patch b/wmctrl-64bit.patch
new file mode 100644 (file)
index 0000000..a1039a8
--- /dev/null
+++ b/wmctrl-64bit.patch
@@ -0,0 +1,28 @@
+--- wmctrl-1.07.orig/main.c
++++ wmctrl-1.07/main.c
+@@ -1425,6 +1425,16 @@
+      *
+      * 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 @@
+ 
+     /* 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';

diff --git a/wmctrl.spec b/wmctrl.spec
index 28e727d900a8fdb65e215b8a9d52d59e75a1b63b..a4d7be9130680e427547074ebe04ae3f99d6e86c 100644 (file)
--- a/wmctrl.spec
+++ b/wmctrl.spec
@@ -2,12 +2,13 @@ Summary:      wmctrl - a command line tool to interact with an EWMH/NetWM compatible
 Summary(pl.UTF-8):     wmtrl - tekstowe narzędzie do interakcji z zarządcami okien kompatybilnymi z EWMH/NetWM
 Name:          wmctrl
 Version:       1.07
 Summary(pl.UTF-8):     wmtrl - tekstowe narzędzie do interakcji z zarządcami okien kompatybilnymi z EWMH/NetWM
 Name:          wmctrl
 Version:       1.07

-Release:       1
+Release:       2

 License:       GPL
 Group:         X11/Applications
 Vendor:                Tomas Styblo <tripie@cpan.org>
 Source0:       http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
 # Source0-md5: 1fe3c7a2caa6071e071ba34f587e1555
 License:       GPL
 Group:         X11/Applications
 Vendor:                Tomas Styblo <tripie@cpan.org>
 Source0:       http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
 # Source0-md5: 1fe3c7a2caa6071e071ba34f587e1555

+Patch0:                %{name}-64bit.patch

 URL:           http://sweb.cz/tripie/utils/wmctrl/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://sweb.cz/tripie/utils/wmctrl/
 BuildRequires: autoconf
 BuildRequires: automake


@@ -49,6 +50,7 @@ stosują się do specyfikacji.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

+%patch0 -p1

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}