Update to 1.6.1

2012-02-26 09:56:04 -07:00 · 2012-02-26 09:56:04 -07:00 · 162873899e
commit 162873899e
parent 40a0ae8196
19 changed files with 203 additions and 2294 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 Xaw3d-1.5E.tar.gz
+/libXaw3d-1.6.1.tar.bz2
--- a/Xaw3d-1.5-box.c.patch
+++ b/Xaw3d-1.5-box.c.patch
@ -6,8 +6,8 @@

@DPATCH@
 diff -urNad xaw3d-1.5+E~/lib/Xaw3d/Box.c xaw3d-1.5+E/lib/Xaw3d/Box.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/Box.c	1996-10-15 16:41:18.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Box.c	2007-04-24 15:28:39.000000000 +0200
+--- Xaw3d-1.5libXaw3d-1.6.1/src/Box.c	1996-10-15 16:41:18.000000000 +0200
+++ Xaw3d-1.5libXaw3d-1.6.1/src/Box.c	2007-04-24 15:28:39.000000000 +0200
@@ -353,8 +353,16 @@
 	else {
 	    width = preferred_width;
--- a/Xaw3d-1.5-debian-fixes.patch
+++ b/Xaw3d-1.5-debian-fixes.patch
@ -1,6 +1,6 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrc.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrc.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrc.c.debian	2000-11-27 14:19:36.000000000 +0100
+++ Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrc.c	2008-10-06 11:42:13.000000000 +0200
@@ -51,11 +51,17 @@ in this Software without prior written a
 #include <X11/Xaw3d/MultiSrcP.h> 
 #endif
@ -90,9 +90,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Ascii
 }
 
 static void
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h
--- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian	1996-10-15 16:41:18.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrcP.h.debian Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrcP.h
+--- Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrcP.h.debian	1996-10-15 16:41:18.000000000 +0200
+++ Xaw3d-1.5libXaw3d-1.6.1/src/AsciiSrcP.h	2008-10-06 11:42:13.000000000 +0200
@@ -85,7 +85,11 @@ SOFTWARE.
 #ifdef L_tmpnam
 #define TMPSIZ L_tmpnam
@ -106,9 +106,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/Asci
 #endif
 
 #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian	1996-10-15 16:41:20.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/MenuButton.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/MenuButton.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/MenuButton.c.debian	1996-10-15 16:41:20.000000000 +0200
+++ Xaw3d-1.5libXaw3d-1.6.1/src/MenuButton.c	2008-10-06 11:42:13.000000000 +0200
@@ -53,6 +53,8 @@ in this Software without prior written a
 #include <X11/Xaw3d/XawInit.h>
 #include <X11/Xaw3d/MenuButtoP.h>
@ -138,9 +138,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Men
     return;
   }
   if (!XtIsRealized(menu))
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian	2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrc.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrc.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrc.c.debian	2008-10-06 11:42:13.000000000 +0200
+++ Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrc.c	2008-10-06 11:42:13.000000000 +0200
@@ -74,6 +74,9 @@ in this Software without prior written a
 #include <stdio.h>
 #include <ctype.h>
@ -222,9 +222,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Multi
 #undef StrLen
 }
 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h
--- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian	1996-10-15 16:41:21.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrcP.h.debian Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrcP.h
+--- Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrcP.h.debian	1996-10-15 16:41:21.000000000 +0200
+++ Xaw3d-1.5libXaw3d-1.6.1/src/MultiSrcP.h	2008-10-06 11:42:13.000000000 +0200
@@ -113,7 +113,11 @@ SOFTWARE.
 #ifdef L_tmpnam
 #define TMPSIZ L_tmpnam
@ -238,9 +238,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/Mult
 #endif
 
 #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/Simple.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/Simple.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/Simple.c.debian	2000-11-27 14:19:36.000000000 +0100
+++ Xaw3d-1.5libXaw3d-1.6.1/src/Simple.c	2008-10-06 11:42:13.000000000 +0200
@@ -56,6 +56,8 @@ SOFTWARE.
 #include <X11/Xaw3d/SimpleP.h>
 #include <X11/Xmu/Drawing.h>
@ -273,9 +273,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Simple.
 	c->simple_class.change_sensitive = ChangeSensitive;
     }
 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian	2003-02-17 07:45:07.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/SimpleMenu.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/SimpleMenu.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/SimpleMenu.c.debian	2003-02-17 07:45:07.000000000 +0100
+++ Xaw3d-1.5libXaw3d-1.6.1/src/SimpleMenu.c	2008-10-06 11:42:13.000000000 +0200
@@ -51,6 +51,8 @@ in this Software without prior written a
 #include <X11/Xmu/Initer.h>
 #include <X11/Xmu/CharSet.h>
@ -306,9 +306,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Sim
     return;
   }
   
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian	2003-02-10 18:18:00.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/StripChart.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/StripChart.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/StripChart.c.debian	2003-02-10 18:18:00.000000000 +0100
+++ Xaw3d-1.5libXaw3d-1.6.1/src/StripChart.c	2008-10-06 11:42:13.000000000 +0200
@@ -315,7 +315,15 @@ XtIntervalId *id;		/* unused */
        if (w->strip_chart.points != NULL) {
 	   w->strip_chart.points[0].x = w->strip_chart.interval + s;
@ -326,9 +326,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Str
 		       CoordModePrevious);
        }
 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Text.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian	2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c	2008-10-06 11:43:16.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/Text.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/Text.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/Text.c.debian	2008-10-06 11:42:13.000000000 +0200
+++ Xaw3d-1.5libXaw3d-1.6.1/src/Text.c	2008-10-06 11:43:16.000000000 +0200
@@ -76,6 +76,8 @@ SOFTWARE.
 #include <ctype.h>		/* for isprint() */
 #include <stdlib.h>
@ -410,9 +410,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Text.c
       ctx->text.scroll_horiz = XawtextScrollNever;
     }
     else if (ctx->text.scroll_horiz == XawtextScrollAlways)
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c	2008-10-06 11:42:13.000000000 +0200
+diff -up Xaw3d-1.5libXaw3d-1.6.1/src/TextPop.c.debian Xaw3d-1.5libXaw3d-1.6.1/src/TextPop.c
+--- Xaw3d-1.5libXaw3d-1.6.1/src/TextPop.c.debian	2000-11-27 14:19:36.000000000 +0100
+++ Xaw3d-1.5libXaw3d-1.6.1/src/TextPop.c	2008-10-06 11:42:13.000000000 +0200
@@ -66,6 +66,8 @@ in this Software without prior written a
 #include <X11/Xos.h>		/* for O_RDONLY */
 #include <errno.h>
@ -543,9 +543,9 @@ diff -up Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/TextPo
   return(FALSE);
 }
 
-diff -up /dev/null Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h
+diff -up /dev/null Xaw3d-1.5libXaw3d-1.6.1/src/XawAlloc.h
 --- /dev/null	2008-10-06 08:37:32.418005377 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h	2008-10-06 11:42:13.000000000 +0200
+++ Xaw3d-1.5libXaw3d-1.6.1/src/XawAlloc.h	2008-10-06 11:42:13.000000000 +0200
@@ -0,0 +1,10 @@
 +/* $XFree86: xc/lib/Xaw/XawAlloc.h,v 1.1.2.1 1998/05/16 09:05:23 dawes Exp $ */
 +
@ -557,8 +557,8 @@ diff -up /dev/null Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h
 +#define XtStackFree(pointer, stack_cache_array) \
 +    if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); else
 +
--- xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c	2003-08-04 17:27:58.000000000 +0200
-+++ xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c	2003-08-07 15:02:39.000000000 +0200
+--- xaw3d-1.5libXaw3d-1.6.1/src/SmeBSB.c	2003-08-04 17:27:58.000000000 +0200
+++ xaw3d-1.5libXaw3d-1.6.1/src/SmeBSB.c	2003-08-07 15:02:39.000000000 +0200
@@ -52,6 +52,8 @@
 #include <X11/Xaw3d/Cardinals.h>
 #include <stdio.h>
--- a/Xaw3d-1.5E-cast.patch
+++ b/Xaw3d-1.5E-cast.patch
@ -7,10 +7,10 @@ Subject: [PATCH] Xaw3d-1.5E-cast.patch
 xc/lib/Xaw3d/Scrollbar.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-diff --git a/xc/lib/Xaw3d/Scrollbar.c b/xc/lib/Xaw3d/Scrollbar.c
+diff --git libXaw3d-1.6.1/src/Scrollbar.c libXaw3d-1.6.1/src/Scrollbar.c
 index 0566733..6ed1480 100644
--- a/xc/lib/Xaw3d/Scrollbar.c
-+++ b/xc/lib/Xaw3d/Scrollbar.c
+--- libXaw3d-1.6.1/src/Scrollbar.c
+++ libXaw3d-1.6.1/src/Scrollbar.c
@@ -1375,7 +1375,7 @@ static void NotifyThumb (w, event, params, num_params )
        the arrows. */
     top += 0.0001;
--- a/Xaw3d-1.5E-close-destroy-crash.patch
+++ b/Xaw3d-1.5E-close-destroy-crash.patch
@ -7,10 +7,10 @@ Subject: [PATCH] Xaw3d-1.5E-close-destroy-crash.patch
 xc/lib/Xaw3d/XawIm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-diff --git a/xc/lib/Xaw3d/XawIm.c b/xc/lib/Xaw3d/XawIm.c
+diff --git libXaw3d-1.6.1/src/XawIm.c libXaw3d-1.6.1/src/XawIm.c
 index ead7166..730c393 100644
