pool/boost
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 402896 from home:adrianSuSE:FreeCAD2

Browse Source 
solve the quickbook problem also

OBS-URL: https://build.opensuse.org/request/show/402896
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=167
This commit is contained in:
Adrian Schröter 2016-06-20 13:27:48 +00:00 committed by Git OBS Bridge
parent f121677c7a
commit 69c44dbcfa
8 changed files with 77 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
baselibs.conf
View File

@ -1,24 +1,24 @@
boost-devel boost_1_61-devel
requires -boost-<targettype> requires -boost-<targettype>
libboost_atomic1_60_0 libboost_atomic1_61_0
libboost_container1_60_0 libboost_container1_61_0
libboost_context1_60_0 libboost_context1_61_0
libboost_coroutine1_60_0 libboost_coroutine1_61_0
libboost_date_time1_60_0 libboost_date_time1_61_0
libboost_filesystem1_60_0 libboost_filesystem1_61_0
libboost_graph1_60_0 libboost_graph1_61_0
libboost_graph_parallel1_60_0 libboost_graph_parallel1_61_0
libboost_iostreams1_60_0 libboost_iostreams1_61_0
libboost_math1_60_0 libboost_math1_61_0
libboost_mpi1_60_0 libboost_mpi1_61_0
libboost_test1_60_0 libboost_test1_61_0
libboost_program_options1_60_0 libboost_program_options1_61_0
libboost_python1_60_0 libboost_python1_61_0
libboost_random1_60_0 libboost_random1_61_0
libboost_serialization1_60_0 libboost_serialization1_61_0
libboost_signals1_60_0 libboost_signals1_61_0
libboost_system1_60_0 libboost_system1_61_0
libboost_thread1_60_0 libboost_thread1_61_0
libboost_type_erasure1_60_0 libboost_type_erasure1_61_0
libboost_wave1_60_0 libboost_wave1_61_0
libboost_regex1_60_0 libboost_regex1_61_0

32
boost-1.59-test-fenv.patch
View File

@ -1,32 +0,0 @@
commit 2f3b98e640c25fe45ae691a5aa950745380b983e
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Mon Sep 14 15:05:24 2015 +0100
Do not qualify <fenv.h> 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 */

13
boost-deprecated-type_traits.patch
View File

@ -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<Directed, bidirectionalS>::value)>::value);
+ BOOST_STATIC_ASSERT(!(is_same<Directed, bidirectionalS>::value));
typedef typename mpl::if_<is_directed,
bidirectional_tag, undirected_tag>::type

32
boost-visibility.patch
View File

