Hello community, here is the log from the commit of package libXaw3d for openSUSE:Factory checked in at 2018-07-04 23:47:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXaw3d (Old) and /work/SRC/openSUSE:Factory/.libXaw3d.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXaw3d" Wed Jul 4 23:47:55 2018 rev:6 rq:617712 version:1.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libXaw3d/libXaw3d.changes 2014-10-07 18:23:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXaw3d.new/libXaw3d.changes 2018-07-04 23:47:58.612366485 +0200 @@ -1,0 +2,30 @@ +Tue Jun 19 10:32:17 UTC 2018 - [email protected] + +- Update to new upstream release 1.6.3 + * Avoid using dead pointer in _XawTextSetSelection + * Fix copied from 2D libXaw commit 11c3a104141e1a4946ad949dfb5514df0b66a031 + * autogen: add default patch prefix + * autogen.sh: use quoted string variables + * Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + * autogen.sh: use exec instead of waiting for configure to finish + * Syncs the invocation of configure with the one from the server. + * darwin: Remove incorrect export of vendorShellClassRec and vendorShellWidgetClass + * Get rid of some extraneous ; at the end of C source lines + * Use SEEK_* names instead of raw numbers for fseek whence argument + * Just use C89 size_t instead of rolling our own Size_t & Off_t + * Fix abs() usage. + * For long arguments, use labs(). + * autogen.sh: Honor NOCONFIGURE=1 + * configure: Drop AM_MAINTAINER_MODE + * Remove support for pre-C89 headers (unifdef -UX_NOT_STDC_ENV) + * Replace TXT16 with XChar2b inline + * No longer need #define to substitute it now that we no longer set + it to a different type on CRAY systems. + * Remove CRAY/WORD64 support (unifdef -UCRAY -UWORD64) + * Fix --disable-feature options in configure + * Make --disable-feature options passed to configure not enable + the feature but keep it disabled instead. +- Port our patches to new version + +------------------------------------------------------------------- Old: ---- libXaw3d-1.6.2.tar.bz2 New: ---- libXaw3d-1.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXaw3d.spec ++++++ --- /var/tmp/diff_new_pack.3ST2p0/_old 2018-07-04 23:47:59.156365883 +0200 +++ /var/tmp/diff_new_pack.3ST2p0/_new 2018-07-04 23:47:59.156365883 +0200 @@ -1,7 +1,7 @@ # # spec file for package libXaw3d # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libXaw3d -Version: 1.6.2 +Version: 1.6.3 Release: 0 Summary: The 3D Athena Widget Set License: MIT @@ -132,7 +132,13 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1 +%patch1 -p1 -b .p1 +%patch2 -p1 -b .p2 +%patch3 -p1 -b .p3 +%patch4 -p1 -b .p4 +%patch5 -p1 -b .p5 +%patch6 -p1 -b .p6 +%patch7 -p1 -b .p7 %build autoreconf -fi ++++++ libXaw3d-1.6.2.tar.bz2 -> libXaw3d-1.6.3.tar.bz2 ++++++ ++++ 41510 lines of diff (skipped) ++++++ xaw3d-3dlabel.patch ++++++ --- /var/tmp/diff_new_pack.3ST2p0/_old 2018-07-04 23:47:59.600365391 +0200 +++ /var/tmp/diff_new_pack.3ST2p0/_new 2018-07-04 23:47:59.600365391 +0200 @@ -1,12 +1,10 @@ --- - src/Label.c | 65 +++++++++++++++++++++++++++++++++++++++++------------------- + libXaw3d-1.6.3/src/Label.c | 65 +++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 20 deletions(-) -Index: libXaw3d-1.6.2/src/Label.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/Label.c -+++ libXaw3d-1.6.2/src/Label.c -@@ -418,9 +418,16 @@ GetgrayGC(LabelWidget lw) +--- libXaw3d-1.6.3/src/Label.c ++++ libXaw3d-1.6.3/src/Label.c 2018-06-19 10:22:20.542598480 +0000 +@@ -361,9 +361,16 @@ GetgrayGC(LabelWidget lw) static void compute_bitmap_offsets (LabelWidget lw) { @@ -26,7 +24,7 @@ lw->label.lbm_y = 0; } -@@ -446,9 +453,11 @@ Initialize(Widget request, Widget new, A +@@ -389,9 +396,11 @@ Initialize(Widget request, Widget new, A { LabelWidget lw = (LabelWidget) new; @@ -38,7 +36,7 @@ if (lw->label.label == NULL) lw->label.label = XtNewString(lw->core.name); -@@ -462,18 +471,20 @@ Initialize(Widget request, Widget new, A +@@ -405,18 +414,20 @@ Initialize(Widget request, Widget new, A if (lw->core.height == 0) lw->core.height = lw->label.label_height + @@ -63,7 +61,7 @@ lw->label.label_x = lw->label.label_y = 0; (*XtClass(new)->core_class.resize) ((Widget)lw); -@@ -551,14 +562,16 @@ Redisplay(Widget gw, XEvent *event, Regi +@@ -494,14 +505,16 @@ Redisplay(Widget gw, XEvent *event, Regi if (w->label.depth == 1) XCopyPlane(XtDisplay(gw), pm, XtWindow(gw), gc, 0, 0, w->label.lbm_width, w->label.lbm_height, @@ -84,7 +82,7 @@ } #ifdef XAW_INTERNATIONALIZATION -@@ -648,14 +661,16 @@ _Reposition(LabelWidget lw, Dimension wi +@@ -591,14 +604,16 @@ _Reposition(LabelWidget lw, Dimension wi Position *dx, Position *dy) { Position newPos; @@ -103,7 +101,7 @@ break; case XtJustifyCenter: default: -@@ -747,17 +762,20 @@ SetValues(Widget current, Widget request +@@ -690,17 +705,20 @@ SetValues(Widget current, Widget request if (newlw->label.resize && was_resized) { if (curlw->core.height == reqlw->core.height && !checks[HEIGHT]) newlw->core.height = newlw->label.label_height + @@ -126,7 +124,7 @@ LEFT_OFFSET(newlw); /* req's label.lbm_width */ } -@@ -766,15 +784,20 @@ SetValues(Widget current, Widget request +@@ -709,15 +727,20 @@ SetValues(Widget current, Widget request if (checks[HEIGHT]) { if (newlw->label.label_height > newlw->label.lbm_height) i = newlw->label.label_height + @@ -151,7 +149,7 @@ if (i > newlw->core.width) newlw->core.width = i; } -@@ -845,9 +868,11 @@ QueryGeometry(Widget w, XtWidgetGeometry +@@ -788,9 +811,11 @@ QueryGeometry(Widget w, XtWidgetGeometry preferred->request_mode = CWWidth | CWHeight; preferred->width = (lw->label.label_width + 2 * lw->label.internal_width + ++++++ xaw3d-fontset.patch ++++++ --- /var/tmp/diff_new_pack.3ST2p0/_old 2018-07-04 23:47:59.612365378 +0200 +++ /var/tmp/diff_new_pack.3ST2p0/_new 2018-07-04 23:47:59.612365378 +0200 @@ -1,18 +1,16 @@ --- - src/AsciiSink.c | 2 ++ - src/Command.c | 2 ++ - src/Label.c | 11 ++++++++++- - src/List.c | 14 ++++++++++++-- - src/MultiSink.c | 33 ++++++++++++++++++++++++++------- - src/SmeBSB.c | 2 ++ - src/Tip.c | 16 ++++++++++++++-- - src/XawIm.c | 14 +++++++++----- + libXaw3d-1.6.3/src/AsciiSink.c | 2 ++ + libXaw3d-1.6.3/src/Command.c | 2 ++ + libXaw3d-1.6.3/src/Label.c | 11 ++++++++++- + libXaw3d-1.6.3/src/List.c | 14 ++++++++++++-- + libXaw3d-1.6.3/src/MultiSink.c | 33 ++++++++++++++++++++++++++------- + libXaw3d-1.6.3/src/SmeBSB.c | 2 ++ + libXaw3d-1.6.3/src/Tip.c | 16 ++++++++++++++-- + libXaw3d-1.6.3/src/XawIm.c | 14 +++++++++----- 8 files changed, 77 insertions(+), 17 deletions(-) -Index: libXaw3d-1.6.2/src/AsciiSink.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/AsciiSink.c -+++ libXaw3d-1.6.2/src/AsciiSink.c +--- libXaw3d-1.6.3/src/AsciiSink.c ++++ libXaw3d-1.6.3/src/AsciiSink.c 2018-06-19 10:22:54.985964432 +0000 @@ -513,6 +513,8 @@ Initialize(Widget request, Widget new, A { AsciiSinkObject sink = (AsciiSinkObject) new; @@ -22,10 +20,8 @@ GetGC(sink); sink->ascii_sink.insertCursorOn= CreateInsertCursor(XtScreenOfObject(new)); -Index: libXaw3d-1.6.2/src/Command.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/Command.c -+++ libXaw3d-1.6.2/src/Command.c +--- libXaw3d-1.6.3/src/Command.c ++++ libXaw3d-1.6.3/src/Command.c 2018-06-19 10:22:54.985964432 +0000 @@ -220,6 +220,8 @@ Initialize(Widget request, Widget new, A CommandWidget cbw = (CommandWidget) new; int shape_event_base, shape_error_base; @@ -35,11 +31,9 @@ if (cbw->command.shape_style != XawShapeRectangle && !XShapeQueryExtension(XtDisplay(new), &shape_event_base, &shape_error_base)) -Index: libXaw3d-1.6.2/src/Label.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/Label.c -+++ libXaw3d-1.6.2/src/Label.c -@@ -274,7 +274,10 @@ SetTextWidthAndHeight(LabelWidget lw) +--- libXaw3d-1.6.3/src/Label.c ++++ libXaw3d-1.6.3/src/Label.c 2018-06-19 10:22:54.985964432 +0000 +@@ -217,7 +217,10 @@ SetTextWidthAndHeight(LabelWidget lw) #ifdef XAW_INTERNATIONALIZATION if ( lw->simple.international == True ) { XFontSet fset = lw->label.fontset; @@ -51,7 +45,7 @@ lw->label.label_height = ext->max_ink_extent.height; if (lw->label.label == NULL) { -@@ -459,6 +462,12 @@ Initialize(Widget request, Widget new, A +@@ -402,6 +405,12 @@ Initialize(Widget request, Widget new, A lw->threeD.shadow_width = 0; #endif @@ -64,10 +58,8 @@ if (lw->label.label == NULL) lw->label.label = XtNewString(lw->core.name); else -Index: libXaw3d-1.6.2/src/List.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/List.c -+++ libXaw3d-1.6.2/src/List.c +--- libXaw3d-1.6.3/src/List.c ++++ libXaw3d-1.6.3/src/List.c 2018-06-19 10:22:54.985964432 +0000 @@ -362,6 +362,12 @@ Initialize(Widget junk, Widget new, ArgL { ListWidget lw = (ListWidget) new; @@ -103,10 +95,8 @@ #endif /* If the request height/width is different, lock it. Unless its 0. If */ -Index: libXaw3d-1.6.2/src/MultiSink.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/MultiSink.c -+++ libXaw3d-1.6.2/src/MultiSink.c +--- libXaw3d-1.6.3/src/MultiSink.c ++++ libXaw3d-1.6.3/src/MultiSink.c 2018-06-19 10:22:54.985964432 +0000 @@ -252,7 +252,9 @@ PaintText(Widget w, GC gc, Position x, P XFontSet fontset = sink->multi_sink.fontset; Position max_x; @@ -198,11 +188,9 @@ _XawTextPosToXY( w, pos, x, y ); *y += abs( ext->max_logical_extent.y ); -Index: libXaw3d-1.6.2/src/SmeBSB.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/SmeBSB.c -+++ libXaw3d-1.6.2/src/SmeBSB.c -@@ -208,6 +208,8 @@ Initialize(Widget request, Widget new, A +--- libXaw3d-1.6.3/src/SmeBSB.c ++++ libXaw3d-1.6.3/src/SmeBSB.c 2018-06-19 10:22:54.985964432 +0000 +@@ -204,6 +204,8 @@ Initialize(Widget request, Widget new, A else entry->sme_bsb.label = XtNewString( entry->sme_bsb.label ); @@ -211,10 +199,8 @@ CreateGCs(new); GetBitmapInfo(new, TRUE); /* Left Bitmap Info */ -Index: libXaw3d-1.6.2/src/Tip.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/Tip.c -+++ libXaw3d-1.6.2/src/Tip.c +--- libXaw3d-1.6.3/src/Tip.c ++++ libXaw3d-1.6.3/src/Tip.c 2018-06-19 10:22:54.985964432 +0000 @@ -248,6 +248,12 @@ XawTipInitialize(Widget req, Widget w, A TipWidget tip = (TipWidget)w; XGCValues values; @@ -252,10 +238,8 @@ height = ext->max_ink_extent.height; if ((nl = index(label, '\n')) != NULL) { -Index: libXaw3d-1.6.2/src/XawIm.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/XawIm.c -+++ libXaw3d-1.6.2/src/XawIm.c +--- libXaw3d-1.6.3/src/XawIm.c ++++ libXaw3d-1.6.3/src/XawIm.c 2018-06-19 10:22:54.985964432 +0000 @@ -727,8 +727,10 @@ CreateIC(Widget w, XawVendorShellExtPart SetVaArg( &pe_a[pe_cnt], (XPointer) p->font_set); pe_cnt++; SetVaArg( &st_a[st_cnt], (XPointer) XNFontSet); st_cnt++; ++++++ xaw3d-secure.patch ++++++ --- /var/tmp/diff_new_pack.3ST2p0/_old 2018-07-04 23:47:59.620365369 +0200 +++ /var/tmp/diff_new_pack.3ST2p0/_new 2018-07-04 23:47:59.624365365 +0200 @@ -1,22 +1,20 @@ --- - include/X11/Xaw3d/AsciiSrcP.h | 6 ++- - include/X11/Xaw3d/MultiSrcP.h | 6 ++- - src/Layout.c | 18 ++++++++-- - src/MenuButton.c | 15 +++++++- - src/Simple.c | 18 +++++++--- - src/SimpleMenu.c | 16 +++++++-- - src/SmeBSB.c | 51 +++++++++++++++++++----------- - src/Text.c | 50 +++++++++++++++++++++-------- - src/TextPop.c | 71 +++++++++++++++++++++++++++++++++++------- - src/XawAlloc.h | 10 +++++ - src/XawI18n.h | 2 + - src/XawIm.c | 4 +- - 12 files changed, 206 insertions(+), 61 deletions(-) + libXaw3d-1.6.3/include/X11/Xaw3d/AsciiSrcP.h | 6 +- + libXaw3d-1.6.3/include/X11/Xaw3d/MultiSrcP.h | 6 +- + libXaw3d-1.6.3/src/Layout.c | 18 +++++- + libXaw3d-1.6.3/src/MenuButton.c | 15 ++++- + libXaw3d-1.6.3/src/Simple.c | 18 ++++-- + libXaw3d-1.6.3/src/SimpleMenu.c | 16 ++++-- + libXaw3d-1.6.3/src/SmeBSB.c | 51 ++++++++++++------- + libXaw3d-1.6.3/src/Text.c | 50 ++++++++++++++----- + libXaw3d-1.6.3/src/TextPop.c | 71 ++++++++++++++++++++++----- + libXaw3d-1.6.3/src/XawAlloc.h | 10 +++ + libXaw3d-1.6.3/src/XawI18n.h | 2 + libXaw3d-1.6.3/src/XawIm.c | 4 - + 12 files changed, 205 insertions(+), 62 deletions(-) -Index: libXaw3d-1.6.2/include/X11/Xaw3d/AsciiSrcP.h -=================================================================== ---- libXaw3d-1.6.2.orig/include/X11/Xaw3d/AsciiSrcP.h -+++ libXaw3d-1.6.2/include/X11/Xaw3d/AsciiSrcP.h +--- libXaw3d-1.6.3/include/X11/Xaw3d/AsciiSrcP.h ++++ libXaw3d-1.6.3/include/X11/Xaw3d/AsciiSrcP.h 2018-06-19 10:20:38.328453668 +0000 @@ -80,7 +80,11 @@ SOFTWARE. #ifdef L_tmpnam #define TMPSIZ L_tmpnam @@ -30,10 +28,8 @@ #endif #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ -Index: libXaw3d-1.6.2/include/X11/Xaw3d/MultiSrcP.h -=================================================================== ---- libXaw3d-1.6.2.orig/include/X11/Xaw3d/MultiSrcP.h -+++ libXaw3d-1.6.2/include/X11/Xaw3d/MultiSrcP.h +--- libXaw3d-1.6.3/include/X11/Xaw3d/MultiSrcP.h ++++ libXaw3d-1.6.3/include/X11/Xaw3d/MultiSrcP.h 2018-06-19 10:20:38.328453668 +0000 @@ -111,7 +111,11 @@ SOFTWARE. #ifdef L_tmpnam #define TMPSIZ L_tmpnam @@ -47,10 +43,8 @@ #endif #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ -Index: libXaw3d-1.6.2/src/Layout.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/Layout.c -+++ libXaw3d-1.6.2/src/Layout.c +--- libXaw3d-1.6.3/src/Layout.c ++++ libXaw3d-1.6.3/src/Layout.c 2018-06-19 10:20:38.328453668 +0000 @@ -40,6 +40,8 @@ # include <X11/Xaw3d/LayoutP.h> #endif @@ -83,10 +77,8 @@ return 0.0; } return Evaluate (l, box, nexpr, natural); -Index: libXaw3d-1.6.2/src/MenuButton.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/MenuButton.c -+++ libXaw3d-1.6.2/src/MenuButton.c +--- libXaw3d-1.6.3/src/MenuButton.c ++++ libXaw3d-1.6.3/src/MenuButton.c 2018-06-19 10:20:38.328453668 +0000 @@ -54,6 +54,8 @@ in this Software without prior written a #include <X11/Xaw3d/XawInit.h> #include <X11/Xaw3d/MenuButtoP.h> @@ -116,10 +108,8 @@ return; } if (!XtIsRealized(menu)) -Index: libXaw3d-1.6.2/src/Simple.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/Simple.c -+++ libXaw3d-1.6.2/src/Simple.c +--- libXaw3d-1.6.3/src/Simple.c ++++ libXaw3d-1.6.3/src/Simple.c 2018-06-19 10:20:38.328453668 +0000 @@ -57,6 +57,8 @@ SOFTWARE. #include <X11/Xaw3d/SimpleP.h> #include <X11/Xmu/Drawing.h> @@ -152,10 +142,8 @@ c->simple_class.change_sensitive = ChangeSensitive; } -Index: libXaw3d-1.6.2/src/SimpleMenu.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/SimpleMenu.c -+++ libXaw3d-1.6.2/src/SimpleMenu.c +--- libXaw3d-1.6.3/src/SimpleMenu.c ++++ libXaw3d-1.6.3/src/SimpleMenu.c 2018-06-19 10:20:38.328453668 +0000 @@ -52,6 +52,8 @@ in this Software without prior written a #include <X11/Xmu/Initer.h> #include <X11/Xmu/CharSet.h> @@ -186,10 +174,8 @@ return; } -Index: libXaw3d-1.6.2/src/SmeBSB.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/SmeBSB.c -+++ libXaw3d-1.6.2/src/SmeBSB.c +--- libXaw3d-1.6.3/src/SmeBSB.c ++++ libXaw3d-1.6.3/src/SmeBSB.c 2018-06-19 10:21:23.555635775 +0000 @@ -52,6 +52,7 @@ in this Software without prior written a #include <X11/Xaw3d/SmeBSBP.h> #include <X11/Xaw3d/Cardinals.h> @@ -197,8 +183,8 @@ +#include "XawAlloc.h" /* needed for abs() */ - #ifndef X_NOT_STDC_ENV -@@ -700,6 +701,8 @@ GetBitmapInfo(Widget w, Boolean is_left) + #include <stdlib.h> +@@ -696,6 +697,8 @@ GetBitmapInfo(Widget w, Boolean is_left) int x, y; unsigned int width, height, bw; char buf[BUFSIZ]; @@ -207,7 +193,7 @@ if (is_left) { width = height = 0; -@@ -708,18 +711,24 @@ GetBitmapInfo(Widget w, Boolean is_left) +@@ -704,18 +707,24 @@ GetBitmapInfo(Widget w, Boolean is_left) if (!XGetGeometry(XtDisplayOfObject(w), entry->sme_bsb.left_bitmap, &root, &x, &y, &width, &height, &bw, &entry->sme_bsb.left_depth)) { @@ -241,7 +227,7 @@ } #endif } -@@ -733,18 +742,24 @@ GetBitmapInfo(Widget w, Boolean is_left) +@@ -729,18 +738,24 @@ GetBitmapInfo(Widget w, Boolean is_left) if (!XGetGeometry(XtDisplayOfObject(w), entry->sme_bsb.right_bitmap, &root, &x, &y, &width, &height, &bw, &entry->sme_bsb.right_depth)) { @@ -275,10 +261,8 @@ } #endif } -Index: libXaw3d-1.6.2/src/Text.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/Text.c -+++ libXaw3d-1.6.2/src/Text.c +--- libXaw3d-1.6.3/src/Text.c ++++ libXaw3d-1.6.3/src/Text.c 2018-06-19 10:20:38.332453596 +0000 @@ -78,6 +78,8 @@ SOFTWARE. #include <X11/Xfuncs.h> #include <ctype.h> /* for isprint() */ @@ -361,20 +345,18 @@ ctx->text.scroll_horiz = XawtextScrollNever; } else if (ctx->text.scroll_horiz == XawtextScrollAlways) -Index: libXaw3d-1.6.2/src/TextPop.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/TextPop.c -+++ libXaw3d-1.6.2/src/TextPop.c -@@ -68,6 +68,8 @@ in this Software without prior written a +--- libXaw3d-1.6.3/src/TextPop.c ++++ libXaw3d-1.6.3/src/TextPop.c 2018-06-19 10:21:11.395855679 +0000 +@@ -67,7 +67,7 @@ in this Software without prior written a + #include <stdio.h> #include <X11/Xos.h> /* for O_RDONLY */ #include <errno.h> - +- +#include "XawAlloc.h" -+ - #ifdef X_NOT_STDC_ENV - extern int errno; - #endif -@@ -789,6 +791,8 @@ static Boolean + + #define INSERT_FILE ("Enter Filename:") + +@@ -786,6 +786,8 @@ static Boolean DoSearch(struct SearchAndReplace * search) { char msg[BUFSIZ]; @@ -383,7 +365,7 @@ Widget tw = XtParent(search->search_popup); XawTextPosition pos; XawTextScanDirection dir; -@@ -815,9 +819,20 @@ DoSearch(struct SearchAndReplace * searc +@@ -812,9 +814,20 @@ DoSearch(struct SearchAndReplace * searc /* The Raw string in find.ptr may be WC I can't use here, so I re - call GetString to get a tame version. */ @@ -407,7 +389,7 @@ if (dir == XawsdRight) XawTextSetInsertionPoint( tw, pos + text.length); else -@@ -829,7 +844,8 @@ DoSearch(struct SearchAndReplace * searc +@@ -826,7 +839,8 @@ DoSearch(struct SearchAndReplace * searc } XawTextUnsetSelection(tw); @@ -417,7 +399,7 @@ return(FALSE); } -@@ -950,13 +966,26 @@ Replace(struct SearchAndReplace *search, +@@ -947,13 +961,26 @@ Replace(struct SearchAndReplace *search, if (new_pos == XawTextSearchError) { if (count == 0) { char msg[BUFSIZ]; @@ -447,7 +429,7 @@ return(FALSE); } else -@@ -979,9 +1008,22 @@ Replace(struct SearchAndReplace *search, +@@ -976,9 +1003,22 @@ Replace(struct SearchAndReplace *search, if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) { char msg[BUFSIZ]; @@ -472,7 +454,7 @@ return(FALSE); } -@@ -1122,13 +1164,20 @@ SetResourceByName(Widget shell, char *na +@@ -1119,13 +1159,20 @@ SetResourceByName(Widget shell, char *na { Widget temp_widget; char buf[BUFSIZ]; @@ -495,10 +477,8 @@ return(FALSE); } -Index: libXaw3d-1.6.2/src/XawAlloc.h -=================================================================== ---- /dev/null -+++ libXaw3d-1.6.2/src/XawAlloc.h +--- libXaw3d-1.6.3/src/XawAlloc.h ++++ libXaw3d-1.6.3/src/XawAlloc.h 2018-06-19 10:20:38.332453596 +0000 @@ -0,0 +1,10 @@ +/* $XFree86: xc/lib/Xaw/XawAlloc.h,v 1.1.2.1 1998/05/16 09:05:23 dawes Exp $ */ + @@ -510,10 +490,8 @@ +#define XtStackFree(pointer, stack_cache_array) \ + if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); else + -Index: libXaw3d-1.6.2/src/XawI18n.h -=================================================================== ---- libXaw3d-1.6.2.orig/src/XawI18n.h -+++ libXaw3d-1.6.2/src/XawI18n.h +--- libXaw3d-1.6.3/src/XawI18n.h ++++ libXaw3d-1.6.3/src/XawI18n.h 2018-06-19 10:20:38.332453596 +0000 @@ -28,12 +28,14 @@ in this Software without prior written a #ifdef HAVE_WCTYPE_H #include <wctype.h> @@ -529,10 +507,8 @@ #ifdef HAVE_WCHAR_H #include <wchar.h> -Index: libXaw3d-1.6.2/src/XawIm.c -=================================================================== ---- libXaw3d-1.6.2.orig/src/XawIm.c -+++ libXaw3d-1.6.2/src/XawIm.c +--- libXaw3d-1.6.3/src/XawIm.c ++++ libXaw3d-1.6.3/src/XawIm.c 2018-06-19 10:20:38.332453596 +0000 @@ -1519,10 +1519,10 @@ _XawImWcLookupString( if ((vw = SearchVendorShell(inwidg)) && (ve = GetExtPart(vw)) &&