--- a/xc/lib/Xaw3d/XawIm.c
-+++ b/xc/lib/Xaw3d/XawIm.c
+--- libXaw3d-1.6.1/src/XawIm.c
+++ libXaw3d-1.6.1/src/XawIm.c
@@ -331,12 +331,12 @@ static void DestroyAllIM( ve )
     /*
      * Close Input Method
--- a/Xaw3d-1.5E-compat.patch
+++ b/Xaw3d-1.5E-compat.patch
@ -10,10 +10,10 @@ Subject: [PATCH] Xaw3d-1.5E-compat.patch
 xc/lib/Xaw3d/Text.h    |    6 ++++++
 4 files changed, 21 insertions(+), 0 deletions(-)

-diff --git a/xc/lib/Xaw3d/Command.c b/xc/lib/Xaw3d/Command.c
+diff --git libXaw3d-1.6.1/src/Command.c libXaw3d-1.6.1/src/Command.c
 index 5fe16b6..6e04860 100644
--- a/xc/lib/Xaw3d/Command.c
-+++ b/xc/lib/Xaw3d/Command.c
+--- libXaw3d-1.6.1/src/Command.c
+++ libXaw3d-1.6.1/src/Command.c
@@ -91,6 +91,8 @@ static XtResource resources[] = {
    {XtNcornerRoundPercent, XtCCornerRoundPercent, XtRDimension,
         sizeof(Dimension), offset(command.corner_round), XtRImmediate,
@ -23,10 +23,10 @@ index 5fe16b6..6e04860 100644
    {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension),
       XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate,
       (XtPointer) 0}
-diff --git a/xc/lib/Xaw3d/Label.c b/xc/lib/Xaw3d/Label.c
+diff --git libXaw3d-1.6.1/src/Label.c libXaw3d-1.6.1/src/Label.c
 index 5fd2e32..8bda3a7 100644
--- a/xc/lib/Xaw3d/Label.c
-+++ b/xc/lib/Xaw3d/Label.c
+--- libXaw3d-1.6.1/src/Label.c
+++ libXaw3d-1.6.1/src/Label.c
@@ -113,6 +113,8 @@ static XtResource resources[] = {
 	offset(label.pixmap), XtRImmediate, (XtPointer)None},
     {XtNresize, XtCResize, XtRBoolean, sizeof(Boolean),
@ -36,10 +36,10 @@ index 5fd2e32..8bda3a7 100644
     {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension),
          XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate,
          (XtPointer)1}
-diff --git a/xc/lib/Xaw3d/Text.c b/xc/lib/Xaw3d/Text.c
+diff --git libXaw3d-1.6.1/src/Text.c libXaw3d-1.6.1/src/Text.c
 index baaba17..81ff472 100644
--- a/xc/lib/Xaw3d/Text.c
-+++ b/xc/lib/Xaw3d/Text.c
+--- libXaw3d-1.6.1/src/Text.c
+++ libXaw3d-1.6.1/src/Text.c
@@ -3527,6 +3527,17 @@ Widget w;
   return ((TextWidget)w)->text.source;
 }
@ -58,10 +58,10 @@ index baaba17..81ff472 100644
 void
 #if NeedFunctionPrototypes
 XawTextDisplayCaret (Widget w,
-diff --git a/xc/lib/Xaw3d/Text.h b/xc/lib/Xaw3d/Text.h
+diff --git libXaw3d-1.6.1/include/X11/Xaw3d/Text.h libXaw3d-1.6.1/include/X11/Xaw3d/Text.h
 index 9157927..d68f94e 100644
--- a/xc/lib/Xaw3d/Text.h
-+++ b/xc/lib/Xaw3d/Text.h
+--- libXaw3d-1.6.1/include/X11/Xaw3d/Text.h
+++ libXaw3d-1.6.1/include/X11/Xaw3d/Text.h
@@ -274,6 +274,12 @@ extern Widget XawTextGetSource(
 #endif
 );
--- a/Xaw3d-1.5E-fontset.patch
+++ b/Xaw3d-1.5E-fontset.patch
@ -1,106 +0,0 @@
-This is commit 762bcb8c50fd0256a545ad6ed2304403daca8081 from
-Markus Steinborn <gnugv_maintainer@yahoo.de> Xaw3d git repo, with
-the making a missing fontset abort changes removed, while keeping the
-checks for missing fonts as those can lead to NULL ptr dereferences.
-
-The checks for missing font sets is removed, because when the locale
-is set to a UTF-8 locale (default now a days on most Linux distributions),
-libXt will usually print:
-
-Warning: Missing charsets in String to FontSet conversion
-Warning: Unable to load any usable fontset
-
-When resolving any fontset string, and return a NULL fontset.
-For more details on this issue see:
-http://tracker.xemacs.org/XEmacs/its/issue650
-
-This however is not a fatal error (it means the default font set will be
-used, and that some characters of the entire unicode range may not render
-properly).
-
-The changes in the original commit made this a fatal error causing many
-programs, which worked fine before, to abort.
-
-Below is the header of the orignal patch for reference:
-
-From 762bcb8c50fd0256a545ad6ed2304403daca8081 Mon Sep 17 00:00:00 2001
-From: Markus Steinborn <gnugv_maintainer@yahoo.de>
-Date: Sat, 24 Apr 2010 16:54:35 +0200
-Subject: [PATCH] Xaw3d-1.5E-fontset.patch
-
---
- xc/lib/Xaw3d/AsciiSink.c |    2 ++
- xc/lib/Xaw3d/Command.c   |    2 ++
- xc/lib/Xaw3d/Label.c     |   11 ++++++++++-
- xc/lib/Xaw3d/List.c      |   14 ++++++++++++--
- xc/lib/Xaw3d/MultiSink.c |   34 ++++++++++++++++++++++++++--------
- xc/lib/Xaw3d/SmeBSB.c    |    2 ++
- xc/lib/Xaw3d/Tip.c       |   16 ++++++++++++++--
- xc/lib/Xaw3d/XawIm.c     |   14 +++++++++-----
- 8 files changed, 77 insertions(+), 18 deletions(-)
-
-diff --git a/xc/lib/Xaw3d/AsciiSink.c b/xc/lib/Xaw3d/AsciiSink.c
-index 2ebd952..a664db5 100644
--- a/xc/lib/Xaw3d/AsciiSink.c
-+++ b/xc/lib/Xaw3d/AsciiSink.c
-@@ -532,6 +532,8 @@ Cardinal *num_args;
- {
-     AsciiSinkObject sink = (AsciiSinkObject) new;
- 
-+    if (!sink->ascii_sink.font) XtError("Aborting: no font found\n");
-+
-     GetGC(sink);
-     
-     sink->ascii_sink.insertCursorOn= CreateInsertCursor(XtScreenOfObject(new));
-diff --git a/xc/lib/Xaw3d/Command.c b/xc/lib/Xaw3d/Command.c
-index 6e04860..9f22d78 100644
--- a/xc/lib/Xaw3d/Command.c
-+++ b/xc/lib/Xaw3d/Command.c
-@@ -215,6 +215,8 @@ Cardinal *num_args;		/* unused */
-   CommandWidget cbw = (CommandWidget) new;
-   int shape_event_base, shape_error_base;
- 
-+  if (!cbw->label.font) XtError("Aborting: no font found\n");
-+
-   if (cbw->command.shape_style != XawShapeRectangle
-       && !XShapeQueryExtension(XtDisplay(new), &shape_event_base, 
- 			       &shape_error_base))
-diff --git a/xc/lib/Xaw3d/List.c b/xc/lib/Xaw3d/List.c
-index 99faf31..e7d7d57 100644
--- a/xc/lib/Xaw3d/List.c
-+++ b/xc/lib/Xaw3d/List.c
-@@ -366,6 +366,8 @@ Cardinal *num_args;
- {
-     ListWidget lw = (ListWidget) new;
- 
-+    if (!lw->list.font) XtError("Aborting: no font found\n");
-+
- /* 
-  * Initialize all private resources.
-  */
-diff --git a/xc/lib/Xaw3d/SmeBSB.c b/xc/lib/Xaw3d/SmeBSB.c
-index abf811f..dbb39aa 100644
--- a/xc/lib/Xaw3d/SmeBSB.c
-+++ b/xc/lib/Xaw3d/SmeBSB.c
-@@ -203,6 +203,8 @@ Cardinal *num_args;
-     else
- 	entry->sme_bsb.label = XtNewString( entry->sme_bsb.label );
- 
-+    if (!entry->sme_bsb.font) XtError("Aborting: no font found\n");
-+
-     CreateGCs(new);
- 
-     GetBitmapInfo(new, TRUE);	/* Left Bitmap Info */
-diff --git a/xc/lib/Xaw3d/Tip.c b/xc/lib/Xaw3d/Tip.c
-index 888eeac..233cc8d 100644
--- a/xc/lib/Xaw3d/Tip.c
-+++ b/xc/lib/Xaw3d/Tip.c
-@@ -252,6 +252,8 @@ Cardinal *num_args;
-     TipWidget tip = (TipWidget)w;
-     XGCValues values;
- 
-+    if (!tip->tip.font) XtError("Aborting: no font found\n");
-+
-     tip->tip.timer = 0;
- 
-     values.foreground = tip->tip.foreground;
--- a/Xaw3d-1.5E-null.patch
+++ b/Xaw3d-1.5E-null.patch
@ -1,88 +0,0 @@
-From 3993a874007d8b99c4d9e55f10e556b2f90dc6a5 Mon Sep 17 00:00:00 2001
-From: Markus Steinborn <gnugv_maintainer@yahoo.de>
-Date: Sat, 24 Apr 2010 16:54:55 +0200
-Subject: [PATCH] Xaw3d-1.5E-null.patch
-
---
- xc/lib/Xaw3d/XawIm.c |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/xc/lib/Xaw3d/XawIm.c b/xc/lib/Xaw3d/XawIm.c
-index 0aeb9ac..2d6cf8d 100644
--- a/xc/lib/Xaw3d/XawIm.c
-+++ b/xc/lib/Xaw3d/XawIm.c
-@@ -674,7 +674,7 @@ static void SizeNegotiation(p, width, height)
-     SetVaArg( &ic_a[ic_cnt], (XPointer) NULL);
- 
-     if (ic_cnt > 0) {
-	XGetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]);
-+	XGetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], NULL);
- 	if (pe_attr) XFree(pe_attr);
- 	if (st_attr) XFree(st_attr);
- 	if (p->xic == NULL) {
-@@ -714,7 +714,7 @@ static void SizeNegotiation(p, width, height)
- 	    SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++;
- 	}
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) NULL);
-	XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]);
-+	XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], NULL);
- 	if (pe_attr) XFree(pe_attr);
- 	if (st_attr) XFree(st_attr);
- 	if (p->xic == NULL) {
-@@ -833,7 +833,7 @@ static void CreateIC( w, ve )
- 				   pe_a[4], pe_a[5], pe_a[6], pe_a[7], pe_a[8],
- 				   pe_a[9], pe_a[10], pe_a[11], pe_a[12],
- 				   pe_a[13], pe_a[14], pe_a[15], pe_a[16],
-				   pe_a[17], pe_a[18],  pe_a[19]);
-+				   pe_a[17], pe_a[18],  NULL);
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++;
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++;
-     }
-@@ -844,7 +844,7 @@ static void CreateIC( w, ve )
- 				   st_a[4], st_a[5], st_a[6], st_a[7], st_a[8],
- 				   st_a[9], st_a[10], st_a[11], st_a[12],
- 				   st_a[13], st_a[14], st_a[15], st_a[16],
-				   st_a[17], st_a[18],  st_a[19]);
-+				   st_a[17], st_a[18],  NULL);
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++;
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++;
-     }
-@@ -853,7 +853,7 @@ static void CreateIC( w, ve )
-     p->xic = XCreateIC(ve->im.xim, ic_a[0], ic_a[1], ic_a[2], ic_a[3],
- 		       ic_a[4], ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9],
- 		       ic_a[10], ic_a[11], ic_a[12], ic_a[13], ic_a[14],
-		       ic_a[15], ic_a[16], ic_a[17], ic_a[18], ic_a[19]);
-+		       ic_a[15], ic_a[16], ic_a[17], ic_a[18], NULL);
-     if (pe_attr) XtFree(pe_attr);
-     if (st_attr) XtFree(st_attr);
- 
-@@ -973,7 +973,7 @@ static void SetICValues( w, ve, focus )
- 				      pe_a[4], pe_a[5], pe_a[6], pe_a[7],
- 				      pe_a[8], pe_a[9], pe_a[10], pe_a[11],
- 				      pe_a[12], pe_a[13], pe_a[14], pe_a[15],
-				      pe_a[16], pe_a[17], pe_a[18],  pe_a[19]);
-+				      pe_a[16], pe_a[17], pe_a[18],  NULL);
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++;
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++;
-     }
-@@ -983,7 +983,7 @@ static void SetICValues( w, ve, focus )
- 				      st_a[4], st_a[5], st_a[6], st_a[7],
- 				      st_a[8], st_a[9], st_a[10], st_a[11],
- 				      st_a[12], st_a[13], st_a[14], st_a[15],
-				      st_a[16], st_a[17], st_a[18],  st_a[19]);
-+				      st_a[16], st_a[17], st_a[18],  NULL);
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++;
- 	SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++;
-     }
-@@ -996,7 +996,7 @@ static void SetICValues( w, ve, focus )
- 	XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4],
- 		     ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9], ic_a[10],
- 		     ic_a[11], ic_a[12], ic_a[13], ic_a[14], ic_a[15],
-		     ic_a[16], ic_a[17], ic_a[18], ic_a[19]);
-+		     ic_a[16], ic_a[17], ic_a[18], NULL);
- 	if (pe_attr) XtFree(pe_attr);
- 	if (st_attr) XtFree(st_attr);
-     }
-- 
-1.6.1
-
--- a/Xaw3d-1.5E-secure.patch
+++ b/Xaw3d-1.5E-secure.patch
@ -19,10 +19,10 @@ Subject: [PATCH] Xaw3d-1.5E-secure.patch
 12 files changed, 206 insertions(+), 61 deletions(-)
 create mode 100644 xc/lib/Xaw3d/XawAlloc.h

