OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=28

2009-03-03 20:54:43 +00:00
parent 59e9183524
commit 490d509220
5 changed files with 46 additions and 19 deletions
--- a/boost-function_without_exception.patch
+++ b/boost-function_without_exception.patch
@@ -0,0 +1,17 @@
+The ifdef is misplaced and leads to compilation errors when
+when BOOST_NO_EXCEPTIONS is defined (bnc#479659).
+
+--- boost/function/function_template.hpp
+++ boost/function/function_template.hpp
+@@ -950,10 +950,10 @@
+           f.vtable->manager(f.functor, this->functor,
+                             boost::detail::function::move_functor_tag);
+ 		  f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)      
+         } else {
+           clear();
+         }
+#if !defined(BOOST_NO_EXCEPTIONS)      
+       } catch (...) {
+         vtable = 0;
+         throw;
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar  3 11:30:07 CET 2009 - pth@suse.de
+
+- Fix misplaced ifdef in template_function.hpp:move_assign. Fixes
+  building software that defines BOOST_NO_EXCEPTION (bnc#479659).
+
+-------------------------------------------------------------------
+Wed Feb 25 18:06:32 CET 2009 - pth@suse.de
+
+- Fix packaging of the documentation.
+
 -------------------------------------------------------------------
 Sun Feb 22 04:10:41 CET 2009 - pth@suse.de

--- a/boost.spec
+++ b/boost.spec
@@ -45,7 +45,7 @@ Group:          Development/Libraries/C and C++
 Summary:        Boost C++ Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        1.38.0
-Release:        3
+Release:        4
 Source0:        %{name}_1_38_0.tar.bz2
 Source1:        boost-rpmlintrc
 Source2:        boost_1_33_1_man.tar.bz2
@@ -64,6 +64,8 @@ Patch9:         boost-ppc-asm.patch
 Patch19:        boost-sane_versioning.patch
 Patch20:        boost-strict_aliasing.patch
 Patch21:        boost-lib64.patch
+#Added 2009-03-03
+Patch22:        boost-function_without_exception.patch 
 Recommends:     %{all_libs}
 %define _docdir %{_datadir}/doc/packages/boost-%{version}

@@ -321,6 +323,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
 %patch19
 %patch20
 %patch21
+%patch22
 chmod +x configure
 #stupid build machinery copies .orig files
 find . -name \*.orig -exec rm {} +
@@ -448,13 +451,12 @@ dos2unix libs/ptr_container/doc/tutorial_example.html \
 	libs/test/test/test_files/errors_handling_test.pattern \
 	libs/test/test/test_files/result_report_test.pattern
 find . -name \*.htm\* -o -name \*.gif -o -name \*.css -o -name \*.jpg -o -name \*.png -o -name \*.ico | \
-	tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir}/boost-%{version} -xf -
+	tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir} -xf -
 rm -rf %{buildroot}%{_docdir}/boost
 ln -s /usr/include/boost %{buildroot}%{_docdir}
 ln -s ../LICENSE_1_0.txt %{buildroot}%{_docdir}/libs
-#only for documentation, don't need to be executable
+#only for documentation, doesn't need to be executable
 find %{buildroot}%{_docdir} -name \*.py -exec chmod -x {} +
-mkdir 
 #symlink dupes
 %if 0%suse_version > 1020
 %fdupes %buildroot
@@ -526,6 +528,7 @@ mkdir

 %files -n boost-license1_38_0
 %defattr(-, root, root, -)
+%dir %{_docdir}
 %doc %{_docdir}/LICENSE_1_0.txt

 %files -n libboost_date_time1_38_0
