auto-import changelog data from Xaw3d-1.5-20.src.rpm
Wed Nov 26 2003 Than Ngo <than@redhat.com> 1.5-20 - added missing Buildprereq: XFree86-devel (bug #110601, #109692, #110735) - fixed arguments in scrollbar (bug #110766)
This commit is contained in:
cvsdist
parent
2108267ff3
commit
a177d0bca2
70
Xaw3d-1.5-scrollbar2.patch
Normal file
70
Xaw3d-1.5-scrollbar2.patch
Normal file
@ -0,0 +1,70 @@
|
||||
--- Xaw3d-1.5/xc/lib/Xaw3d6/Scrollbar.c.orig 2003-11-26 19:38:34.000000000 +0100
|
||||
+++ Xaw3d-1.5/xc/lib/Xaw3d6/Scrollbar.c 2003-11-26 19:41:55.000000000 +0100
|
||||
@@ -300,9 +300,8 @@
|
||||
|
||||
/* ARGSUSED */
|
||||
static void
|
||||
-_ShadowSurroundedBox (gw, event, region, xtl, ytl, xbr, ybr, out)
|
||||
+_ShadowSurroundedBox (gw, region, xtl, ytl, xbr, ybr, out)
|
||||
Widget gw;
|
||||
- XEvent *event;
|
||||
Region region;
|
||||
Dimension xtl, ytl, xbr, ybr; /* INNER corners */
|
||||
Boolean out;
|
||||
@@ -384,9 +383,7 @@
|
||||
sbw->shown. The old area is erased. The painting and
|
||||
erasing is done cleverly so that no flickering will occur. */
|
||||
|
||||
-static void PaintThumb (sbw, event)
|
||||
- ScrollbarWidget sbw;
|
||||
- XEvent *event;
|
||||
+static void PaintThumb (ScrollbarWidget sbw)
|
||||
{
|
||||
Dimension s = sbw->threeD.shadow_width;
|
||||
Position oldtop = sbw->scrollbar.topLoc;
|
||||
@@ -423,7 +420,7 @@
|
||||
if (sbw->scrollbar.orientation == XtorientHorizontal)
|
||||
{
|
||||
_ShadowSurroundedBox(
|
||||
- sbw, event,
|
||||
+ sbw,
|
||||
(Region)NULL,
|
||||
newtop + s, 2 * s,
|
||||
newbot - s, sbw->core.height - 2 * s, TRUE);
|
||||
@@ -431,7 +428,7 @@
|
||||
else
|
||||
{
|
||||
_ShadowSurroundedBox(
|
||||
- sbw, event,
|
||||
+ sbw,
|
||||
(Region)NULL,
|
||||
2 * s, newtop + s,
|
||||
sbw->core.width - 2 * s, newbot - s,
|
||||
@@ -454,8 +451,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARROW_SCROLLBAR
|
||||
-static void PaintArrows (sbw)
|
||||
- ScrollbarWidget sbw;
|
||||
+static void PaintArrows (ScrollbarWidget sbw)
|
||||
{
|
||||
XPoint pt[20];
|
||||
Dimension s = sbw->threeD.shadow_width;
|
||||
@@ -761,7 +757,7 @@
|
||||
XRectInRegion (region, x, y, width, height) != RectangleOut) {
|
||||
/* Forces entire thumb to be painted. */
|
||||
sbw->scrollbar.topLoc = -(sbw->scrollbar.length + 1);
|
||||
- PaintThumb (sbw, event);
|
||||
+ PaintThumb (sbw);
|
||||
}
|
||||
#ifdef ARROW_SCROLLBAR
|
||||
/* we'd like to be region aware here!!!! */
|
||||
@@ -1165,7 +1161,7 @@
|
||||
#ifdef ARROW_SCROLLBAR
|
||||
sbw->scrollbar.scroll_mode = 2; /* indicate continuous scroll */
|
||||
#endif
|
||||
- PaintThumb (sbw, event);
|
||||
+ PaintThumb (sbw);
|
||||
XFlush (XtDisplay (w)); /* re-draw it before Notifying */
|
||||
}
|
||||
|
||||
37
Xaw3d.spec
37
Xaw3d.spec
@ -1,7 +1,7 @@
|
||||
Summary: A version of the MIT Athena widget set for X.
|
||||
Name: Xaw3d
|
||||
Version: 1.5
|
||||
Release: 19
|
||||
Release: 20
|
||||
Group: System Environment/Libraries
|
||||
Source: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
|
||||
Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
|
||||
@ -14,10 +14,13 @@ Patch3: xaw3d.patch
|
||||
Patch4: Xaw3d-1.3-static.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 /sbin/ldconfig
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
BuildPrereq: XFree86-devel
|
||||
|
||||
%description
|
||||
Xaw3d is an enhanced version of the MIT Athena Widget set for
|
||||
@ -48,14 +51,14 @@ package.
|
||||
%setup -q -c
|
||||
%ifnarch ia64
|
||||
mkdir old
|
||||
cd old
|
||||
pushd old
|
||||
tar xzf %{SOURCE1}
|
||||
cd ..
|
||||
popd
|
||||
mv old/xc/lib/Xaw3d xc/lib/Xaw3d6
|
||||
rm -rf old
|
||||
%endif
|
||||
|
||||
cd xc/lib/Xaw3d
|
||||
pushd xc/lib/Xaw3d
|
||||
%patch -p0
|
||||
ln -s .. X11
|
||||
%patch1 -p4
|
||||
@ -63,8 +66,9 @@ ln -s .. X11
|
||||
%patch4 -p0
|
||||
%patch5 -p4
|
||||
%patch6 -p4
|
||||
popd
|
||||
%ifnarch ia64
|
||||
cd ../Xaw3d6
|
||||
pushd xc/lib/Xaw3d6
|
||||
%patch -p0
|
||||
ln -s .. X11
|
||||
%patch1 -p4
|
||||
@ -72,31 +76,38 @@ ln -s .. X11
|
||||
%patch3 -p4
|
||||
%patch4 -p0
|
||||
%patch6 -p4
|
||||
%patch7 -p4
|
||||
popd
|
||||
%endif
|
||||
%patch8 -p1
|
||||
|
||||
|
||||
%build
|
||||
cp %{SOURCE2} xc/lib/Xaw3d6
|
||||
|
||||
cd xc/lib/Xaw3d
|
||||
pushd xc/lib/Xaw3d
|
||||
export PATH=/usr/X11R6/bin:$PATH
|
||||
xmkmf
|
||||
make CDEBUGFLAGS="${RPM_OPT_FLAGS} -DARROW_SCROLLBAR"
|
||||
popd
|
||||
|
||||
%ifnarch ia64
|
||||
# compat libs
|
||||
cd ../Xaw3d6
|
||||
pushd xc/lib/Xaw3d6
|
||||
xmkmf
|
||||
make
|
||||
popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
cd xc/lib/Xaw3d
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
make install DESTDIR=$RPM_BUILD_ROOT -C xc/lib/Xaw3d
|
||||
|
||||
%ifnarch ia64
|
||||
cd ../Xaw3d6
|
||||
cp -aR libXaw*so.* $RPM_BUILD_ROOT/usr/X11R6/%{_lib}
|
||||
cp -aR xc/lib/Xaw3d/libXaw*so.* $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
|
||||
%endif
|
||||
|
||||
ln -s X11/Xaw3d $RPM_BUILD_ROOT/usr/X11R6/include
|
||||
|
||||
%clean
|
||||
@ -135,6 +146,10 @@ fi
|
||||
%ghost /usr/X11R6/include/Xaw3d
|
||||
|
||||
%changelog
|
||||
* Wed Nov 26 2003 Than Ngo <than@redhat.com> 1.5-20
|
||||
- added missing Buildprereq: XFree86-devel (bug #110601, #109692, #110735)
|
||||
- fixed arguments in scrollbar (bug #110766)
|
||||
|
||||
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user