-diff --git a/xc/lib/Xaw3d/Layout.c b/xc/lib/Xaw3d/Layout.c
+diff --git libXaw3d-1.6.1/src/Layout.c libXaw3d-1.6.1/src/Layout.c
 index 44d391a..dd4b253 100644
--- a/xc/lib/Xaw3d/Layout.c
-+++ b/xc/lib/Xaw3d/Layout.c
+--- libXaw3d-1.6.1/src/Layout.c
+++ libXaw3d-1.6.1/src/Layout.c
@@ -39,6 +39,8 @@
 # include <X11/Xaw3d/LayoutP.h>
 #endif
@ -55,10 +55,10 @@ index 44d391a..dd4b253 100644
 	    return 0.0;
 	    }
 	return Evaluate (l, box, nexpr, natural);
-diff --git a/xc/lib/Xaw3d/XawI18n.h b/xc/lib/Xaw3d/XawI18n.h
+diff --git libXaw3d-1.6.1/src/XawI18n.h libXaw3d-1.6.1/src/XawI18n.h
 index 1b0ee5d..b0176bf 100644
--- a/xc/lib/Xaw3d/XawI18n.h
-+++ b/xc/lib/Xaw3d/XawI18n.h
+--- libXaw3d-1.6.1/src/XawI18n.h
+++ libXaw3d-1.6.1/src/XawI18n.h
@@ -29,11 +29,13 @@ in this Software without prior written authorization from the X Consortium.
 
 #ifdef HAS_WCTYPE_H
@ -73,10 +73,10 @@ index 1b0ee5d..b0176bf 100644
 
 #ifdef HAS_WCHAR_H
 #include <wchar.h>
-diff --git a/xc/lib/Xaw3d/XawIm.c b/xc/lib/Xaw3d/XawIm.c
+diff --git libXaw3d-1.6.1/src/XawIm.c libXaw3d-1.6.1/src/XawIm.c
 index 730c393..a5d0032 100644
