- Add qhull-2003.1-alias.patch (BZ 432309) Thanks to Orion Poplawski

(orion@cora.nwra.com).
This commit is contained in:
corsepiu 2008-03-04 12:49:47 +00:00
parent 8562a0e5d6
commit cb47f921d1
2 changed files with 32 additions and 1 deletions

24
qhull-2003.1-alias.patch Normal file
View File

@ -0,0 +1,24 @@
--- qhull-2003.1/src/qset.c.alias 2008-02-27 14:46:42.000000000 -0700
+++ qhull-2003.1/src/qset.c 2008-02-28 16:44:20.000000000 -0700
@@ -126,8 +126,7 @@
*/
void qh_setappend(setT **setp, void *newelem) {
- int *sizep;
- void **endp;
+ int *sizep, end_idx;
if (!newelem)
return;
@@ -135,8 +134,9 @@
qh_setlarger(setp);
sizep= SETsizeaddr_(*setp);
}
- *(endp= &((*setp)->e[(*sizep)++ - 1].p))= newelem;
- *(++endp)= NULL;
+ end_idx = (*sizep)++ - 1;
+ (*setp)->e[end_idx].p = newelem;
+ (*setp)->e[end_idx + 1].p = NULL;
} /* setappend */
/*-<a href="qh-set.htm#TOC"

View File

@ -1,10 +1,12 @@
Summary: General dimension convex hull programs Summary: General dimension convex hull programs
Name: qhull Name: qhull
Version: 2003.1 Version: 2003.1
Release: 9%{?dist} Release: 10%{?dist}
License: Distributable License: Distributable
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: http://www.qhull.org/download/qhull-%{version}.tar.gz Source0: http://www.qhull.org/download/qhull-%{version}.tar.gz
Patch0: qhull-2003.1-alias.patch
URL: http://www.qhull.org URL: http://www.qhull.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -32,6 +34,7 @@ about a point.
%prep %prep
%setup -n %{name}-%{version} %setup -n %{name}-%{version}
%patch0 -p1
sed -i -e "s,\"../html/,\"html/,g" src/*.htm sed -i -e "s,\"../html/,\"html/,g" src/*.htm
%build %build
@ -64,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
%_includedir/* %_includedir/*
%changelog %changelog
* Tue Mar 04 2008 Ralf Corsépius <rc040203@freenet.de> - 2003.1-10
- Add qhull-2003.1-alias.patch (BZ 432309)
Thanks to Orion Poplawski (orion@cora.nwra.com).
* Sun Feb 10 2008 Ralf Corsépius <rc040203@freenet.de> - 2003.1-9 * Sun Feb 10 2008 Ralf Corsépius <rc040203@freenet.de> - 2003.1-9
- Rebuild for gcc43. - Rebuild for gcc43.