From bfb406be7074d0bbb95f1c162cfe1844b2a90d29 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 20 Jan 2005 13:55:28 +0000 Subject: [PATCH] enable ARROW_SCROLLBARS, MULTIPLANE_PIXMAPS --- Xaw3d-1.5E-xorg-imake.patch | 16 ++++++++++++---- Xaw3d.spec | 8 +++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Xaw3d-1.5E-xorg-imake.patch b/Xaw3d-1.5E-xorg-imake.patch index 902d9c4..9d5312e 100644 --- a/Xaw3d-1.5E-xorg-imake.patch +++ b/Xaw3d-1.5E-xorg-imake.patch @@ -1,8 +1,16 @@ ---- Imakefile.orig 2003-03-08 15:55:18.000000000 +0100 -+++ Imakefile 2004-11-30 13:55:17.309633685 +0100 -@@ -11,18 +11,18 @@ +--- 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 +-#undef ARROW_SCROLLBARS ++#define ARROW_SCROLLBARS -#define DoNormalLib NormalLibXaw -#define DoSharedLib SharedLibXaw diff --git a/Xaw3d.spec b/Xaw3d.spec index 78b2a10..8b4f8ba 100644 --- a/Xaw3d.spec +++ b/Xaw3d.spec @@ -17,7 +17,6 @@ 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.5E-lex.patch License: MIT Prefix: /usr Prereq: fileutils @@ -57,7 +56,7 @@ package. # Xaw3d7 pushd xc/lib/Xaw3d ln -s .. X11 -%patch -p0 +%patch -p0 -b .config popd %if %{compatlib} @@ -79,7 +78,6 @@ ln -s .. X11 %patch7 -p4 popd %endif -%patch8 -p4 %build # Xaw3d7 @@ -144,8 +142,8 @@ fi %ghost /usr/X11R6/include/Xaw3d %changelog -* Tue Nov 30 2004 Than Ngo 1.5E-2 -- fix another compiler warning #138321 +* Thu Jan 20 2005 Than Ngo 1.5E-2 +- enable ARROW_SCROLLBARS, MULTIPLANE_PIXMAPS * Tue Nov 30 2004 Than Ngo 1.5E-1 - update to 1.5E, #130310