--- a/xc/lib/Xaw3d/XawIm.c
-+++ b/xc/lib/Xaw3d/XawIm.c
+--- libXaw3d-1.6.1/src/XawIm.c
+++ libXaw3d-1.6.1/src/XawIm.c
@@ -1644,10 +1644,10 @@ _XawImWcLookupString( inwidg, event, buffer_return, bytes_buffer,
 
     if ((vw = SearchVendorShell(inwidg)) && (ve = GetExtPart(vw)) &&
--- a/Xaw3d-1.5E-thumb.patch
+++ b/Xaw3d-1.5E-thumb.patch
--- a/Xaw3d-1.5E-warnings.patch
+++ b/Xaw3d-1.5E-warnings.patch
@ -1,114 +0,0 @@
--- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c	2009-03-15 17:04:35.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/MultiSrc.c	2009-03-15 14:22:05.000000000 +0100
-@@ -77,6 +77,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <wchar.h>
- 
- /****************************************************************
-  *
--- Xaw3d-1.5E/xc/lib/Xaw3d/Panner.c	2000-11-27 14:19:24.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Panner.c	2009-03-15 13:50:40.000000000 +0100
-@@ -36,7 +36,7 @@
- #include <X11/Xmu/Misc.h>		/* for Min */
- #include <X11/Xmu/Drawing.h>
- #include <ctype.h>			/* for isascii() etc. */
-#include <math.h>			/* for atof() */
-+#include <stdlib.h>			/* for atof() */
- 
- extern Bool XmuDistinguishablePixels(); /* not defined in any Xmu headers */
- 
--- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c	2009-03-15 17:04:35.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Text.c	2009-03-15 13:54:10.000000000 +0100
-@@ -75,6 +75,7 @@
- #include <X11/Xfuncs.h>
- #include <ctype.h>		/* for isprint() */
- #include <stdlib.h>
-+#include <wchar.h>
- 
- #include "XawAlloc.h"
- 
--- Xaw3d-1.5E/xc/lib/Xaw3d/TextAction.c	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextAction.c	2009-03-15 14:19:27.000000000 +0100
-@@ -45,7 +45,9 @@
- #include "XawI18n.h"
- #endif
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
-+#include <wchar.h>
- 
- #define SrcScan                XawTextSourceScan
- #define FindDist               XawTextSinkFindDistance
--- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c	2009-03-15 17:04:35.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextPop.c	2009-03-15 14:19:44.000000000 +0100
-@@ -65,6 +65,7 @@
- #include <stdio.h>
- #include <X11/Xos.h>		/* for O_RDONLY */
- #include <errno.h>
-+#include <wchar.h>
- 
- #include "XawAlloc.h"
- 
--- Xaw3d-1.5E/xc/lib/Xaw3d/TextSrc.c	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextSrc.c	2009-03-15 14:19:13.000000000 +0100
-@@ -49,6 +49,7 @@
- #endif
- #include <stdio.h>
- #include <ctype.h>
-+#include <wchar.h>
- 
- /****************************************************************
-  *
--- Xaw3d-1.5E/xc/lib/Xaw3d/ThreeD.c	2003-02-11 12:41:56.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/ThreeD.c	2009-03-15 14:21:20.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <X11/Xaw3d/XawInit.h>
- #include <X11/Xaw3d/ThreeDP.h>
- #include <X11/Xosdefs.h>
-+#include <X11/Xmu/CharSet.h>
- 
- /* Initialization of defaults */
- 
--- Xaw3d-1.5E/xc/lib/Xaw3d/Tip.c	2003-03-09 01:31:49.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Tip.c	2009-03-15 14:21:36.000000000 +0100
-@@ -41,6 +41,7 @@
- #include <X11/Xmu/Converters.h>
- #include <X11/Xaw3d/TipP.h>
- #include <X11/Xaw3d/XawInit.h>
-+#include <stdlib.h>
- 
- #define	TIP_EVENT_MASK (ButtonPressMask	  |	\
- 			ButtonReleaseMask |	\
--- Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.c	1996-10-15 16:41:25.000000000 +0200
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/XawI18n.c	2009-03-15 14:23:11.000000000 +0100
-@@ -55,6 +55,7 @@
- 
- */
- 
-+#include <stdlib.h>
- #include <X11/IntrinsicP.h>
- #include "XawI18n.h"
- 
--- Xaw3d-1.5E/xc/lib/Xaw3d/XawIm.c	1998-04-21 15:42:02.000000000 +0200
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/XawIm.c	2009-03-15 14:22:41.000000000 +0100
-@@ -59,6 +59,7 @@
- #include <X11/Xos.h>
- #include <X11/Xfuncs.h>
- #include <X11/ShellP.h>
-+#include <X11/ResourceI.h>
- #include <X11/Xaw3d/TextP.h>
- #include <X11/Xaw3d/MultiSrc.h>
- #include <X11/Xaw3d/MultiSinkP.h>
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h~ Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h
--- Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h~	1996-10-15 16:41:26.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h	2009-03-15 17:18:04.000000000 +0100
-@@ -72,7 +72,4 @@ extern wchar_t _Xaw_atowc (
- 
- #ifndef HAS_ISW_FUNCS
- #include <ctype.h>
-#ifndef iswspace
-#define iswspace(c) (isascii(c) && isspace(toascii(c)))
-#endif
- #endif
--- a/Xaw3d-1.5E-xorg-imake.patch
+++ b/Xaw3d-1.5E-xorg-imake.patch
@ -1,35 +0,0 @@
--- Imakefile.config	2003-03-08 15:55:18.000000000 +0100
-+++ Imakefile	2005-01-20 14:48:55.630795072 +0100
-@@ -5,24 +5,24 @@
- XCOMM Build options. Have you read the README.XAW3D file yet?
- XCOMM
- XCOMM For color pixmaps, define MULTIPLANE_PIXMAPS:
-#undef MULTIPLANE_PIXMAPS
-+#define MULTIPLANE_PIXMAPS
- XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
- #define GRAY_BLKWHT_STIPPLES
- XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
-#undef ARROW_SCROLLBARS
-+#define ARROW_SCROLLBARS
- 
-#define DoNormalLib NormalLibXaw
-#define DoSharedLib SharedLibXaw
-#define DoDebugLib DebugLibXaw 
-#define DoProfileLib ProfileLibXaw 
-+#define DoNormalLib NormalLibXaw7
-+#define DoSharedLib SharedLibXaw7
-+#define DoDebugLib DebugLibXaw7 
-+#define DoProfileLib ProfileLibXaw7 
- #define HasSharedData YES
- #define LibName Xaw3d
-#define SoRev SOXAWREV
-+#define SoRev SOXAW7REV
- #define IncSubdir X11
- #define IncSubSubdir Xaw3d
- 
- XCOMM When building outside an X11 source tree:
-XCOMM EXTRA_INCLUDES = -I.
-+EXTRA_INCLUDES = -I.
- 
- #ifdef SharedXawReqs
- REQUIREDLIBS = SharedXawReqs
--- a/Xaw3d-1.6.1-3Dlabel.patch
+++ b/Xaw3d-1.6.1-3Dlabel.patch
@ -1,19 +1,9 @@
-From 282b0b2a42dec11a772be36f4b4aa70ae7fb6a0d Mon Sep 17 00:00:00 2001
-From: Markus Steinborn <gnugv_maintainer@yahoo.de>
-Date: Sat, 24 Apr 2010 16:54:15 +0200
-Subject: [PATCH] Xaw3d-1.5E-3Dlabel.patch
-
---
- xc/lib/Xaw3d/Label.c |   67 +++++++++++++++++++++++++++++++++++---------------
- 1 files changed, 47 insertions(+), 20 deletions(-)
-
-diff --git a/xc/lib/Xaw3d/Label.c b/xc/lib/Xaw3d/Label.c
-index 8bda3a7..c4e1ff9 100644
--- a/xc/lib/Xaw3d/Label.c
-+++ b/xc/lib/Xaw3d/Label.c
-@@ -422,9 +422,16 @@ static void GetgrayGC(lw)
- static void compute_bitmap_offsets (lw)
-     LabelWidget lw;
+diff -up libXaw3d-1.6.1/src/Label.c.3Dlabel libXaw3d-1.6.1/src/Label.c
+--- libXaw3d-1.6.1/src/Label.c.3Dlabel	2011-09-19 15:42:36.000000000 -0600
+++ libXaw3d-1.6.1/src/Label.c	2012-02-25 14:44:33.766774776 -0700
+@@ -416,9 +416,16 @@ GetgrayGC(LabelWidget lw)
+ static void
+ compute_bitmap_offsets (LabelWidget lw)
 {
 -    if (lw->label.lbm_height != 0)
 -	lw->label.lbm_y = (lw->core.height - lw->label.lbm_height) / 2;
@ -31,13 +21,8 @@ index 8bda3a7..c4e1ff9 100644
 	lw->label.lbm_y = 0;
 }
 
-@@ -450,12 +457,16 @@ static void Initialize(request, new, args, num_args)
-     ArgList args;
-     Cardinal *num_args;
+@@ -444,9 +451,11 @@ Initialize(Widget request, Widget new, A
 {
-+#if 0
-     extern WidgetClass commandWidgetClass;
-+#endif
     LabelWidget lw = (LabelWidget) new;
 
 +#if 0
@ -46,9 +31,9 @@ index 8bda3a7..c4e1ff9 100644
 	lw->threeD.shadow_width = 0;
 +#endif
 
-     if (lw->label.label == NULL) 
+     if (lw->label.label == NULL)
         lw->label.label = XtNewString(lw->core.name);
-@@ -469,18 +480,20 @@ static void Initialize(request, new, args, num_args)
+@@ -460,18 +469,20 @@ Initialize(Widget request, Widget new, A
 
     if (lw->core.height == 0)
 	lw->core.height = lw->label.label_height +
@ -73,7 +58,7 @@ index 8bda3a7..c4e1ff9 100644
 
     lw->label.label_x = lw->label.label_y = 0;
     (*XtClass(new)->core_class.resize) ((Widget)lw);
-@@ -559,14 +572,16 @@ static void Redisplay(gw, event, region)
+@@ -549,14 +560,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,
@ -94,13 +79,14 @@ index 8bda3a7..c4e1ff9 100644
 	}
 
 #ifdef XAW_INTERNATIONALIZATION
-@@ -657,14 +672,16 @@ static void _Reposition(lw, width, height, dx, dy)
-     Position *dx, *dy;
+@@ -646,14 +659,17 @@ _Reposition(LabelWidget lw, Dimension wi
+             Position *dx, Position *dy)
 {
     Position newPos;
 -    Position leftedge = lw->label.internal_width + LEFT_OFFSET(lw);
 +    Position leftedge = lw->label.internal_width + LEFT_OFFSET(lw) +
 +			lw->threeD.shadow_width;
+
 
     switch (lw->label.justify) {
 	case XtJustifyLeft:
@ -113,7 +99,7 @@ index 8bda3a7..c4e1ff9 100644
 	    break;
 	case XtJustifyCenter:
 	default:
-@@ -758,17 +775,20 @@ static Boolean SetValues(current, request, new, args, num_args)
+@@ -745,17 +761,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 +
@ -136,7 +122,7 @@ index 8bda3a7..c4e1ff9 100644
 				LEFT_OFFSET(newlw);  /* req's label.lbm_width */
     }
 
-@@ -777,15 +797,20 @@ static Boolean SetValues(current, request, new, args, num_args)
+@@ -764,15 +783,20 @@ SetValues(Widget current, Widget request
 	if (checks[HEIGHT]) {
 	    if (newlw->label.label_height > newlw->label.lbm_height)
 		i = newlw->label.label_height +
@ -161,19 +147,16 @@ index 8bda3a7..c4e1ff9 100644
 	    if (i > newlw->core.width)
 		newlw->core.width = i;
 	}
-@@ -857,9 +882,11 @@ static XtGeometryResult QueryGeometry(w, intended, preferred)
+@@ -843,9 +867,11 @@ QueryGeometry(Widget w, XtWidgetGeometry
     preferred->request_mode = CWWidth | CWHeight;
-     preferred->width = (lw->label.label_width + 
+     preferred->width = (lw->label.label_width +
 			    2 * lw->label.internal_width +
 +			    2 * lw->threeD.shadow_width +
 			    LEFT_OFFSET(lw));
-     preferred->height = lw->label.label_height + 
+     preferred->height = lw->label.label_height +
 -			    2 * lw->label.internal_height;
 +			    2 * lw->label.internal_height +
 +			    2 * lw->threeD.shadow_width;
     if (  ((intended->request_mode & (CWWidth | CWHeight))
 	   	== (CWWidth | CWHeight)) &&
 	  intended->width == preferred->width &&
-- 
-1.6.1
-
--- a/Xaw3d-1.6.1-fontset.patch
+++ b/Xaw3d-1.6.1-fontset.patch
@ -0,0 +1,60 @@
+diff -up libXaw3d-1.6.1/src/AsciiSink.c.fontset libXaw3d-1.6.1/src/AsciiSink.c
+--- libXaw3d-1.6.1/src/AsciiSink.c.fontset	2012-02-01 12:24:00.000000000 -0700
+++ libXaw3d-1.6.1/src/AsciiSink.c	2012-02-25 14:52:46.802779081 -0700
+@@ -513,6 +513,8 @@ Initialize(Widget request, Widget new, A
+ {
+     AsciiSinkObject sink = (AsciiSinkObject) new;
+ 
+    if (!sink->ascii_sink.font) XtError("Aborting: no font found\n");
+
+     GetGC(sink);
+ 
+     sink->ascii_sink.insertCursorOn= CreateInsertCursor(XtScreenOfObject(new));
+diff -up libXaw3d-1.6.1/src/Command.c.fontset libXaw3d-1.6.1/src/Command.c
+--- libXaw3d-1.6.1/src/Command.c.fontset	2011-09-19 15:42:36.000000000 -0600
+++ libXaw3d-1.6.1/src/Command.c	2012-02-25 14:51:26.075372823 -0700
+@@ -218,6 +218,8 @@ Initialize(Widget request, Widget new, A
+   CommandWidget cbw = (CommandWidget) new;
+   int shape_event_base, shape_error_base;
+ 
+  if (!cbw->label.font) XtError("Aborting: no font found\n");
+
+   if (cbw->command.shape_style != XawShapeRectangle
+       && !XShapeQueryExtension(XtDisplay(new), &shape_event_base,
+ 			       &shape_error_base))
+diff -up libXaw3d-1.6.1/src/List.c.fontset libXaw3d-1.6.1/src/List.c
+--- libXaw3d-1.6.1/src/List.c.fontset	2011-10-09 12:01:20.000000000 -0600
+++ libXaw3d-1.6.1/src/List.c	2012-02-25 14:53:16.327465260 -0700
+@@ -362,6 +362,8 @@ Initialize(Widget junk, Widget new, ArgL
+ {
+     ListWidget lw = (ListWidget) new;
+ 
+    if (!lw->list.font) XtError("Aborting: no font found\n");
+
+ /*
+  * Initialize all private resources.
+  */
+diff -up libXaw3d-1.6.1/src/SmeBSB.c.fontset libXaw3d-1.6.1/src/SmeBSB.c
+--- libXaw3d-1.6.1/src/SmeBSB.c.fontset	2011-09-19 15:42:36.000000000 -0600
+++ libXaw3d-1.6.1/src/SmeBSB.c	2012-02-25 14:50:19.056358107 -0700
+@@ -207,6 +207,8 @@ Initialize(Widget request, Widget new, A
+     else
+ 	entry->sme_bsb.label = XtNewString( entry->sme_bsb.label );
+ 
+    if (!entry->sme_bsb.font) XtError("Aborting: no font found\n");
+
+     CreateGCs(new);
+ 
+     GetBitmapInfo(new, TRUE);	/* Left Bitmap Info */
+diff -up libXaw3d-1.6.1/src/Tip.c.fontset libXaw3d-1.6.1/src/Tip.c
+--- libXaw3d-1.6.1/src/Tip.c.fontset	2012-02-15 12:10:38.000000000 -0700
+++ libXaw3d-1.6.1/src/Tip.c	2012-02-25 14:50:19.058358017 -0700
+@@ -248,6 +248,8 @@ XawTipInitialize(Widget req, Widget w, A
+     TipWidget tip = (TipWidget)w;
+     XGCValues values;
+ 
+    if (!tip->tip.font) XtError("Aborting: no font found\n");
+
+     tip->tip.timer = 0;
+ 
+     values.foreground = tip->tip.foreground;
--- a/Xaw3d-1.6.1-hsbar.patch
+++ b/Xaw3d-1.6.1-hsbar.patch
@ -1,18 +1,7 @@
-From 4b6b6b0ee611cdbff470794c9ec9e095296abfd2 Mon Sep 17 00:00:00 2001
-From: Markus Steinborn <gnugv_maintainer@yahoo.de>
-Date: Sat, 24 Apr 2010 16:53:43 +0200
-Subject: [PATCH] Xaw3d-1.5E-hsbar.patch
-
---
- xc/lib/Xaw3d/Text.c     |   12 ++++--
- xc/lib/Xaw3d/Viewport.c |   92 ++++++++++++++---------------------------------
- 2 files changed, 35 insertions(+), 69 deletions(-)
-
-diff --git a/xc/lib/Xaw3d/Text.c b/xc/lib/Xaw3d/Text.c
-index 1716890..baaba17 100644
--- a/xc/lib/Xaw3d/Text.c
-+++ b/xc/lib/Xaw3d/Text.c
-@@ -478,8 +478,10 @@ TextWidget ctx;
+diff -up libXaw3d-1.6.1/src/Text.c.hsbar libXaw3d-1.6.1/src/Text.c
+--- libXaw3d-1.6.1/src/Text.c.hsbar	2011-10-06 13:17:19.000000000 -0600
+++ libXaw3d-1.6.1/src/Text.c	2012-02-25 14:54:41.996656624 -0700
+@@ -495,8 +495,10 @@ CreateHScrollBar(TextWidget ctx)
 		    (XtPointer) NULL);
 
 /**/
@ -25,7 +14,7 @@ index 1716890..baaba17 100644
 /**/
   PositionHScrollBar(ctx);
   if (XtIsRealized((Widget)ctx)) {
-@@ -503,8 +505,10 @@ TextWidget ctx;
+@@ -519,8 +521,10 @@ DestroyHScrollBar(TextWidget ctx)
   if (hbar == NULL) return;
 
 /**/
@ -38,11 +27,10 @@ index 1716890..baaba17 100644
 /**/
   if (ctx->text.vbar == NULL)
       XtRemoveCallback((Widget) ctx, XtNunrealizeCallback, UnrealizeScrollbars,
-diff --git a/xc/lib/Xaw3d/Viewport.c b/xc/lib/Xaw3d/Viewport.c
-index 813cea6..c50d629 100644
--- a/xc/lib/Xaw3d/Viewport.c
-+++ b/xc/lib/Xaw3d/Viewport.c
-@@ -239,7 +239,7 @@ static void Initialize(request, new, args, num_args)
+diff -up libXaw3d-1.6.1/src/Viewport.c.hsbar libXaw3d-1.6.1/src/Viewport.c
+--- libXaw3d-1.6.1/src/Viewport.c.hsbar	2012-01-24 14:56:03.000000000 -0700
+++ libXaw3d-1.6.1/src/Viewport.c	2012-02-25 14:58:18.474098582 -0700
+@@ -244,7 +244,7 @@ Initialize(Widget request, Widget new, A
     XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
     if (sw)
     {
@ -51,7 +39,7 @@ index 813cea6..c50d629 100644
 
 	arg_cnt = 0;
 	XtSetArg(threeD_args[arg_cnt], XtNborderWidth, 0); arg_cnt++;
-@@ -257,8 +257,8 @@ static void Initialize(request, new, args, num_args)
+@@ -262,8 +262,8 @@ Initialize(Widget request, Widget new, A
     XtSetArg(clip_args[arg_cnt], XtNright, XtChainRight); arg_cnt++;
     XtSetArg(clip_args[arg_cnt], XtNtop, XtChainTop); arg_cnt++;
     XtSetArg(clip_args[arg_cnt], XtNbottom, XtChainBottom); arg_cnt++;
@ -62,7 +50,7 @@ index 813cea6..c50d629 100644
 
     w->viewport.clip = XtCreateManagedWidget("clip", widgetClass, new,
 					     clip_args, arg_cnt);
-@@ -278,8 +278,8 @@ static void Initialize(request, new, args, num_args)
+@@ -283,8 +283,8 @@ Initialize(Widget request, Widget new, A
  * Set the clip widget to the correct height.
  */
 
@ -73,15 +61,7 @@ index 813cea6..c50d629 100644
 
     if ( (h_bar != NULL) &&
 	 ((int)w->core.width >
-@@ -498,7 +498,6 @@ static void MoveChild(w, x, y)
-     RedrawThumbs(w);
- }
- 
-
- static void ComputeLayout(widget, query, destroy_scrollbars)
-     Widget widget;		/* Viewport */
-     Boolean query;		/* query child's preferred geom? */
-@@ -516,23 +515,13 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -509,23 +509,13 @@ ComputeLayout(Widget widget, Boolean que
     XtWidgetGeometry intended;
     Dimension pad = 0, sw = 0;
 
@ -108,7 +88,7 @@ index 813cea6..c50d629 100644
     intended.request_mode = CWBorderWidth;
     intended.border_width = 0;
 
-@@ -543,10 +532,8 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -536,10 +526,8 @@ ComputeLayout(Widget widget, Boolean que
 			     &clip_width, &clip_height);
     }
     else {
@ -119,12 +99,12 @@ index 813cea6..c50d629 100644
 	XtWidgetGeometry preferred;
 
 	needshoriz = needsvert = False;
-@@ -560,31 +547,25 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
- 	if (!w->viewport.allowhoriz) 
+@@ -553,31 +541,25 @@ ComputeLayout(Widget widget, Boolean que
+ 	if (!w->viewport.allowhoriz)
 	    intended.request_mode |= CWWidth;
 
 -#ifdef PREP_CHILD_TO_CLIP
-	if ((int)child->core.width < clip_width) 
+-	if ((int)child->core.width < clip_width)
 -	    intended.width = clip_width;
 +	if ((int)child->core.width < clip_width + pad)
 +	    intended.width = clip_width + pad;
@ -132,11 +112,11 @@ index 813cea6..c50d629 100644
 -#endif
 	    intended.width = child->core.width;
 
-	if (!w->viewport.allowvert) 
+-	if (!w->viewport.allowvert)
 -	    intended.request_mode |= CWHeight;
 -
 -#ifdef PREP_CHILD_TO_CLIP
-	if ((int)child->core.height < clip_height) 
+-	if ((int)child->core.height < clip_height)
 -	    intended.height = clip_height;
 +	if ((int)child->core.height < clip_height + pad)
 +	    intended.height = clip_height + pad;
@ -158,7 +138,7 @@ index 813cea6..c50d629 100644
 	    if (query) {
 	        (void) XtQueryGeometry( child, &intended, &preferred );
 		if ( !(preferred.request_mode & CWWidth) )
-@@ -592,12 +573,9 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -585,12 +567,9 @@ ComputeLayout(Widget widget, Boolean que
 		if ( !(preferred.request_mode & CWHeight) )
 		    preferred.height = intended.height;
 	    }
@ -171,25 +151,25 @@ index 813cea6..c50d629 100644
 
 	    /*
 	     * Note that having once decided to turn on either bar
-@@ -607,7 +585,7 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -600,7 +579,7 @@ ComputeLayout(Widget widget, Boolean que
 
 #define CheckHoriz()							\
 	    if (w->viewport.allowhoriz &&				\
 -		    (int)preferred.width > clip_width + 2 * sw) {	\
-+		    (int)preferred.width > clip_width + pad) {		\
++		    (int)preferred.width > clip_width + pad) {		\
 		if (!needshoriz) {					\
- 		    Widget bar = w->viewport.horiz_bar;			\
+ 		    Widget horiz_bar = w->viewport.horiz_bar;		\
 		    needshoriz = True;					\
-@@ -622,7 +600,7 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -615,7 +594,7 @@ ComputeLayout(Widget widget, Boolean que
 /* enddef */
 	    CheckHoriz();
 	    if (w->viewport.allowvert &&
 -		    (int)preferred.height > clip_height + 2 * sw) {
 +		    (int)preferred.height > clip_height + pad) {
 		if (!needsvert) {
- 		    Widget bar = w->viewport.vert_bar;
+ 		    Widget vert_bar = w->viewport.vert_bar;
 		    needsvert = True;
-@@ -636,38 +614,22 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -629,38 +608,22 @@ ComputeLayout(Widget widget, Boolean que
 		intended.height = preferred.height;
 	    }
 
@ -233,7 +213,7 @@ index 813cea6..c50d629 100644
     }
 
     bar_width = bar_height = 0;
-@@ -712,7 +674,7 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -705,7 +668,7 @@ ComputeLayout(Widget widget, Boolean que
 	else {
 	    int bw = bar->core.border_width;
 	    XtResizeWidget( bar,
@ -242,7 +222,7 @@ index 813cea6..c50d629 100644
 			    (Dimension)bw );
 	    XtMoveWidget( bar,
 			  (Position)((needsvert && !w->viewport.useright)
-@@ -737,7 +699,7 @@ static void ComputeLayout(widget, query, destroy_scrollbars)
+@@ -730,7 +693,7 @@ ComputeLayout(Widget widget, Boolean que
 	else {
 	    int bw = bar->core.border_width;
 	    XtResizeWidget( bar,
@ -251,7 +231,7 @@ index 813cea6..c50d629 100644
 			    (Dimension)bw );
 	    XtMoveWidget( bar,
 			  (Position)(w->viewport.useright
-@@ -790,7 +752,7 @@ int *clip_width, *clip_height;
+@@ -780,7 +743,7 @@ ComputeWithForceBars(Widget widget, Bool
  */
 
     XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
@ -259,8 +239,8 @@ index 813cea6..c50d629 100644
 +    if (sw) pad = 2 * sw;
 
     if (w->viewport.allowvert) {
- 	if (w->viewport.vert_bar == NULL) 
-@@ -944,7 +906,7 @@ GeometryRequestPlusScrollbar(w, horizontal, request, reply_return)
+ 	if (w->viewport.vert_bar == NULL)
+@@ -926,7 +889,7 @@ GeometryRequestPlusScrollbar(ViewportWid
   Dimension pad = 0, sw = 0;
 
   XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
@ -269,7 +249,7 @@ index 813cea6..c50d629 100644
 
   plusScrollbars = *request;
   if ((bar = w->viewport.horiz_bar) == (Widget)NULL)
-@@ -1017,7 +979,7 @@ static XtGeometryResult GeometryManager(child, request, reply)
+@@ -997,7 +960,7 @@ GeometryManager(Widget child, XtWidgetGe
 	return XtGeometryNo;
 
     XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
@ -278,6 +258,3 @@ index 813cea6..c50d629 100644
 
     allowed = *request;
 
-- 
-1.6.1
-
--- a/Xaw3d-1.6.1-i18n.patch
+++ b/Xaw3d-1.6.1-i18n.patch
@ -1,7 +1,7 @@
--- Xaw3d-1.5/xc/lib/Xaw3d/MultiSrc.c.orig	Tue Aug  6 22:51:08 2002
-+++ Xaw3d-1.5/xc/lib/Xaw3d/MultiSrc.c	Tue Aug  6 22:51:16 2002
-@@ -735,6 +735,7 @@
-   
+--- libXaw3d-1.6.1/src/MultiSrc.c.orig	2011-09-19 15:42:36.000000000 -0600
+++ libXaw3d-1.6.1/src/MultiSrc.c	2012-02-25 14:33:44.336534494 -0700
+@@ -728,6 +728,7 @@
+ 
   if ( string_set || (old_src->multi_src.type != src->multi_src.type) ) {
     RemoveOldStringOrFile(old_src, string_set);
 +    src->multi_src.allocated_string = old_src->multi_src.allocated_string;
--- a/Xaw3d-ia64.patch
+++ b/Xaw3d-ia64.patch
@ -1,33 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/List.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/List.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/List.c.prototypes	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/List.c	2008-10-06 10:11:28.000000000 +0200
-@@ -38,6 +38,7 @@ in this Software without prior written a
- 
- #include "Xaw3dP.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c.prototypes	1996-10-15 16:41:20.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c	2008-10-06 10:10:37.000000000 +0200
-@@ -81,6 +81,7 @@ SOFTWARE.
- #include <X11/Xaw3d/TextP.h>
- #include "XawI18n.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- 
- #ifdef GETLASTPOS
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/Text.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.prototypes	2003-02-10 18:28:13.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c	2008-10-06 10:11:11.000000000 +0200
-@@ -74,6 +74,7 @@ SOFTWARE.
- #include <X11/Xaw3d/ThreeDP.h>
- #include <X11/Xfuncs.h>
- #include <ctype.h>		/* for isprint() */
-+#include <stdlib.h>
- 
- #ifndef MAX_LEN_CT
- #define MAX_LEN_CT 6		/* for sequence: ESC $ ( A \xx \xx */
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@ -1,27 +1,21 @@
 Summary: A version of the MIT Athena widget set for X
 Name: Xaw3d
-Version: 1.5E
-Release: 21%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
-Source: ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-%{version}.tar.gz
-Patch: Xaw3d-1.5E-xorg-imake.patch
+Source: http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2
 Patch1: Xaw3d-1.5E-cast.patch
-Patch2: Xaw3d-ia64.patch
-Patch3: Xaw3d-1.5-i18n.patch
+Patch3: Xaw3d-1.6.1-i18n.patch
 Patch4: Xaw3d-1.5-box.c.patch
 Patch5: Xaw3d-1.5-debian-fixes.patch
-Patch6: Xaw3d-1.5E-warnings.patch
-Patch7: Xaw3d-1.5E-3Dlabel.patch
+Patch7: Xaw3d-1.6.1-3Dlabel.patch
 Patch8: Xaw3d-1.5E-close-destroy-crash.patch
 Patch9: Xaw3d-1.5E-compat.patch
-Patch10: Xaw3d-1.5E-fontset.patch
-Patch11: Xaw3d-1.5E-hsbar.patch
-Patch12: Xaw3d-1.5E-null.patch
-Patch13: Xaw3d-1.5E-secure.patch
-Patch14: Xaw3d-1.5E-thumb.patch
+Patch10: Xaw3d-1.6.1-fontset.patch
+Patch11: Xaw3d-1.6.1-hsbar.patch

 License: MIT
-URL: http://directory.fsf.org/project/xaw3d/
+URL: http://xorg.freedesktop.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires: libXmu-devel
@ -30,7 +24,7 @@ BuildRequires: libSM-devel
 BuildRequires: libXext-devel
 BuildRequires: libX11-devel
 BuildRequires: libXpm-devel
-BuildRequires: imake
+BuildRequires: xorg-x11-util-macros
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: ed
@ -68,39 +62,30 @@ package.


 %prep
-%setup -q -c
-# Xaw3d7
-pushd xc/lib/Xaw3d
-ln -s .. X11
-%patch -p0 -b .config
-popd
+%setup -q -n libXaw3d-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch3 -p1 -b .i18n
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
+# This doesn't apply cleanly, but has not been applied
+#patch5 -p1
 %patch7 -p1 -b .3Dlabel
 %patch8 -p1 -b .close-destroy-crash
-%patch9 -p1 -b .compat
+# This doesn't apply cleanly, but has not been applied
+#patch9 -p1 -b .compat
 %patch10 -p1 -b .fontset
 %patch11 -p1 -b .hsbar
-%patch12 -p1 -b .null
-%patch13 -p1
-%patch14 -p1


 %build
-# Xaw3d7
-pushd xc/lib/Xaw3d
-xmkmf
-make CDEBUGFLAGS="${RPM_OPT_FLAGS} -DARROW_SCROLLBAR"
-popd
+%configure --disable-static --enable-arrow-scrollbars
+make %{?_smp_mflags}


 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT SHLIBDIR=%{_libdir} INCDIR=%{_includedir} -C xc/lib/Xaw3d
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/libXaw3d.la
+rm -r $RPM_BUILD_ROOT%{_docdir}


 %clean
@ -114,15 +99,19 @@ rm -rf $RPM_BUILD_ROOT

 %files
 %defattr(-,root,root)
-%doc xc/lib/Xaw3d/README.XAW3D
+%doc ChangeLog COPYING README src/README.XAW3D
 %{_libdir}/*.so.*

 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/xaw3d.pc
 %{_includedir}/X11/Xaw3d

 %changelog
+* Sat Feb 25 2012 Orion Poplawski <orion@cora.nwra.com> - 1.6.1-1
+- Update to 1.6.1
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5E-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-29ecfdcd6bcf47f62ecfd672d31269a1  Xaw3d-1.5E.tar.gz
+3db4cfe29ee911a519ef254625809f9c  libXaw3d-1.6.1.tar.bz2