- Add an upstream patch that fixes computation of CRC in zlib streams.

- Resolves: #590205
This commit is contained in:
Petr Machata 2010-05-10 15:38:02 +00:00
parent 667c3698df
commit c6e3871a68
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,21 @@
Index: /trunk/boost/iostreams/filter/zlib.hpp
===================================================================
--- /trunk/boost/iostreams/filter/zlib.hpp (revision 45783)
+++ /trunk/boost/iostreams/filter/zlib.hpp (revision 57610)
@@ -21,4 +21,5 @@
#include <new>
#include <boost/config.hpp> // MSVC, STATIC_CONSTANT, DEDUCED_TYPENAME, DINKUM.
+#include <boost/cstdint.hpp> // uint*_t
#include <boost/detail/workaround.hpp>
#include <boost/iostreams/constants.hpp> // buffer size.
@@ -44,7 +45,7 @@
// Typedefs
-typedef unsigned int uint;
-typedef unsigned char byte;
-typedef unsigned long ulong;
+typedef uint32_t uint;
+typedef uint8_t byte;
+typedef uint32_t ulong;
// Prefix 'x' prevents symbols from being redefined when Z_PREFIX is defined

View File

@ -17,7 +17,7 @@
Name: boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.41.0
Release: 9%{?dist}
Release: 10%{?dist}
License: Boost
URL: http://sodium.resophonic.com/boost-cmake/%{version}.cmake0/
Group: System Environment/Libraries
@ -68,6 +68,7 @@ Patch0: boost-cmake-soname.patch
Patch1: boost-graph-compile.patch
Patch2: boost-1.41.0-mapnik.patch
Patch3: boost-1.41.0-shared_ptr_serialization.patch
Patch4: boost-1.41.0-iostreams-zlib.patch
%bcond_with tests
%bcond_with docs_generated
@ -361,6 +362,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH0} | %{__patch} -p0 --fuzz=0
%patch1 -p0
%patch2 -p0
%patch3 -p1
%patch4 -p2
%build
# Support for building tests.
@ -727,6 +729,10 @@ find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec %{_
%endif
%changelog
* Mon May 10 2010 Petr Machata <pmachata@redhat.com> - 1.41.0-10
- Add an upstream patch that fixes computation of CRC in zlib streams.
- Resolves: #590205
* Wed May 05 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.41.0-9
- -devel: own %%{_datadir}/cmake/%%{name}/
- -devel: Requires: cmake (for %%{_datadir}/cmake ownership)