rpms/adobe-source-libraries
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Orphaned

Browse source
This commit is contained in:
Alec Leamas 2019-02-17 14:57:31 +01:00
commit c29aecd18a
16 changed files with 1 additions and 812 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1 +0,0 @@
/asl_1.0.43.tgz

13
README.fedora
View file

@ -1,13 +0,0 @@
In the fedora version the any_iterator has the ability to relax some
checks as outlined in https://svn.boost.org/trac/boost/ticket/4647.
To enable this, set the NO_ASL_AI_CONCEPT_CHECK symbol e. g.,
#ifndef __MLIB_SDK_ASL_ANY_ITER_H__
#define __MLIB_SDK_ASL_ANY_ITER_H__
#define NO_ASL_AI_CONCEPT_CHECK
#include <adobe/any_iterator.hpp>
#endif // #ifndef __MLIB_SDK_ASL_ANY_ITER_H__

8
adobe-source-libraries.pc
View file

@ -1,8 +0,0 @@
prefix=/usr
includedir=/usr/include
Name: adobe-source-libraries
Description: General purpose addon to STL and Boost.
Version: 1.0.43
Libs: -lasl_dev
Cflags: -I${includedir}/adobe

301
adobe-source-libraries.spec
View file

@ -1,301 +0,0 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: adobe-source-libraries
Version: 1.0.43
Release: 45%{?dist}
Summary: General purpose C++ libraries
# License breakdown: http://stlab.adobe.com/licenses.html
License: MIT
URL: http://stlab.adobe.com/
Source0: http://downloads.sourceforge.net/project/adobe-source/adobe-source/%{version}/asl_%{version}.tgz
# pkg-config(1) configuration file, part of packaging.
Source1: adobe-source-libraries.pc
Source2: README.fedora
# https://sourceforge.net/tracker/?func=detail&aid=3487687&group_id=132417&atid=724218
# (pathch0, patch1)
Patch0: asl-gcc5.patch
Patch1: asl-fedora-build-options.patch
# https://svn.boost.org/trac/boost/ticket/4647
Patch2: asl-no-concept-check1043.patch
# https://svn.boost.org/trac/boost/ticket/6940
Patch3: asl-time-utc.patch
Patch4: asl-boost-1.50.patch
Patch6: asl-boost-1.57.patch
Patch7: asl-boost-1.60.patch
Patch8: asl-gcc6.patch
BuildRequires: boost-build
BuildRequires: boost-devel
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: tbb-devel
BuildRequires: texlive-dvips texlive-latex
# needs to match TBB
ExcludeArch: s390 s390x
%description
ASL provides peer-reviewed and portable C++ source libraries. The
libraries are intended to be widely useful, leveraging and extending
both the C++ Standard Library and the Boost Libraries.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
Libraries and header files for developing applications that
use %{name}.
%package doc
Summary: Documentation
Requires: %{name} = %{version}-%{release}
%description doc
API and other documentation for Adobe Source Libraries (ASL).
%prep
%setup -qn source_release
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
find . \( -name *.hpp -o -name *.jpg \) -executable -exec chmod 644 {} \;
iconv -f iso8859-1 -t utf-8 release_notes.txt > release_notes.txt.conv && \
mv -f release_notes.txt.conv release_notes.txt
chmod 644 LICENSE_1_0_0.txt
sed -i 's!@optflags@!%{optflags}!g' jamroot.jam
sed -i 's/@version@/%{version}/g' %{SOURCE1}
mv boost-build.jam boost-build.nojam
%build
# Using static lib (relinked in next step) due to soname problems:
# https://svn.boost.org/trac/boost/ticket/2746.
bjam link=static toolset=gcc variant=release asl_dev
rm -rf tmp; mkdir tmp; cd tmp
ar x ../../built_artifacts/*/*/*/*/threading-multi/libasl_dev.a
gcc -shared -g -Wl,-soname=libasl_dev.so.%{version} -Wl,-as-needed \
*.o -o ../libasl_dev.so.%{version} \
-lboost_thread -lboost_signals -lboost_filesystem
#bjam link=static toolset=gcc variant=release documentation/examples
cd ../documentation
./build_docs.pl
%install
cp %SOURCE2 .
cd documentation
rm -f build_docs.pl
find . -name *.dox -delete
rm -rf asl doxygen_support_files doxyfile performance stldoc \
structure tutorials widget_lib
# https://sourceforge.net/projects/adobe-source/forums/forum/449268/topic/5126565
[ -s performance/index.html ] || rm -f performance/index.html
mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
cd ..
mv documentation %{buildroot}%{_datadir}/doc/%{name}-%{version}
mkdir -p %{buildroot}%{_libdir}/pkgconfig
cp %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig
mkdir -p %{buildroot}%{_includedir}
cp -ar adobe %{buildroot}%{_includedir}
sofile=libasl_dev.so.%{version}
mkdir -p %{buildroot}%{_libdir}
install -m 755 $sofile %{buildroot}%{_libdir}
cd %{buildroot}%{_libdir}
ln -sf $sofile ${sofile%%.*}
ln -sf $sofile ${sofile%%.*.*}
ln -sf $sofile ${sofile%%.*.*.*}
%ldconfig_scriptlets
%files
%doc LICENSE_1_0_0.txt read_me.html release_notes.txt README.fedora
%{_libdir}/*.so.*
%exclude %{_pkgdocdir}/documentation
%files devel
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%files doc
%doc %{_datadir}/doc/%{name}-%{version}/documentation
%changelog
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.43-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Nov 01 2018 Alec Leamas <leamas.alec@gmail.com> - 1.0.43-44
- Add missing BR: gcc-c++
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.43-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.43-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 22 2018 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-41
- Rebuilt for Boost 1.66
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.43-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.43-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-38
- Rebuilt for s390x binutils bug
* Mon Jul 03 2017 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-37
- Rebuilt for Boost 1.64
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.43-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.43-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-34
- Rebuilt for Boost 1.63
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-33
- Rebuilt for Boost 1.63
* Mon May 16 2016 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-32
- Rebuilt for linker errors in boost (#1331983)
- Patched for C++14 support in GCC 6
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.43-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jan 14 2016 Jonathan Wakely <jwakely@redhat.com> 1.0.43-30
- Add patch for Boost 1.60.0
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-29
- Rebuilt for Boost 1.59
* Wed Aug 05 2015 Jonathan Wakely <jwakely@redhat.com> 1.0.43-28
- Update patches for GCC 5 compatiblity.
- Fix changelog dates.
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.43-27
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.0.43-26
- rebuild for Boost 1.58
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.43-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu Jan 29 2015 Petr Machata <pmachata@redhat.com> - 1.0.43-24
- Rebuild for boost 1.57.0
- Mention namespace at several adobe::move calls (asl-boost-1.57.patch)
* Sat Oct 25 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.43-23
- sync tbb arches
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.43-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.43-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.0.43-20
- Rebuild for boost 1.55.0
* Fri Aug 09 2013 Alec Leamas <leamas@nowhere.net> - 1.0.43-19
- Fix f20 unversioned docdir glitch
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.43-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sat Jul 27 2013 Petr Machata <pmachata@redhat.com> - 1.0.43-17
- Rebuild for boost 1.54.0
- Boost package doesn't use tagged sonames anymore, drop the -mt
suffix from linker command line.
* Fri May 24 2013 Petr Machata <pmachata@redhat.com> - 1.0.43-16
- Rebuild for TBB memory barrier bug
* Sat Feb 16 2013 Alec Leamas <leamas@nowhere.net> - 1.0.43-15
- Patching for new gcc version (C11 compatibility).
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.0.43-14
- Rebuild for Boost-1.53.0
* Fri Aug 3 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-13
- Updating to boost 1.50.
* Fri Aug 3 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-12
- Handling boost bug 6940
* Thu Apr 5 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-11
- Fixing hard-coded version in .pc file
* Tue Apr 3 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-10
- Adding README.fedora, typos in spec fixed.
* Sun Apr 1 2012 Dan Horák <dan[at]danny.cz> 1.0.43-9
- set ExclusiveArch to match TBB
* Wed Mar 28 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-8
- Adding Patch2: Relaxing certain tests to fit bombono-dvd
* Tue Mar 20 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-7
- Removing remaining documentation sources, minor fixes
* Mon Mar 19 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-7
- Removing documentation from base package (%%exclude)
- Removing .dox files from documentation
* Mon Mar 19 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-7
- Fixing bad source URL.
- Handling empty performance/index.html
- Moving documentation.
* Sun Mar 18 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-6
- Using boost-build, purging get-source.sh, related clean-up.
- Source0 refers directly to sourceforge.
* Sat Mar 17 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-5
- Updating get-source.sh to exclude APL.
* Fri Mar 16 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-5.fc15
- Updating get-source.sh (wrong version packed in v4)
- Comments update, renamed patch0.
* Sun Feb 19 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-4.fc15
- Fixing David Timms's comment #12.
- Removing unused parts of bundled boost in get-source.sh.
- Documenting boost bundling in spec file.
- Several patches removed, not required anymore.
* Thu Feb 16 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-3.fc15
- Even better handling of instruction set (removed it).
- Factored out fedora flags to new patch.
* Wed Feb 15 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-2.fc15
- Fixed linkage problems in installed package.
- Better handling of instruction set in %%prep.
* Fri Feb 10 2012 Alec Leamas <leamas@nowhere.net> 1.0.43-1.fc15
- Initial package

42
asl-C11.patch
View file

@ -1,42 +0,0 @@
diff --git a/adobe/cmath.hpp b/adobe/cmath.hpp
index 733c299..e671f7c 100644
--- a/adobe/cmath.hpp
+++ b/adobe/cmath.hpp
@@ -37,18 +37,9 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
#define ADOBE_HAS_CPP_CMATH
#elif __GNUC__ == 4
-#if (__GNUC_MINOR__ <= 7) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
-// at least Ubuntu 9.x, gcc 4.4.1, still falls into this case
-/*
- The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
-*/
-#define ADOBE_HAS_C99_MATH_H
-#include <cmath>
-#else
-#include <tr1/cmath>
#define ADOBE_HAS_C99_STD_MATH_H
-#endif
+#include <tr1/cmath>
#endif
#elif defined(_MSC_VER)
@@ -73,12 +64,12 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
namespace adobe {
-using std::float_t;
-using std::double_t;
+using std::tr1::float_t;
+using std::tr1::double_t;
-using std::round;
-using std::lround;
-using std::trunc;
+using std::tr1::round;
+using std::tr1::lround;
+using std::tr1::trunc;
} // namespace adobe

