diff --git a/baselibs.conf b/baselibs.conf index ba3e3fa..39095e5 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,24 +1,24 @@ -boost-devel +boost_1_61-devel requires -boost- -libboost_atomic1_60_0 -libboost_container1_60_0 -libboost_context1_60_0 -libboost_coroutine1_60_0 -libboost_date_time1_60_0 -libboost_filesystem1_60_0 -libboost_graph1_60_0 -libboost_graph_parallel1_60_0 -libboost_iostreams1_60_0 -libboost_math1_60_0 -libboost_mpi1_60_0 -libboost_test1_60_0 -libboost_program_options1_60_0 -libboost_python1_60_0 -libboost_random1_60_0 -libboost_serialization1_60_0 -libboost_signals1_60_0 -libboost_system1_60_0 -libboost_thread1_60_0 -libboost_type_erasure1_60_0 -libboost_wave1_60_0 -libboost_regex1_60_0 +libboost_atomic1_61_0 +libboost_container1_61_0 +libboost_context1_61_0 +libboost_coroutine1_61_0 +libboost_date_time1_61_0 +libboost_filesystem1_61_0 +libboost_graph1_61_0 +libboost_graph_parallel1_61_0 +libboost_iostreams1_61_0 +libboost_math1_61_0 +libboost_mpi1_61_0 +libboost_test1_61_0 +libboost_program_options1_61_0 +libboost_python1_61_0 +libboost_random1_61_0 +libboost_serialization1_61_0 +libboost_signals1_61_0 +libboost_system1_61_0 +libboost_thread1_61_0 +libboost_type_erasure1_61_0 +libboost_wave1_61_0 +libboost_regex1_61_0 diff --git a/boost-1.59-test-fenv.patch b/boost-1.59-test-fenv.patch deleted file mode 100644 index b020275..0000000 --- a/boost-1.59-test-fenv.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 2f3b98e640c25fe45ae691a5aa950745380b983e -Author: Jonathan Wakely -Date: Mon Sep 14 15:05:24 2015 +0100 - - Do not qualify names that might be macros. - -diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp -index 3a9e779..8b319df 100644 ---- a/boost/test/impl/execution_monitor.ipp -+++ b/boost/test/impl/execution_monitor.ipp -@@ -1380,8 +1380,8 @@ enable( unsigned mask ) - - return ~old_cw & BOOST_FPE_ALL; - #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) -- ::feclearexcept(BOOST_FPE_ALL); -- int res = ::feenableexcept( mask ); -+ feclearexcept(BOOST_FPE_ALL); -+ int res = feenableexcept( mask ); - return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; - #else - /* Not Implemented */ -@@ -1417,8 +1417,8 @@ disable( unsigned mask ) - - return ~old_cw & BOOST_FPE_ALL; - #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) -- ::feclearexcept(BOOST_FPE_ALL); -- int res = ::fedisableexcept( mask ); -+ feclearexcept(BOOST_FPE_ALL); -+ int res = fedisableexcept( mask ); - return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; - #else - /* Not Implemented */ diff --git a/boost-deprecated-type_traits.patch b/boost-deprecated-type_traits.patch deleted file mode 100644 index 8863c43..0000000 --- a/boost-deprecated-type_traits.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: boost_1_60_0/boost/graph/adjacency_matrix.hpp -=================================================================== ---- boost_1_60_0.orig/boost/graph/adjacency_matrix.hpp -+++ boost_1_60_0/boost/graph/adjacency_matrix.hpp -@@ -443,7 +443,7 @@ namespace boost { - // graph type. Instead, use directedS, which also provides the - // functionality required for a Bidirectional Graph (in_edges, - // in_degree, etc.). -- BOOST_STATIC_ASSERT(type_traits::ice_not<(is_same::value)>::value); -+ BOOST_STATIC_ASSERT(!(is_same::value)); - - typedef typename mpl::if_::type diff --git a/boost-visibility.patch b/boost-visibility.patch index 5265698..15e6c1a 100644 --- a/boost-visibility.patch +++ b/boost-visibility.patch @@ -5,8 +5,8 @@ Index: boost/archive/impl/basic_xml_grammar.hpp =================================================================== ---- boost/archive/impl/basic_xml_grammar.hpp.orig 2015-05-23 20:51:06.000000000 +0200 -+++ boost/archive/impl/basic_xml_grammar.hpp 2015-12-08 15:47:11.506885556 +0100 +--- boost/archive/impl/basic_xml_grammar.hpp.orig ++++ boost/archive/impl/basic_xml_grammar.hpp @@ -135,7 +135,7 @@ private: Sch, NameChar; @@ -33,21 +33,21 @@ Index: boost/archive/impl/basic_xml_grammar.hpp - bool parse_end_tag(IStream & is) const; - bool parse_string(IStream & is, StringType & s) /*const*/; - void init(IStream & is); -- void windup(IStream & is); +- bool windup(IStream & is); - basic_xml_grammar(); + BOOST_SYMBOL_VISIBLE bool parse_start_tag(IStream & is) /*const*/; + BOOST_SYMBOL_VISIBLE bool parse_end_tag(IStream & is) const; + BOOST_SYMBOL_VISIBLE bool parse_string(IStream & is, StringType & s) /*const*/; + BOOST_SYMBOL_VISIBLE void init(IStream & is); -+ BOOST_SYMBOL_VISIBLE void windup(IStream & is); ++ BOOST_SYMBOL_VISIBLE bool windup(IStream & is); + BOOST_SYMBOL_VISIBLE basic_xml_grammar(); }; } // namespace archive Index: libs/serialization/src/basic_xml_grammar.ipp =================================================================== ---- libs/serialization/src/basic_xml_grammar.ipp.orig 2015-05-23 20:51:06.000000000 +0200 -+++ libs/serialization/src/basic_xml_grammar.ipp 2015-12-08 15:41:23.620854565 +0100 +--- libs/serialization/src/basic_xml_grammar.ipp.orig ++++ libs/serialization/src/basic_xml_grammar.ipp @@ -173,7 +173,7 @@ struct append_lit { } // namespace anonymous @@ -57,7 +57,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp typename basic_xml_grammar::IStream & is, const rule_t & rule_, CharType delimiter -@@ -211,7 +211,7 @@ bool basic_xml_grammar::my_par +@@ -209,7 +209,7 @@ bool basic_xml_grammar::my_par } template @@ -66,7 +66,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp typename basic_xml_grammar::IStream & is ){ rv.class_name.resize(0); -@@ -219,12 +219,12 @@ bool basic_xml_grammar::parse_ +@@ -217,12 +217,12 @@ bool basic_xml_grammar::parse_ } template @@ -81,7 +81,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp rv.contents.resize(0); bool result = my_parse(is, content, '<'); // note: unget caused a problem with dinkumware. replace with -@@ -237,7 +237,7 @@ bool basic_xml_grammar::parse_ +@@ -235,7 +235,7 @@ bool basic_xml_grammar::parse_ } template @@ -90,7 +90,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp init_chset(); S = -@@ -434,7 +434,7 @@ basic_xml_grammar::basic_xml_g +@@ -432,7 +432,7 @@ basic_xml_grammar::basic_xml_g } template @@ -99,12 +99,12 @@ Index: libs/serialization/src/basic_xml_grammar.ipp init_chset(); if(! my_parse(is, XMLDecl)) boost::serialization::throw_exception( -@@ -455,7 +455,7 @@ void basic_xml_grammar::init(I +@@ -453,7 +453,7 @@ void basic_xml_grammar::init(I } template --void basic_xml_grammar::windup(IStream & is){ -+BOOST_SYMBOL_VISIBLE void basic_xml_grammar::windup(IStream & is){ - if(is.fail() || is.eof()) - return; - // uh-oh - don't throw exception from code called by a destructor ! +-bool basic_xml_grammar::windup(IStream & is) { ++BOOST_SYMBOL_VISIBLE bool basic_xml_grammar::windup(IStream & is) { + return my_parse(is, ETag); + } + diff --git a/boost_1_60_0.tar.bz2 b/boost_1_60_0.tar.bz2 deleted file mode 100644 index 365bf7d..0000000 --- a/boost_1_60_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b -size 76553944 diff --git a/boost.changes b/boost_1_61.changes similarity index 99% rename from boost.changes rename to boost_1_61.changes index aaaccab..7918055 100644 --- a/boost.changes +++ b/boost_1_61.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Jun 17 08:32:41 UTC 2016 - adrian@suse.de + +- build quickbook also in versioned package + +------------------------------------------------------------------- +Tue Jun 14 12:45:30 UTC 2016 - adrian@suse.de + +- update to version 1.61.0 + Details on http://www.boost.org/users/history/version_1_61_0.html + Obsolete patches: + * boost-1.59-test-fenv.patch + * boost-deprecated-type_traits.patch + +------------------------------------------------------------------- +Tue Jun 14 07:32:55 UTC 2016 - adrian@suse.de + +- rename package to boost-1_60 to allow multiple versions + ------------------------------------------------------------------- Tue Mar 29 20:06:05 UTC 2016 - dmitry_r@opensuse.org diff --git a/boost.spec b/boost_1_61.spec similarity index 97% rename from boost.spec rename to boost_1_61.spec index f6373d9..9979edf 100644 --- a/boost.spec +++ b/boost_1_61.spec @@ -1,5 +1,5 @@ # -# spec file for package boost +# spec file for package boost_1_61 # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -16,11 +16,11 @@ # -%define ver 1.60.0 -%define file_version 1_60_0 +%define ver 1.61.0 +%define file_version 1_61_0 %define docs_version 1.56.0 %define short_version 1_56 -%define lib_appendix 1_60_0 +%define lib_appendix 1_61_0 #Only define to 1 to generate the man pages %define build_docs 0 #Define to 0 to not package the pdf documentation @@ -61,16 +61,16 @@ %else %define all_libs %{most_libs} %endif -Name: boost -Version: 1.60.0 +Name: boost_1_61 +Version: 1.61.0 Release: 0 Summary: Boost C++ Libraries License: BSL-1.0 Group: Development/Libraries/C and C++ Url: http://www.boost.org -Source0: http://downloads.sourceforge.net/project/boost/boost/%{version}/%{name}_%{file_version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/boost/boost/%{version}/boost_%{file_version}.tar.bz2 Source1: boost-rpmlintrc -Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{docs_version}/%{name}_%{short_version}_pdf.tar.bz2 +Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{docs_version}/boost_%{short_version}_pdf.tar.bz2 Source4: existing_extra_docs #Source5: NEWS Source100: baselibs.conf @@ -83,12 +83,10 @@ Patch6: boost-use_std_xml_catalog.patch Patch7: boost-rpmoptflags-only.patch Patch9: boost-aarch64-flags.patch Patch10: boost-disable-pch-on-aarch64.patch -Patch12: boost-1.59-test-fenv.patch Patch13: boost-visibility.patch Patch14: boost-1.57.0-python-libpython_dep.patch Patch15: boost-1.57.0-python-abi_letters.patch Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch -Patch17: boost-deprecated-type_traits.patch BuildRequires: chrpath BuildRequires: dos2unix BuildRequires: fdupes @@ -140,6 +138,7 @@ Summary: Development package for Boost C++ Group: Development/Libraries/C and C++ Requires: %{all_libs} Requires: libstdc++-devel +Provides: boost-devel = %version %description devel This package contains all that is needed to develop/compile @@ -416,20 +415,21 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::TypeErasure runtime library. %if %{build_quickbook} -%package -n quickbook +%package quickbook Summary: Documentation tool geared towards C++ Group: Development/Tools/Doc Generators Requires: boost-license%{lib_appendix} +Provides: quickbook = %version #Requires: libstdc++-devel -%description -n quickbook +%description quickbook QuickBook is a WikiWiki style documentation tool geared towards C++ documentation using simple rules and markup for simple formatting tasks. %endif %prep -%setup -q -n %{name}_%{file_version} -b 3 +%setup -q -n boost_%{file_version} -b 3 #everything in the tarball has the executable flag set ... find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} + %patch1 -p1 @@ -441,12 +441,10 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch7 %patch9 -p1 %patch10 -p1 -%patch12 -p1 %patch13 %patch14 -p1 %patch15 -p1 %patch16 -p1 -%patch17 -p1 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} + @@ -628,7 +626,7 @@ rm -rf %{buildroot}%{my_docdir}/boost ln -s %{_includedir}/boost %{buildroot}%{my_docdir} ln -s ../LICENSE_1_0.txt %{buildroot}%{my_docdir}/libs find %{buildroot}%{my_docdir} -name \*.py -exec chmod -x {} + -chmod -x ../%{name}_%{short_version}_pdf/*.pdf +chmod -x ../boost_%{short_version}_pdf/*.pdf rm -f %{buildroot}%{_libdir}/*.a #symlink dupes %fdupes %{buildroot} @@ -882,10 +880,10 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook %if %{package_pdf} %files doc-pdf %defattr(-, root, root, -) -%doc ../%{name}_%{short_version}_pdf/*.pdf +%doc ../boost_%{short_version}_pdf/*.pdf %endif -%files -n quickbook +%files quickbook %defattr(-, root, root, -) %{_bindir}/quickbook diff --git a/boost_1_61_0.tar.bz2 b/boost_1_61_0.tar.bz2 new file mode 100644 index 0000000..08d75bc --- /dev/null +++ b/boost_1_61_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640 +size 85202254