SHA256
1
0
forked from pool/xemacs
OBS User unknown 2007-02-16 18:41:17 +00:00 committed by Git OBS Bridge
parent 543119d58b
commit b7ca1104ac
3 changed files with 80 additions and 38 deletions

View File

@ -0,0 +1,31 @@
--- xemacs-21.5.27.20060705.orig/src/select-x.c 2007-02-16 12:42:44.000000000 +0100
+++ xemacs-21.5.27.20060705/src/select-x.c 2007-02-16 16:09:32.000000000 +0100
@@ -1048,7 +1048,10 @@
return;
}
- total_size = bytes_remaining + 1;
+ if (sizeof(long) == 8 && *actual_format_ret == 32)
+ total_size = 2 * bytes_remaining + 1;
+ else
+ total_size = bytes_remaining + 1;
*data_ret = xnew_rawbytes (total_size);
/* Now read, until we've gotten it all. */
--- xemacs/src/select-x.c-dist 2007-02-15 01:49:41.000000000 +0100
+++ xemacs/src/select-x.c 2007-02-15 03:09:54.000000000 +0100
@@ -1072,7 +1074,13 @@ x_get_window_property (Display *display,
reading it. Deal with that, I guess....
*/
if (result != Success) break;
- *actual_size_ret *= *actual_format_ret / 8;
+ /* What a mess, XGetWindowProperty() returns "long" array on LP64
+ even if format == 32...
+ */
+ if (sizeof(long) == 8 && *actual_format_ret == 32)
+ *actual_size_ret *= 8;
+ else
+ *actual_size_ret *= *actual_format_ret / 8;
memcpy ((*data_ret) + offset, tmp_data, *actual_size_ret);
offset += *actual_size_ret;
XFree ((char *) tmp_data);

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 14 19:32:36 CET 2007 - mfabian@suse.de
- Bugzilla #244613: Fix cut & paste problems on 64 bit platforms
by using XGetWindowProperty() correctly.
-------------------------------------------------------------------
Mon Sep 25 18:43:30 CEST 2006 - mfabian@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package xemacs (Version 21.5.27.20060705)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -24,14 +24,14 @@ BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ krb5 libpng-devel
%define xlibraries /usr/X11R6/%{_lib}
%endif
URL: http://www.xemacs.org
License: GPL
License: GNU General Public License (GPL)
Group: Productivity/Editors/Emacs
Obsoletes: xe_exec
Prereq: permissions
Requires: xemacs-info xemacs-packages ctags
Autoreqprov: on
Version: 21.5.27.20060705
Release: 8
Release: 40
Summary: XEmacs
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Howto get the cvs tree of XEmacs:
@ -71,6 +71,7 @@ Patch33: set-locale-to-c-when-not-supported-by-x.patch
Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch
Patch38: unitialized-variables.patch
Patch40: cast-pointer-integer-different-size.patch
Patch41: bugzilla-244613-cut-paste-64bit-non-ascii.patch
%description
This is the current version of XEmacs, formerly known as Lucid-Emacs.
@ -157,6 +158,7 @@ Authors:
#%patch34 -p1
%patch38 -p1
%patch40 -p1
%patch41 -p1
%patch0 -p1
find lisp/ etc/ -name '*.elc' | xargs -r rm -f
%ifarch ia64
@ -553,7 +555,10 @@ mv $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop.new $RPM_BUILD_ROOT/usr
%dir /usr/share/xemacs/site-packages/lisp/
%dir /usr/share/xemacs/site-packages/lisp/term/
%changelog -n xemacs
%changelog
* Wed Feb 14 2007 - mfabian@suse.de
- Bugzilla #244613: Fix cut & paste problems on 64 bit platforms
by using XGetWindowProperty() correctly.
* Mon Sep 25 2006 - mfabian@suse.de
- Bugzilla #207941: add "texinfo" to BuildRequires.
* Mon Aug 07 2006 - mfabian@suse.de