From 82d6ce8fa5a2bc1fe5510a1e1eb441e339fa621c Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Tue, 30 Nov 2004 15:14:04 +0000
Subject: [PATCH] - update to 1.5E, #130310 - fix compiler warning #110766

---
 .cvsignore                  |  1 +
 Xaw3d-1.3-misc.patch        | 10 ++++++++++
 Xaw3d-1.5E-xorg-imake.patch | 27 +++++++++++++++++++++++++++
 Xaw3d.spec                  | 26 +++++++++++++-------------
 sources                     |  2 +-
 5 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 Xaw3d-1.3-misc.patch
 create mode 100644 Xaw3d-1.5E-xorg-imake.patch

diff --git a/.cvsignore b/.cvsignore
index 9d9bc05..339d63c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 Xaw3d-1.3.tar.gz
 Xaw3d-1.5.tar.gz
+Xaw3d-1.5E.tar.gz
diff --git a/Xaw3d-1.3-misc.patch b/Xaw3d-1.3-misc.patch
new file mode 100644
index 0000000..f9b8729
--- /dev/null
+++ b/Xaw3d-1.3-misc.patch
@@ -0,0 +1,10 @@
+--- xc/lib/Xaw3d/Scrollbar.c.orig	2004-11-30 14:41:09.032348461 +0100
++++ xc/lib/Xaw3d/Scrollbar.c	2004-11-30 14:41:37.213698771 +0100
+@@ -1252,6 +1252,6 @@
+     sbw->scrollbar.shown = (shown > 1.0) ? 1.0 :
+ 				(shown >= 0.0) ? shown : sbw->scrollbar.shown;
+ 
+-    PaintThumb (sbw);
++    PaintThumb (sbw, NULL);
+ }
+ 
diff --git a/Xaw3d-1.5E-xorg-imake.patch b/Xaw3d-1.5E-xorg-imake.patch
new file mode 100644
index 0000000..902d9c4
--- /dev/null
+++ b/Xaw3d-1.5E-xorg-imake.patch
@@ -0,0 +1,27 @@
+--- Imakefile.orig	2003-03-08 15:55:18.000000000 +0100
++++ Imakefile	2004-11-30 13:55:17.309633685 +0100
+@@ -11,18 +11,18 @@
+ XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
+ #undef 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
diff --git a/Xaw3d.spec b/Xaw3d.spec
index 07a2e4e..9a7ed4b 100644
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -2,21 +2,21 @@
 
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
-Version: 1.5
-Release: 25
+Version: 1.5E
+Release: 1
 Group: System Environment/Libraries
-Source: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
+Source: http://www.visi.com/~hawkeyed/X/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
 Source2: Imakefile
-Url: ftp://ftp.x.org/contrib/widgets/Xaw3d/
-Patch: Xaw3d-1.5-xorg-imake.patch
+Url: http://www.visi.com/~hawkeyed/xaw3d.html
+Patch: Xaw3d-1.5E-xorg-imake.patch
 Patch1: Xaw3d-1.3-glibc.patch
 Patch2: Xaw3d-1.3-X11R6.3.patch
 Patch3: xaw3d.patch
+Patch4: Xaw3d-1.3-misc.patch
 Patch5: Xaw3d-ia64.patch
 Patch6: Xaw3d-1.5-i18n.patch
 Patch7: Xaw3d-1.5-scrollbar2.patch
-Patch8: Xaw3d-1.5-scrollbar1.patch
 License: MIT
 Prefix: /usr
 Prereq: fileutils
@@ -55,12 +55,8 @@ package.
 
 # Xaw3d7
 pushd xc/lib/Xaw3d
-%patch -p0
 ln -s .. X11
-%patch1 -p4
-%patch3 -p4
-%patch5 -p4
-%patch6 -p4
+%patch -p0
 popd
 
 %if %{compatlib}
@@ -76,13 +72,13 @@ ln -s .. X11
 %patch1 -p4
 %patch2 -p3
 %patch3 -p4
+%patch4 -p3
+%patch5 -p4
 %patch6 -p4
 %patch7 -p4
 popd
 %endif
 
-%patch8 -p1
-
 %build
 # Xaw3d7
 pushd xc/lib/Xaw3d
@@ -146,6 +142,10 @@ fi
 %ghost /usr/X11R6/include/Xaw3d
 
 %changelog
+* Tue Nov 30 2004 Than Ngo <than@redhat.com> 1.5E-1
+- update to 1.5E, #130310
+- fix compiler warning #110766
+
 * Tue Nov 23 2004 Than Ngo <than@redhat.com> 1.5-25
 - rebuilt
 
diff --git a/sources b/sources
index 1cb4d74..05603ad 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 9eaac2b8cae978f3a740ebb6933b898e  Xaw3d-1.3.tar.gz
-a77aa4ebe3be7964e4dbbc351e48277f  Xaw3d-1.5.tar.gz
+29ecfdcd6bcf47f62ecfd672d31269a1  Xaw3d-1.5E.tar.gz