81
asl-boost-1.50.patch
View file

@ -1,81 +0,0 @@
diff --git a/adobe/move.hpp b/adobe/move.hpp
index 350000d..5fe6db5 100644
--- a/adobe/move.hpp
+++ b/adobe/move.hpp
@@ -441,7 +441,7 @@ with move semantics, for movable types, otherwise with copy semantics.
template <typename I, // I models BidirectionalRange
typename O> // O models BidirectionalIterator
inline O move_backward(I& in, O out)
-{ return move_backward(boost::begin(in), boost::end(in), out); }
+{ return adobe::move_backward(boost::begin(in), boost::end(in), out); }
/*************************************************************************************************/
diff --git a/adobe/once.hpp b/adobe/once.hpp
index 5f005a4..e349b92 100644
--- a/adobe/once.hpp
+++ b/adobe/once.hpp
@@ -11,12 +11,12 @@
/*************************************************************************************************/
-#include <adobe/config.hpp>
-
#if defined(BOOST_HAS_THREADS)
#include <boost/thread.hpp>
#endif
+#include <adobe/config.hpp>
+
/*************************************************************************************************/
namespace adobe {
diff --git a/adobe/vector.hpp b/adobe/vector.hpp
index 926cfa9..8968b59 100644
--- a/adobe/vector.hpp
+++ b/adobe/vector.hpp
@@ -319,7 +319,7 @@ void vector<T, A>::append_move(I f, I l, std::forward_iterator_tag)
size_type n(std::distance(f, l));
if (remaining() < n) reserve((adobe::max)(size() + n, 2 * size()));
- set_finish(uninitialized_move(f, l, end()));
+ set_finish(adobe::uninitialized_move(f, l, end()));
}
template <typename T, typename A>
@@ -354,7 +354,7 @@ typename vector<T, A>::iterator vector<T, A>::insert(iterator p, I f, I l, std::
if (n < after) {
append_move(last - n, last);
- move_backward(p, last - n, last);
+ adobe::move_backward(p, last - n, last);
std::copy(f, l, p);
} else {
I m = f;
@@ -387,7 +387,7 @@ typename vector<T, A>::iterator vector<T, A>::insert_move(iterator p, I f, I l)
if (n < after) {
append_move(last - n, last);
- move_backward(p, last - n, last);
+ adobe::move_backward(p, last - n, last);
adobe::move(f, l, p);
} else {
I m = f;
@@ -406,7 +406,7 @@ void vector<T, A>::reserve(size_type n)
if (capacity() < n) {
vector tmp;
tmp.header_m = allocate(get_allocator(), n);
- tmp.header_m->finish() = uninitialized_move(begin(), end(), tmp.end());
+ tmp.header_m->finish() = adobe::uninitialized_move(begin(), end(), tmp.end());
swap(tmp);
}
}
@@ -430,7 +430,7 @@ typename vector<T, A>::iterator vector<T, A>::insert(iterator p, size_type n, co
if (n < after) {
append_move(last - n, last);
- move_backward(p, last - n, last);
+ adobe::move_backward(p, last - n, last);
std::fill_n(p, n, x);
} else {
std::uninitialized_fill_n(last, n - after, x);

41
asl-boost-1.57.patch
View file

@ -1,41 +0,0 @@
diff -up source_release/source/adam.cpp\~ source_release/source/adam.cpp
--- source_release/source/adam.cpp~ 2010-11-08 19:19:49.000000000 +0100
+++ source_release/source/adam.cpp 2015-01-29 01:09:20.085293825 +0100
@@ -576,7 +576,7 @@ void sheet_t::add_constant(name_t consta
{ object_m->add_constant(constant, position, initializer); }
void sheet_t::add_constant(name_t name, any_regular_t value)
-{ object_m->add_constant(name, move(value)); }
+{ object_m->add_constant(name, adobe::move(value)); }
void sheet_t::add_logic(name_t logic, const line_position_t& position, const array_t& expression)
{ object_m->add_logic(logic, position, expression); }
@@ -591,7 +591,7 @@ void sheet_t::add_interface(name_t name,
{ object_m->add_interface(name, linked, position1, initializer, position2, expression); }
void sheet_t::add_interface(name_t name, any_regular_t initial)
-{ object_m->add_interface(name, move(initial)); }
+{ object_m->add_interface(name, adobe::move(initial)); }
void sheet_t::add_relation(const line_position_t& position, const array_t& conditional,
const relation_t* first, const relation_t* last)
@@ -835,7 +835,7 @@ void sheet_t::implementation_t::add_inte
input_index_m.insert(cell);
- cell.state_m = move(initial);
+ cell.state_m = adobe::move(initial);
cell.priority_m = ++priority_high_m;
cell_set_m.push_back(cell_t(access_interface_output, name,
@@ -870,7 +870,7 @@ void sheet_t::implementation_t::add_cons
void sheet_t::implementation_t::add_constant(name_t name, any_regular_t value)
{
- cell_set_m.push_back(cell_t(access_constant, name, move(value), cell_set_m.size()));
+ cell_set_m.push_back(cell_t(access_constant, name, adobe::move(value), cell_set_m.size()));
if (!name_index_m.insert(cell_set_m.back()).second) {
throw std::logic_error(make_string("cell named '", name.c_str(), "'already exists."));
Diff finished. Thu Jan 29 01:09:42 2015

32
asl-boost-1.60.patch
View file

@ -1,32 +0,0 @@
--- source_release/adobe/eve.hpp~ 2015-11-20 11:35:57.541968704 +0000
+++ source_release/adobe/eve.hpp 2015-11-20 11:37:45.443943283 +0000
@@ -14,6 +14,7 @@
#include <utility>
#include <boost/noncopyable.hpp>
+#include <boost/version.hpp>
#include <adobe/forest.hpp>
#include <adobe/extents.hpp>
@@ -38,6 +39,13 @@
#if !defined(ADOBE_NO_DOCUMENTATION)
namespace boost {
+#if BOOST_VERSION >= 106000
+ template <>
+ struct is_pod<adobe::implementation::view_proxy_t>
+ : true_type
+ {
+ };
+#else
namespace detail {
template <>
struct is_pod_impl<adobe::implementation::view_proxy_t>
@@ -45,6 +53,7 @@
BOOST_STATIC_CONSTANT(bool, value = true);
};
}
+#endif
}
#endif

60
asl-fedora-build-options.patch
View file

@ -1,60 +0,0 @@
asl-fedora-flags
From: Alec Leamas <leamas.alec@gmail.com>
Fix fedora compilation flags in jamroot.jam
---
adobe_source_libraries/jamroot.jam | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/jamroot.jam b/adobe_source_libraries/jamroot.jam
index 8c7b593..dfd88c8 100644
--- a/jamroot.jam
+++ b/jamroot.jam
@@ -46,6 +46,7 @@ adobe_requirements =
<toolset>msvc:<define>_WIN32_WINNT=0x400
<toolset>darwin:<cxxflags>"-Werror -Wall -Wno-trigraphs -Wreturn-type -Wnon-virtual-dtor -Woverloaded-virtual -Wformat -Wmissing-braces -Wparentheses -Wswitch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wunknown-pragmas -Wsign-compare"
<toolset>darwin:<linkflags>"-Xlinker -Y -Xlinker 5"
+ <toolset>gcc,<variant>release:<cxxflags>"-fPIC @optflags@ -fpermissive -Wno-long-long -Wno-strict-aliasing -Wno-trigraphs -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-parameter -Wno-unused-variable -Wunknown-pragmas -Wsign-compare -Wno-parentheses"
<toolset>gcc,<variant>debug:<cxxflags>"-Werror -Wall -Wno-trigraphs -Wreturn-type -Wnon-virtual-dtor -Woverloaded-virtual -Wformat -Wmissing-braces -Wparentheses -Wswitch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wunknown-pragmas -Wsign-compare -Wno-parentheses"
# <toolset>gcc-4.5.0:<define>_GLIBCXX_USE_C99_MATH_TR1 # apparent problems using this without using other tr1 libs
<toolset>gcc-4.5.0:<define>__GXX_EXPERIMENTAL_CXX0X__
@@ -63,8 +64,6 @@ asl_requirements =
$(tbb_requirements)
<include>.
<toolset>gcc:<define>NOMINMAX
- <toolset>gcc:<architecture>x86
- <toolset>gcc,<threading>multi:<instruction-set>i486
<toolset>msvc:<cxxflags>"-DUNICODE -D_UNICODE"
<toolset>msvc-8.0:<cxxflags>"/W3 /WX /Wp64 /Zc:wchar_t /Zc:forScope"
<toolset>msvc-9.0:<cxxflags>"/W3 /WX /Zc:wchar_t /Zc:forScope"
@@ -74,10 +73,6 @@ asl_requirements =
$(ASL_ADDITIONAL_MACROS)
<define>BOOST_ALL_NO_LIB
<toolset>darwin:<linkflags>"-lSystemStubs"
- <threading>multi:<library>/boost/thread//boost_thread
- <library>/boost/filesystem
- <library>/boost/system
- <library>/boost/signals
;
project
@@ -116,6 +111,7 @@ switch [ os.name ]
import os ;
+import path ;
local boost-path = [ os.environ BOOST_PATH ] ;
if $(boost-path)
{
@@ -124,8 +120,6 @@ if $(boost-path)
boost-path = [ path.make ../boost_libraries ] ;
}
-use-project /boost : $(boost-path) ;
-
lib asl
: #sources

47
asl-gcc.patch
View file

@ -1,47 +0,0 @@
asl-gcc-4.6
From: Alec Leamas <leamas.alec@gmail.com>
Fixes to for gcc 4.6 - 4.7.
---
adobe/cmath.hpp | 4 ++--
source/any_regular.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/adobe/cmath.hpp b/adobe_source_libraries/adobe/cmath.hpp
index 250a3ef..733c299 100644
--- a/adobe/cmath.hpp
+++ b/adobe/cmath.hpp
@@ -37,7 +37,7 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
#define ADOBE_HAS_CPP_CMATH
#elif __GNUC__ == 4
-#if (__GNUC_MINOR__ < 6) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
+#if (__GNUC_MINOR__ <= 7) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
// at least Ubuntu 9.x, gcc 4.4.1, still falls into this case
/*
The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
@@ -46,7 +46,7 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
#include <cmath>
#else
#include <tr1/cmath>
-s
+
#define ADOBE_HAS_C99_STD_MATH_H
#endif
#endif
diff --git a/source/any_regular.cpp b/adobe_source_libraries/source/any_regular.cpp
index b0826ba..2f4f3fb 100644
--- a/source/any_regular.cpp
+++ b/source/any_regular.cpp
@@ -62,7 +62,7 @@ template <typename T, typename Any = void>
struct make_serializable { static const serializable<T> value; };
template <typename T, typename Any>
-const serializable<T> make_serializable<T, Any>::value;
+const serializable<T> make_serializable<T, Any>::value = serializable<T>();
/**************************************************************************************************/

26
asl-gcc5.patch
View file

@ -1,26 +0,0 @@
--- source_release/adobe/cmath.hpp~ 2015-08-05 12:10:17.637727832 +0100
+++ source_release/adobe/cmath.hpp 2015-08-05 12:24:28.811279909 +0100
@@ -36,19 +36,12 @@
#define ADOBE_HAS_CPP_CMATH
-#elif __GNUC__ == 4
-#if (__GNUC_MINOR__ < 6) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
-// at least Ubuntu 9.x, gcc 4.4.1, still falls into this case
-/*
- The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
-*/
+#elif __GNUC__ >= 4
+
+// GNUC has C99 extensions in math.h but not in <cmath> until C++11.
#define ADOBE_HAS_C99_MATH_H
#include <cmath>
-#else
-#include <tr1/cmath>
-s
-#define ADOBE_HAS_C99_STD_MATH_H
-#endif
+
#endif
#elif defined(_MSC_VER)

14
asl-gcc6.patch
View file

@ -1,14 +0,0 @@
--- source_release/adobe/cmath.hpp.orig 2016-05-16 16:43:02.179719529 +0100
+++ source_release/adobe/cmath.hpp 2016-05-16 16:51:32.576909454 +0100
@@ -39,7 +39,11 @@
#elif __GNUC__ >= 4
// GNUC has C99 extensions in math.h but not in <cmath> until C++11.
+#if __cplusplus >= 20103L
+#define ADOBE_HAS_C99_STD_MATH_H
+#else
#define ADOBE_HAS_C99_MATH_H
+#endif
#include <cmath>
#endif

88
asl-no-concept-check1043.patch
View file

@ -1,88 +0,0 @@
diff -Naur source_release_orig/adobe/any_iterator.hpp source_release/adobe/any_iterator.hpp
--- source_release_orig/adobe/any_iterator.hpp 2010-11-08 21:18:19.000000000 +0300
+++ source_release/adobe/any_iterator.hpp 2012-03-28 16:59:42.000000000 +0400
@@ -47,7 +47,10 @@
{
typedef typename optimized_storage_type<I, poly_iterator_interface<V, R, D> >::type base_t;
+// this is too restrictive check; need to make appropriate one
+#ifndef NO_ASL_AI_CONCEPT_CHECK
BOOST_CLASS_REQUIRE(I, boost, ForwardIteratorConcept);
+#endif
type(const I& x) : base_t (x)
{ }
@@ -133,7 +136,9 @@
{
typedef typename optimized_storage_type<I, any_bidirectional_iterator_interface<V, R, D> >::type base_t;
+#ifndef NO_ASL_AI_CONCEPT_CHECK
BOOST_CLASS_REQUIRE(I, boost, BidirectionalIteratorConcept);
+#endif
type(const I& x)
: base_t(x) {}
@@ -235,7 +240,9 @@
{
typedef typename optimized_storage_type<I, any_random_access_iterator_interface<V, R, D> >::type base_t;
+#ifndef NO_ASL_AI_CONCEPT_CHECK
BOOST_CLASS_REQUIRE(I, boost, RandomAccessIteratorConcept);
+#endif
type(const I& x)
: base_t(x) {}
diff -Naur source_release_orig/adobe/poly.hpp source_release/adobe/poly.hpp
--- source_release_orig/adobe/poly.hpp 2010-11-08 21:18:20.000000000 +0300
+++ source_release/adobe/poly.hpp 2012-03-28 17:01:40.000000000 +0400
@@ -70,8 +70,10 @@
virtual const void* cast() const = 0;
virtual const std::type_info& type_info() const = 0;
+#ifndef NO_ASL_AI_CONCEPT_CHECK
// Precondition of assignment: this->type_info() == x.type_info()
virtual void assign(const poly_copyable_interface& x) = 0;
+#endif
// Precondition of exchange: this->type_info() == x.type_info()
virtual void exchange(poly_copyable_interface& x) = 0;
@@ -107,9 +109,11 @@
~poly_state_remote()
{ delete value_ptr_m; }
+#ifndef NO_ASL_AI_CONCEPT_CHECK
// Precondition : this->type_info() == x.type_info()
void assign(const poly_copyable_interface& x)
{ *value_ptr_m = *static_cast<const poly_state_remote&>(x).value_ptr_m; }
+#endif
const std::type_info& type_info() const
{ return typeid(value_type); }
@@ -144,9 +148,11 @@
explicit poly_state_local(value_type x)
: value_m(adobe::move(x)) { }
+#ifndef NO_ASL_AI_CONCEPT_CHECK
// Precondition : this->type_info() == x.type_info()
void assign(const poly_copyable_interface& x)
{ value_m = static_cast<const poly_state_local&>(x).value_m; }
+#endif
const std::type_info& type_info() const
{ return typeid(value_type); }
@@ -342,6 +348,7 @@
return true;
}
+#ifndef NO_ASL_AI_CONCEPT_CHECK
template <typename T> poly_base& assign(const T& x)
{
if (type_info() == typeid(T))
@@ -364,6 +371,7 @@
interface_ref().~interface_type();
x.interface_ref().clone(storage());
}
+#endif
const interface_type* operator->() const
{ return &interface_ref(); }

57
asl-time-utc.patch
View file

@ -1,57 +0,0 @@
diff --git a/adobe/timer.hpp b/adobe/timer.hpp
index 8622e66..c0ef46d 100644
--- a/adobe/timer.hpp
+++ b/adobe/timer.hpp
@@ -182,7 +182,7 @@ public:
#if ADOBE_PLATFORM_WIN
(void)::QueryPerformanceCounter(&epoch_m);
#elif defined(BOOST_HAS_THREADS)
- boost::xtime_get(&epoch_m, boost::TIME_UTC);
+ boost::xtime_get(&epoch_m, boost::TIME_UTC_);
#elif defined(BOOST_HAS_GETTIMEOFDAY)
gettimeofday(&epoch_m, static_cast<struct timezone*>(0));
#endif
@@ -206,7 +206,7 @@ public:
(void)::QueryPerformanceCounter(&split_m);
return (split_m.QuadPart - epoch_m.QuadPart) / static_cast<double>(frequency_m.QuadPart) * double(1e3);
#elif defined(BOOST_HAS_THREADS)
- boost::xtime_get(&split_m, boost::TIME_UTC);
+ boost::xtime_get(&split_m, boost::TIME_UTC_);
return ((split_m.sec - epoch_m.sec) * double(1e3) + (split_m.nsec - epoch_m.nsec) / double(1e6));
#elif defined(BOOST_HAS_GETTIMEOFDAY)
gettimeofday(&split_m, static_cast<struct timezone*>(0));
diff --git a/documentation/html/timer_8hpp_source.html b/documentation/html/timer_8hpp_source.html
index d5fc808..79a7f62 100644
--- a/documentation/html/timer_8hpp_source.html
+++ b/documentation/html/timer_8hpp_source.html
@@ -200,7 +200,7 @@
<a name="l00182"></a>00182 <span class="preprocessor">#if ADOBE_PLATFORM_WIN</span>
<a name="l00183"></a>00183 <span class="preprocessor"></span> (void)::QueryPerformanceCounter(&amp;epoch_m);
<a name="l00184"></a>00184 <span class="preprocessor">#elif defined(BOOST_HAS_THREADS)</span>
-<a name="l00185"></a>00185 <span class="preprocessor"></span> boost::xtime_get(&amp;epoch_m, boost::TIME_UTC);
+<a name="l00185"></a>00185 <span class="preprocessor"></span> boost::xtime_get(&amp;epoch_m, boost::TIME_UTC_);
<a name="l00186"></a>00186 <span class="preprocessor">#elif defined(BOOST_HAS_GETTIMEOFDAY)</span>
<a name="l00187"></a>00187 <span class="preprocessor"></span> gettimeofday(&amp;epoch_m, static_cast&lt;struct timezone*&gt;(0));
<a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
@@ -215,7 +215,7 @@
<a name="l00206"></a>00206 <span class="preprocessor"></span> (void)::QueryPerformanceCounter(&amp;split_m);
<a name="l00207"></a>00207 <span class="keywordflow">return</span> (split_m.QuadPart - epoch_m.QuadPart) / <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(frequency_m.QuadPart) * <span class="keywordtype">double</span>(1e3);
<a name="l00208"></a>00208 <span class="preprocessor">#elif defined(BOOST_HAS_THREADS)</span>
-<a name="l00209"></a>00209 <span class="preprocessor"></span> boost::xtime_get(&amp;split_m, boost::TIME_UTC);
+<a name="l00209"></a>00209 <span class="preprocessor"></span> boost::xtime_get(&amp;split_m, boost::TIME_UTC_);
<a name="l00210"></a>00210 <span class="keywordflow">return</span> ((split_m.sec - epoch_m.sec) * <span class="keywordtype">double</span>(1e3) + (split_m.nsec - epoch_m.nsec) / <span class="keywordtype">double</span>(1e6));
<a name="l00211"></a>00211 <span class="preprocessor">#elif defined(BOOST_HAS_GETTIMEOFDAY)</span>
<a name="l00212"></a>00212 <span class="preprocessor"></span> gettimeofday(&amp;split_m, static_cast&lt;struct timezone*&gt;(0));
diff --git a/source/zuid_sys_dep.cpp b/source/zuid_sys_dep.cpp
index 8930dd7..bd54770 100644
--- a/source/zuid_sys_dep.cpp
+++ b/source/zuid_sys_dep.cpp
@@ -128,7 +128,7 @@ adobe::md5_t::digest_t get_generic_random_info()
#endif
{
#if defined(BOOST_HAS_THREADS)
- boost::xtime_get(&time_m, boost::TIME_UTC);
+ boost::xtime_get(&time_m, boost::TIME_UTC_);
#endif
#if defined(BOOST_HAS_UNISTD_H)
gethostname(hostname_m, 256);

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphaned

1
sources
View file

@ -1 +0,0 @@
eac9f3eec40ed1f41d1e4671289b5e8b asl_1.0.43.tgz