rpms/Xaw3d
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Also apply the Xaw3d-1.5E-secure, Xaw3d-1.5E-thumb and Xaw3d-1.5E-cast

Browse Source 
(replacing xaw3d.patch) patches from http://gitorious.org/xaw3d (#587349)
- Apply accidentally not applied Xaw3d-1.5E-lex.patch
This commit is contained in:
Hans de Goede 2010-11-08 23:51:41 +01:00
parent a0810586e4
commit 2c7bfdd711
2 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Xaw3d.spec
View File

@ -1,11 +1,11 @@
Summary: A version of the MIT Athena widget set for X
Name: Xaw3d
Version: 1.5E
Release: 15%{?dist}
Release: 17%{?dist}
Group: System Environment/Libraries
Source: ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-%{version}.tar.gz
Patch: Xaw3d-1.5E-xorg-imake.patch
Patch1: xaw3d.patch
Patch1: Xaw3d-1.5E-cast.patch
Patch2: Xaw3d-ia64.patch
Patch3: Xaw3d-1.5-i18n.patch
Patch4: Xaw3d-1.5-box.c.patch
@ -17,6 +17,9 @@ 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
Patch15: Xaw3d-1.5E-lex.patch
License: MIT
URL: http://directory.fsf.org/project/xaw3d/
@ -84,6 +87,9 @@ popd
%patch10 -p1 -b .fontset
%patch11 -p1 -b .hsbar
%patch12 -p1 -b .null
%patch13 -p1
%patch14 -p1
%patch15 -p1
%build
@ -119,6 +125,11 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/X11/Xaw3d
%changelog
* Mon Nov 8 2010 Hans de Goede <hdegoede@redhat.com> - 1.5E-17
- Also apply the Xaw3d-1.5E-secure, Xaw3d-1.5E-thumb and Xaw3d-1.5E-cast
(replacing xaw3d.patch) patches from http://gitorious.org/xaw3d (#587349)
- Apply accidentally not applied Xaw3d-1.5E-lex.patch
* Mon Nov 8 2010 Orion Poplawski <orion@cora.nwra.com> - 1.5E-16
- Add patches from http://gitorious.org/xaw3d

30
xaw3d.patch
View File

@ -1,30 +0,0 @@
diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c
--- Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig 2003-02-10 18:22:26.000000000 +0100
+++ Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c 2008-10-06 10:07:46.000000000 +0200
@@ -1087,7 +1087,11 @@ static void NotifyThumb (w, event, param
Cardinal *num_params; /* unused */
{
register ScrollbarWidget sbw = (ScrollbarWidget) w;
- float top = sbw->scrollbar.top;
+ union {
+ XtPointer pt;
+ float top;
+ } foo;
+ foo.top = sbw->scrollbar.top;
#ifndef XAW_ARROW_SCROLLBARS
if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */
@@ -1116,10 +1120,10 @@ static void NotifyThumb (w, event, param
/* Removed the dependancy on scrollbar arrows. Xterm as distributed in
X11R6.6 by The XFree86 Project wants this correction, with or without
the arrows. */
- top += 0.0001;
+ foo.top += 0.0001;
/* #endif */
- XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top);
- XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top);
+ XtCallCallbacks (w, XtNthumbProc, foo.pt);
+ XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
}