- Add a patch to build mapnik

- Resolves: #558383
This commit is contained in:
Petr Machata 2010-01-25 09:40:32 +00:00
parent 721aded241
commit c4b14f1243
2 changed files with 28 additions and 1 deletions

21
boost-1.41.0-mapnik.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp\~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp
--- boost/iostreams/device/mapped_file.hpp~ 2009-12-17 20:51:56.000000000 +0100
+++ boost/iostreams/device/mapped_file.hpp 2010-01-25 10:33:43.000000000 +0100
@@ -4,6 +4,9 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
+#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
+#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
+
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
# pragma once
#endif
@@ -591,3 +594,5 @@ operator^=(mapped_file::mapmode& a, mapp
} } // End namespaces iostreams, boost.
#include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
+
+#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
Diff finished. Mon Jan 25 10:33:55 2010

View File

@ -13,7 +13,7 @@
Name: boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.41.0
Release: 3%{?dist}
Release: 4%{?dist}
License: Boost
URL: http://sodium.resophonic.com/boost-cmake/%{version}.cmake0/
Group: System Environment/Libraries
@ -62,6 +62,7 @@ BuildRequires: mpich2-devel
Patch0: boost-cmake-soname.patch
Patch1: boost-graph-compile.patch
Patch2: boost-1.41.0-mapnik.patch
%bcond_with tests
%bcond_with docs_generated
@ -265,6 +266,7 @@ web page (http://www.boost.org/doc/libs/1_40_0).
sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH0} | %{__patch} -p0 --fuzz=0
%patch1 -p0
%patch2 -p0
%build
%{__mkdir_p} build
@ -511,6 +513,10 @@ find $RPM_BUILD_ROOT%{_libdir}/ -name '*.cmake' -exec %{__rm} -f {} \;
%{_libdir}/*.a
%changelog
* Mon Jan 25 2010 Petr Machata <pmachata@redhat.com> - 1.41.0-4
- Add a patch to build mapnik
- Resolves: #558383
* Tue Jan 19 2010 Petr Machata <pmachata@redhat.com> - 1.41.0-3
- Generalize the soname selection