@ -5,8 +5,8 @@
Index: boost/archive/impl/basic_xml_grammar.hpp 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.orig
+++ boost/archive/impl/basic_xml_grammar.hpp 2015-12-08 15:47:11.506885556 +0100 +++ boost/archive/impl/basic_xml_grammar.hpp
@@ -135,7 +135,7 @@ private: @@ -135,7 +135,7 @@ private:
Sch, Sch,
NameChar; NameChar;
@ -33,21 +33,21 @@ Index: boost/archive/impl/basic_xml_grammar.hpp
- bool parse_end_tag(IStream & is) const; - bool parse_end_tag(IStream & is) const;
- bool parse_string(IStream & is, StringType & s) /*const*/; - bool parse_string(IStream & is, StringType & s) /*const*/;
- void init(IStream & is); - void init(IStream & is);
- void windup(IStream & is); - bool windup(IStream & is);
- basic_xml_grammar(); - basic_xml_grammar();
+ BOOST_SYMBOL_VISIBLE bool parse_start_tag(IStream & is) /*const*/; + 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_end_tag(IStream & is) const;
+ BOOST_SYMBOL_VISIBLE bool parse_string(IStream & is, StringType & s) /*const*/; + BOOST_SYMBOL_VISIBLE bool parse_string(IStream & is, StringType & s) /*const*/;
+ BOOST_SYMBOL_VISIBLE void init(IStream & is); + 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(); + BOOST_SYMBOL_VISIBLE basic_xml_grammar();
}; };
} // namespace archive } // namespace archive
Index: libs/serialization/src/basic_xml_grammar.ipp 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.orig
+++ libs/serialization/src/basic_xml_grammar.ipp 2015-12-08 15:41:23.620854565 +0100 +++ libs/serialization/src/basic_xml_grammar.ipp
@@ -173,7 +173,7 @@ struct append_lit { @@ -173,7 +173,7 @@ struct append_lit {
} // namespace anonymous } // namespace anonymous
@ -57,7 +57,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp
typename basic_xml_grammar<CharType>::IStream & is, typename basic_xml_grammar<CharType>::IStream & is,
const rule_t & rule_, const rule_t & rule_,
CharType delimiter CharType delimiter
@@ -211,7 +211,7 @@ bool basic_xml_grammar<CharType>::my_par @@ -209,7 +209,7 @@ bool basic_xml_grammar<CharType>::my_par
} }
template<class CharType> template<class CharType>
@ -66,7 +66,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp
typename basic_xml_grammar<CharType>::IStream & is typename basic_xml_grammar<CharType>::IStream & is
){ ){
rv.class_name.resize(0); rv.class_name.resize(0);
@@ -219,12 +219,12 @@ bool basic_xml_grammar<CharType>::parse_ @@ -217,12 +217,12 @@ bool basic_xml_grammar<CharType>::parse_
} }
template<class CharType> template<class CharType>
@ -81,7 +81,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp
rv.contents.resize(0); rv.contents.resize(0);
bool result = my_parse(is, content, '<'); bool result = my_parse(is, content, '<');
// note: unget caused a problem with dinkumware. replace with // note: unget caused a problem with dinkumware. replace with
@@ -237,7 +237,7 @@ bool basic_xml_grammar<CharType>::parse_ @@ -235,7 +235,7 @@ bool basic_xml_grammar<CharType>::parse_
} }
template<class CharType> template<class CharType>
@ -90,7 +90,7 @@ Index: libs/serialization/src/basic_xml_grammar.ipp
init_chset(); init_chset();
S = S =
@@ -434,7 +434,7 @@ basic_xml_grammar<CharType>::basic_xml_g @@ -432,7 +432,7 @@ basic_xml_grammar<CharType>::basic_xml_g
} }
template<class CharType> template<class CharType>
@ -99,12 +99,12 @@ Index: libs/serialization/src/basic_xml_grammar.ipp
init_chset(); init_chset();
if(! my_parse(is, XMLDecl)) if(! my_parse(is, XMLDecl))
boost::serialization::throw_exception( boost::serialization::throw_exception(
@@ -455,7 +455,7 @@ void basic_xml_grammar<CharType>::init(I @@ -453,7 +453,7 @@ void basic_xml_grammar<CharType>::init(I
} }
template<class CharType> template<class CharType>
-void basic_xml_grammar<CharType>::windup(IStream & is){ -bool basic_xml_grammar<CharType>::windup(IStream & is) {
+BOOST_SYMBOL_VISIBLE void basic_xml_grammar<CharType>::windup(IStream & is){ +BOOST_SYMBOL_VISIBLE bool basic_xml_grammar<CharType>::windup(IStream & is) {
if(is.fail() || is.eof()) return my_parse(is, ETag);
return; }
// uh-oh - don't throw exception from code called by a destructor !

3
boost_1_60_0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b
size 76553944

19
boost.changes → boost_1_61.changes
View File

@ -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 Tue Mar 29 20:06:05 UTC 2016 - dmitry_r@opensuse.org

34
boost.spec → boost_1_61.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package boost # spec file for package boost_1_61
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
@ -16,11 +16,11 @@
# #
%define ver 1.60.0 %define ver 1.61.0
%define file_version 1_60_0 %define file_version 1_61_0
%define docs_version 1.56.0 %define docs_version 1.56.0
%define short_version 1_56 %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 #Only define to 1 to generate the man pages
%define build_docs 0 %define build_docs 0
#Define to 0 to not package the pdf documentation #Define to 0 to not package the pdf documentation
@ -61,16 +61,16 @@
%else %else
%define all_libs %{most_libs} %define all_libs %{most_libs}
%endif %endif
Name: boost Name: boost_1_61
Version: 1.60.0 Version: 1.61.0
Release: 0 Release: 0
Summary: Boost C++ Libraries Summary: Boost C++ Libraries
License: BSL-1.0 License: BSL-1.0
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.boost.org 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 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 Source4: existing_extra_docs
#Source5: NEWS #Source5: NEWS
Source100: baselibs.conf Source100: baselibs.conf
@ -83,12 +83,10 @@ Patch6: boost-use_std_xml_catalog.patch
Patch7: boost-rpmoptflags-only.patch Patch7: boost-rpmoptflags-only.patch
Patch9: boost-aarch64-flags.patch Patch9: boost-aarch64-flags.patch
Patch10: boost-disable-pch-on-aarch64.patch Patch10: boost-disable-pch-on-aarch64.patch
Patch12: boost-1.59-test-fenv.patch
Patch13: boost-visibility.patch Patch13: boost-visibility.patch
Patch14: boost-1.57.0-python-libpython_dep.patch Patch14: boost-1.57.0-python-libpython_dep.patch
Patch15: boost-1.57.0-python-abi_letters.patch Patch15: boost-1.57.0-python-abi_letters.patch
Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch
Patch17: boost-deprecated-type_traits.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
@ -140,6 +138,7 @@ Summary: Development package for Boost C++
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{all_libs} Requires: %{all_libs}
Requires: libstdc++-devel Requires: libstdc++-devel
Provides: boost-devel = %version
%description devel %description devel
This package contains all that is needed to develop/compile 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. This package contains the Boost::TypeErasure runtime library.
%if %{build_quickbook} %if %{build_quickbook}
%package -n quickbook %package quickbook
Summary: Documentation tool geared towards C++ Summary: Documentation tool geared towards C++
Group: Development/Tools/Doc Generators Group: Development/Tools/Doc Generators
Requires: boost-license%{lib_appendix} Requires: boost-license%{lib_appendix}
Provides: quickbook = %version
#Requires: libstdc++-devel #Requires: libstdc++-devel
%description -n quickbook %description quickbook
QuickBook is a WikiWiki style documentation tool geared towards C++ QuickBook is a WikiWiki style documentation tool geared towards C++
documentation using simple rules and markup for simple formatting documentation using simple rules and markup for simple formatting
tasks. tasks.
%endif %endif
%prep %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 ... #everything in the tarball has the executable flag set ...
find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} + find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} +
%patch1 -p1 %patch1 -p1
@ -441,12 +441,10 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
%patch7 %patch7
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch12 -p1
%patch13 %patch13
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1
#stupid build machinery copies .orig files #stupid build machinery copies .orig files
find . -name \*.orig -exec rm {} + find . -name \*.orig -exec rm {} +
@ -628,7 +626,7 @@ rm -rf %{buildroot}%{my_docdir}/boost
ln -s %{_includedir}/boost %{buildroot}%{my_docdir} ln -s %{_includedir}/boost %{buildroot}%{my_docdir}
ln -s ../LICENSE_1_0.txt %{buildroot}%{my_docdir}/libs ln -s ../LICENSE_1_0.txt %{buildroot}%{my_docdir}/libs
find %{buildroot}%{my_docdir} -name \*.py -exec chmod -x {} + 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 rm -f %{buildroot}%{_libdir}/*.a
#symlink dupes #symlink dupes
%fdupes %{buildroot} %fdupes %{buildroot}
@ -882,10 +880,10 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook
%if %{package_pdf} %if %{package_pdf}
%files doc-pdf %files doc-pdf
%defattr(-, root, root, -) %defattr(-, root, root, -)
%doc ../%{name}_%{short_version}_pdf/*.pdf %doc ../boost_%{short_version}_pdf/*.pdf
%endif %endif
%files -n quickbook %files quickbook
%defattr(-, root, root, -) %defattr(-, root, root, -)
%{_bindir}/quickbook %{_bindir}/quickbook

3
boost_1_61_0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640
size 85202254