rpms/openmotif/devel openMotif-2.3.0-overrun.patch, NONE, 1.1 openMotif-2.2.3-text_paste.patch, 1.1, 1.2 openmotif.spec, 1.43, 1.44
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jun 6 11:05:29 UTC 2006
Author: twoerner
Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22873
Modified Files:
openMotif-2.2.3-text_paste.patch openmotif.spec
Added Files:
openMotif-2.3.0-overrun.patch
Log Message:
[tw]
- new CVS version 2006-06-06
- new buildprereq for pkgconfig
openMotif-2.3.0-overrun.patch:
List.c | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
--- NEW FILE openMotif-2.3.0-overrun.patch ---
--- openmotif-2.3.0/lib/Xm/List.c.overrun 2006-06-06 12:10:02.000000000 +0200
+++ openmotif-2.3.0/lib/Xm/List.c 2006-06-06 12:46:57.000000000 +0200
@@ -178,7 +178,8 @@
Dimension old_max_height);
static void ResetExtents(XmListWidget lw,
Boolean recache_extents);
-static void FixStartEnd(int pos, int count, int *start, int *end);
+static void FixStartEnd(XmListWidget lw,
+ int pos, int count, int *start, int *end);
static int AddInternalElements(XmListWidget lw,
XmString *items,
int nitems,
@@ -3122,7 +3123,8 @@
************************************************************************/
static void
-FixStartEnd(int pos,
+FixStartEnd(XmListWidget lw,
+ int pos,
int count,
int *start,
int *end)
@@ -3135,6 +3137,11 @@
*end = save;
}
+ if (*start < 0)
+ *start = 0;
+ if (*end >= lw->list.itemCount)
+ *end = lw->list.itemCount - 1;
+
/* No overlap, before the deleted range. */
if (*end < pos)
return;
@@ -3290,8 +3297,8 @@
/* BEGIN OSF Fix CR 4656 */
/* Fix selection delimiters. */
- FixStartEnd(curpos, count, &lw->list.StartItem, &lw->list.EndItem);
- FixStartEnd(curpos, count, &lw->list.OldStartItem, &lw->list.OldEndItem);
+ FixStartEnd(lw, curpos, count, &lw->list.StartItem, &lw->list.EndItem);
+ FixStartEnd(lw, curpos, count, &lw->list.OldStartItem, &lw->list.OldEndItem);
/* END OSF Fix CR 4656 */
if (lw->list.itemCount)
@@ -3363,10 +3370,11 @@
/* BEGIN OSF Fix CR 4656 */
/* Fix selection delimiters. */
- FixStartEnd(item_pos, 1, &lw->list.StartItem, &lw->list.EndItem);
+ FixStartEnd(lw,
+ item_pos, 1, &lw->list.StartItem, &lw->list.EndItem);
/* Fix old selection delimiters. */
- FixStartEnd(item_pos, 1,
+ FixStartEnd(lw, item_pos, 1,
&lw->list.OldStartItem,
&lw->list.OldEndItem);
/* END OSF Fix CR 4656 */
@@ -3380,9 +3388,9 @@
*/
if (oldItemCount > lw->list.itemCount)
{
- FixStartEnd(lw->list.itemCount, oldItemCount - lw->list.itemCount,
+ FixStartEnd(lw, lw->list.itemCount, oldItemCount - lw->list.itemCount,
&lw->list.StartItem, &lw->list.EndItem);
- FixStartEnd(lw->list.itemCount, oldItemCount - lw->list.itemCount,
+ FixStartEnd(lw, lw->list.itemCount, oldItemCount - lw->list.itemCount,
&lw->list.OldStartItem, &lw->list.OldEndItem);
}
@@ -5079,9 +5087,10 @@
*
****************/
i = MIN(lw->list.OldStartItem, lw->list.OldEndItem);
+ i = MAX(i, 0);
j = MAX(lw->list.OldStartItem, lw->list.OldEndItem);
if ((i != 0) || (j != 0))
- for (; i <= j; i++)
+ for (; i <= j && i < lw->list.itemCount; i++)
lw->list.InternalList[i]->last_selected =
lw->list.InternalList[i]->selected;
@@ -5227,9 +5236,10 @@
*
****************/
i = MIN(lw->list.OldStartItem, lw->list.OldEndItem);
+ i = MAX(i, 0);
j = MAX(lw->list.OldStartItem, lw->list.OldEndItem);
if ((i != 0) || (j != 0))
- for (; i <= j; i++)
+ for (; i <= j && i < lw->list.itemCount; i++)
lw->list.InternalList[i]->last_selected =
lw->list.InternalList[i]->selected;
@@ -5597,6 +5607,9 @@
item = lw->list.LastHLItem;
lw->list.DidSelection = TRUE;
+ if (item < 0 || item >= lw->list.itemCount)
+ return;
+
/* If there's a drag timeout, remove it so we don't see two selections. */
if (lw->list.DragID)
{
@@ -7013,8 +7026,8 @@
{
item = WhichItem(lw, event->xbutton.y);
if (item > 0)
- item -=lw->list.top_position;
- if ((item < 0) || (item > lw->list.itemCount))
+ item -= lw->list.top_position;
+ if ((item < 0) || (item >= lw->list.itemCount))
return;
}
else
@@ -8217,7 +8230,7 @@
/************************************************************************
* *
- * XmDeletePos - delete the item at the specified position from the *
+ * XmListDeletePos - delete the item at the specified position from the *
* list. *
* *
************************************************************************/
@@ -8240,7 +8253,7 @@
/************************************************************************
* *
- * XmDeleteItemsPos - delete the items at the specified position *
+ * XmListDeleteItemsPos - delete the items at the specified position *
* from the list. *
* *
************************************************************************/
@@ -8997,7 +9010,7 @@
/************************************************************************
* *
- * XmDeselectAllItems - hose the entire selected list *
+ * XmListDeselectAllItems - hose the entire selected list *
* *
************************************************************************/
openMotif-2.2.3-text_paste.patch:
TextF.c | 14 +++++++++-----
TextFSel.c | 6 ++++--
2 files changed, 13 insertions(+), 7 deletions(-)
Index: openMotif-2.2.3-text_paste.patch
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openMotif-2.2.3-text_paste.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openMotif-2.2.3-text_paste.patch 2 Feb 2006 16:57:34 -0000 1.1
+++ openMotif-2.2.3-text_paste.patch 6 Jun 2006 11:05:24 -0000 1.2
@@ -1,6 +1,6 @@
--- openMotif-2.2.3/lib/Xm/TextFSel.c.text_paste 2002-01-31 15:49:36.000000000 +0100
-+++ openMotif-2.2.3/lib/Xm/TextFSel.c 2006-02-01 16:28:00.000000000 +0100
-@@ -1097,10 +1097,10 @@
++++ openMotif-2.2.3/lib/Xm/TextFSel.c 2006-03-29 17:06:36.000000000 +0200
+@@ -1097,13 +1097,14 @@
wchar_t * wc_value;
wc_value = (wchar_t*)XtMalloc ((unsigned)
@@ -8,13 +8,25 @@
+ ((ds->length + 1) * sizeof(wchar_t)));
_XmProcessLock();
prim_select->num_chars = mbstowcs(wc_value, (char *) ds->value,
-- (size_t) ds->length);
-+ (size_t) ds->length + 1);
+ (size_t) ds->length);
if (prim_select->num_chars < 0)
prim_select->num_chars = 0;
- else
---- openMotif-2.2.3/lib/Xm/TextF.c.text_paste 2006-01-30 17:31:22.000000000 +0100
-+++ openMotif-2.2.3/lib/Xm/TextF.c 2006-02-01 18:01:24.000000000 +0100
+- else
++ else {
++ wc_value[prim_select->num_chars] = 0;
+ replace_res =
+ _XmTextFieldReplaceText(tf, ds->event,
+ replace_from,
+@@ -1111,6 +1112,7 @@
+ (char*)wc_value,
+ prim_select->num_chars,
+ ds->selection == atoms[XmACLIPBOARD]);
++ }
+ _XmProcessUnlock();
+ XtFree((char*)wc_value);
+ }
+--- openMotif-2.2.3/lib/Xm/TextF.c.text_paste 2006-03-29 17:06:36.000000000 +0200
++++ openMotif-2.2.3/lib/Xm/TextF.c 2006-03-29 17:06:36.000000000 +0200
@@ -2886,7 +2886,8 @@
int free_insert = (int)False;
char *insert_orig;
Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- openmotif.spec 11 Feb 2006 04:50:26 -0000 1.43
+++ openmotif.spec 6 Jun 2006 11:05:24 -0000 1.44
@@ -4,42 +4,31 @@
Summary: Open Motif runtime libraries and executables.
Name: openmotif
Version: 2.3.0
-Release: 0.1.9.2
+Release: 0.2
License: Open Group Public License
Group: System Environment/Libraries
#Source: %{intern_name}-%{version}.tar.gz
-Source: openmotif-2.3.0beta1-src.tar.gz
+Source: openmotif-2.3.0-20060606.tar.gz
Source1: xmbind
URL: http://www.motifzone.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: /usr/share/X11/XKeysymDB
BuildPrereq: flex
-BuildPrereq: byacc
+BuildPrereq: byacc, pkgconfig
BuildRequires: libjpeg-devel libpng-devel
BuildRequires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel
BuildRequires: xorg-x11-xbitmaps
BuildRequires: perl
-Patch0: openmotif-2.3.0-CVS-2006-02-02.patch
Patch22: openMotif-2.3.0-no_demos.patch
Patch23: openMotif-2.2.3-uil_lib.patch
-Patch32: openMotif-2.3.0-CAN-2004-0914.patch
-Patch33: openMotif-2.2.3-CAN-2004-0914_autofoo.patch
-Patch34: openMotif-2.2.3-tmpnam.patch
-Patch35: openmotif-2.2.3-CAN-2004-0914_sec8.patch
-Patch36: openMotif-2.2.3-vizcount.patch
-Patch37: openMotif-2.2.3-long64.patch
-Patch38: openMotif-2.3.0-multiscreen.patch
-Patch41: openMotif-2.2.3-CAN-2005-0605.patch
-Patch42: openMotif-2.2.3-mrm.patch
Patch43: openMotif-2.3.0-rgbtxt.patch
Patch44: openMotif-2.3.0-xft-config.patch
Patch45: openMotif-2.3.0-mwmrc_dir.patch
Patch46: openMotif-2.3.0-bindings.patch
Patch47: openMotif-2.3.0-no_X11R6.patch
-Patch48: openMotif-2.2.3-CVE-2005-3964.patch
-Patch49: openMotif-2.2.3-overrun.patch
+Patch49: openMotif-2.3.0-overrun.patch
Patch50: openMotif-2.2.3-text_paste.patch
Conflicts: lesstif <= 0.92.32-6
@@ -65,27 +54,17 @@
%prep
%setup -q -n %{intern_name}-%{version}
-%patch0 -p1 -b .CVS-2006-02-02
%patch22 -p1 -b .no_demos
%patch23 -p1 -b .uil_lib
-#%patch32 -p1 -b .CAN-2004-0914
-#%patch33 -p1 -b .CAN-2004-0914_autofoo
-#%patch34 -p1 -b .tmpnam
-#%patch35 -p1 -b .CAN-2004-0914_sec8
-#%patch36 -p1 -b .vizcount
-#%patch37 -p1 -b .long64
-#%patch38 -p1 -b .multiscreen
-#%patch41 -p1 -b .CAN-2005-0605
-#%patch42 -p1 -b .mrm
%patch43 -p1 -b .rgbtxt
%patch44 -p1 -b .xft-config
%patch45 -p1 -b .mwmrc_dir
%patch46 -p1 -b .bindings
%patch47 -p1 -b .no_X11R6
-%patch48 -p1 -b .CVE-2005-3964
%patch49 -p1 -b .overrun
%patch50 -p1 -b .text_paste
+
for i in doc/man/man3/{XmColumn,XmDataField}.3; do
iconv -f windows-1252 -t utf-8 < "$i" > "${i}_"
mv "${i}_" "$i"
@@ -156,6 +135,10 @@
%{_datadir}/man/man5/*
%changelog
+* Tue Jun 6 2006 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.2
+- new CVS version 2006-06-06
+- new buildprereq for pkgconfig
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-0.1.9.2
- bump again for double-long bug on ppc(64)
More information about the fedora-cvs-commits
mailing list