Revert "add debian 01_64-bit-data.patch"

patch already is part of wmctrl_1.07-6.diff.gz
we should really rebase against debian 1.07-7

This reverts commit d6374e7335.
epel9
Jens Petersen 8 years ago
parent d6374e7335
commit 0fd56ccf38

@ -1,32 +0,0 @@
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';

@ -1,6 +1,6 @@
Name: wmctrl Name: wmctrl
Version: 1.07 Version: 1.07
Release: 20%{?dist} Release: 19%{?dist}
Summary: Command line tool to interact with an X Window Manager Summary: Command line tool to interact with an X Window Manager
Group: User Interface/X Group: User Interface/X
@ -12,7 +12,6 @@ BuildRequires: libXmu-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
Patch0: http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_1.07-6.diff.gz Patch0: http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_1.07-6.diff.gz
Patch1: wmctrl-sticky-workspace.patch Patch1: wmctrl-sticky-workspace.patch
Patch2: wmctrl-debian-01_64-bit-data.patch
%description %description
The wmctrl program is a UNIX/Linux command line tool to interact with an The wmctrl program is a UNIX/Linux command line tool to interact with an
@ -30,7 +29,6 @@ application that is able to run a command in response to an event.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
@ -49,9 +47,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog %changelog
* Tue Dec 20 2016 Jens Petersen <petersen@redhat.com> - 1.07-20
- add an old 64bit long X patch from debian
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.07-19 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.07-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

Loading…
Cancel
Save