@@ -610,6 +613,11 @@ mkdir
 %doc %{_mandir}/man7/*.7.gz

 %changelog
+* Tue Mar 03 2009 pth@suse.de
+- Fix misplaced ifdef in template_function.hpp:move_assign. Fixes
+  building software that defines BOOST_NO_EXCEPTION (bnc#479659).
+* Wed Feb 25 2009 pth@suse.de
+- Fix packaging of the documentation.
 * Sun Feb 22 2009 pth@suse.de
 - Fix the line in the spec that copies the documentation.
 * Fri Feb 20 2009 pth@suse.de
--- a/boost.spec.in
+++ b/boost.spec.in
@@ -74,6 +74,8 @@ Patch9:         boost-ppc-asm.patch
 Patch19:        boost-sane_versioning.patch
 Patch20:        boost-strict_aliasing.patch
 Patch21:        boost-lib64.patch
+#Added 2009-03-03
+Patch22:        boost-function_without_exception.patch 
 Recommends:     %{all_libs}

 %define _docdir %{_datadir}/doc/packages/boost-%{version}
@@ -328,6 +330,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
 %patch19
 %patch20
 %patch21
+%patch22
 chmod +x configure
 #stupid build machinery copies .orig files
 find . -name \*.orig -exec rm {} +
@@ -480,16 +483,13 @@ dos2unix libs/ptr_container/doc/tutorial_example.html \
 	libs/test/test/test_files/errors_handling_test.pattern \
 	libs/test/test/test_files/result_report_test.pattern
 find . -name \*.htm\* -o -name \*.gif -o -name \*.css -o -name \*.jpg -o -name \*.png -o -name \*.ico | \
-	tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir}/boost-%{version} -xf -
+	tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir} -xf -
 rm -rf %{buildroot}%{_docdir}/boost
 ln -s /usr/include/boost %{buildroot}%{_docdir}
 ln -s ../LICENSE_1_0.txt %{buildroot}%{_docdir}/libs
-#only for documentation, don't need to be executable
+#only for documentation, doesn't need to be executable
 find %{buildroot}%{_docdir} -name \*.py -exec chmod -x {} +

-mkdir 
-
-
 #symlink dupes
 %if 0%suse_version > 1020
 %fdupes %buildroot
@@ -533,6 +533,7 @@ mkdir

 %files -n boost-license@lib_appendix@
 %defattr(-, root, root, -)
+%dir %{_docdir}
 %doc %{_docdir}/LICENSE_1_0.txt

 %files -n libboost_date_time@lib_appendix@
--- a/10
+++ b/10
@@ -26,7 +26,6 @@ libs/config/tools/configure.in
 libs/conversion/cast_test.cpp
 libs/conversion/lexical_cast_test.cpp
 libs/crc/crc_example.cpp
-libs/crc/crc_test.cpp
 libs/filesystem/build/Jamfile.v2
 libs/filesystem/example/simple_ls.cpp
 libs/filesystem/test/fstream_test.cpp
@@ -37,7 +36,6 @@ libs/format/example/sample_advanced.cpp
 libs/format/example/sample_formats.cpp
 libs/format/example/sample_new_features.cpp
 libs/format/example/sample_userType.cpp
-libs/functional/function_test.cpp
 libs/functional/hash/examples/books.cpp
 libs/functional/hash/examples/point.cpp
 libs/functional/hash/examples/portable.cpp
@@ -74,7 +72,6 @@ libs/graph/example/dave.cpp
 libs/graph/example/dfs-example.cpp
 libs/graph/example/dfs_parenthesis.cpp
 libs/graph/example/dijkstra-example.cpp
-libs/graph/example/edmunds-karp-eg.cpp
 libs/graph/example/family-tree-eg.cpp
 libs/graph/example/file_dependencies.cpp
 libs/graph/example/fr_layout.cpp
@@ -102,9 +99,6 @@ libs/graph/example/undirected.cpp
 libs/graph/example/undirected_dfs.cpp
 libs/graph/test/dominator_tree_test.cpp
 libs/graph/test/graph.cpp
-libs/integer/cstdint_test.cpp
-libs/integer/integer_test.cpp
-libs/integer/integer_traits_test.cpp
 libs/integer/test/integer_mask_test.cpp
 libs/integer/test/static_log2_test.cpp
 libs/integer/test/static_min_max_test.cpp
@@ -324,8 +318,6 @@ libs/range/test/reversible_range.cpp
 libs/range/test/std_container.cpp
 libs/range/test/string.cpp
 libs/range/test/sub_range.cpp
-libs/rational/rational_example.cpp
-libs/rational/rational_test.cpp
 libs/regex/build/generic.mak
 libs/regex/example/grep/grep.cpp
 libs/regex/example/snippets/captures_example.cpp
@@ -454,7 +446,6 @@ libs/test/test/test_files/errors_handling_test.pattern
 libs/test/test/test_files/result_report_test.pattern
 libs/test/test/test_fp_comparisons.cpp
 libs/test/test/test_tools_test.cpp
-libs/timer/timer_test.cpp
 libs/type_traits/examples/copy_example.cpp
 libs/type_traits/examples/fill_example.cpp
 libs/type_traits/examples/iter_swap_example.cpp
@@ -471,7 +462,6 @@ libs/utility/shared_iterator_example3.cpp
 libs/wave/ChangeLog
 LICENSE_1_0.txt
 more/blanket-permission.txt
-tools/build/v2/doc/userman.pdf
 tools/build/v2/hacking.txt
 tools/inspect/build/Jamfile.v2
 tools/inspect/inspect.cpp