rpms/lesstif/F-7 lesstif-0.95.0-XxxxProperty-64bit.patch, 1.1, 1.2 lesstif.spec, 1.12, 1.13
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Sun Sep 16 16:48:21 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/lesstif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30444/F-7
Modified Files:
lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec
Log Message:
* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
lesstif-0.95.0-XxxxProperty-64bit.patch:
Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif-0.95.0-XxxxProperty-64bit.patch 2 Sep 2007 20:49:12 -0000 1.1
+++ lesstif-0.95.0-XxxxProperty-64bit.patch 16 Sep 2007 16:47:46 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c 2007-08-31 00:19:09.000000000 +0200
+diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit 2004-08-28 21:22:43.000000000 +0200
++++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c 2007-09-16 18:42:27.000000000 +0200
@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
XmClipboard * clip);
static void _XmClipboardDeleteFormat(Display *display, int id);
@@ -10,7 +10,7 @@
static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
static void _XmClipboardDeleteItem(Display *display, Window window,
XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
static int
@@ -38,7 +38,7 @@
alloc_size += alloc_incr;
switch (actual_format)
-@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
+@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
{
Window root;
Atom item;
@@ -49,16 +49,18 @@
root = DefaultRootWindow(display);
item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
+@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
case 32:
len >>= 2;
nunits = transferlen;
+ /* XChangeProperty expects a buffer of longs when receiving 32 bits
+ data, MEUHH */
+ if (sizeof(long) != 4)
++ {
+ convert_buf = XtMalloc(len * sizeof(long));
-+ for (i = 0; i < len; i++)
-+ convert_buf[i] = data[i];
++ for (i = 0; i < len; i++)
++ convert_buf[i] = data[i];
++ }
break;
case 16:
@@ -73,7 +75,7 @@
len -= tlen;
mode = PropModeAppend;
-@@ -1178,7 +1178,7 @@
+@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
}
else
{
@@ -82,10 +84,10 @@
ret = True;
}
-diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c 2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c 2007-09-01 15:54:50.000000000 +0200
-@@ -92,15 +92,28 @@
+diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
+--- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit 2004-08-28 21:25:46.000000000 +0200
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c 2007-09-16 18:41:04.000000000 +0200
+@@ -92,15 +92,28 @@ PROP_Initialize(void)
void
PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
{
@@ -119,7 +121,7 @@
XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
32, PropModeReplace,
-@@ -129,7 +142,18 @@
+@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
int actual_format, ret;
Atom actual_type;
unsigned long nitems, bytesafter;
@@ -139,7 +141,7 @@
if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@
+@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
(unsigned char **)&info) == Success)
{
if (nitems > 0 && info)
@@ -148,7 +150,7 @@
else
ret = 0;
XFree((char *)info);
-@@ -284,7 +308,21 @@
+@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
{
if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lesstif.spec 2 Sep 2007 20:51:12 -0000 1.12
+++ lesstif.spec 16 Sep 2007 16:47:46 -0000 1.13
@@ -1,7 +1,7 @@
Summary: OSF/Motif(R) library clone
Name: lesstif
Version: 0.95.0
-Release: 19%{?dist}
+Release: 20%{?dist}
License: LGPLv2+
# in Xm-2.1/
# some files are MIT
@@ -147,7 +147,7 @@
%patch6 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
+%patch10 -p1 -b .XxxxProperty-64bit
%patch11 -p1
%patch12 -p1
%patch13 -p1
@@ -305,6 +305,9 @@
%changelog
+* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
+- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
+
* Sat Sep 1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
More information about the fedora-extras-commits
mailing list