Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (b79fe472de7e619094c24033db3d491a61da4ad2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (b79fe472de7e619094c24033db3d491a61da4ad2)
  • Date: Fri, 21 Mar 2008 23:50:15 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
editors/gle/BUILD | 5
editors/gle/DEPENDS | 21 ++-
editors/gle/DETAILS | 4
editors/gle/GLE-4.0.12-src.zip.sig | 0
editors/gle/GLE-4.1.2-src.zip.sig |binary
editors/gle/HISTORY | 9 +
editors/gle/INSTALL | 10 -
editors/gle/PRE_BUILD | 8 -
libs/boost/PRE_BUILD | 4
libs/boost/gcc43.patch | 255
+++++++++++++++++++++++++++++++++++++
11 files changed, 299 insertions(+), 17 deletions(-)

New commits:
commit b79fe472de7e619094c24033db3d491a61da4ad2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gle: Updated to 4.1.2 (works with gcc 4.3.0 now)

commit 188b564ddcfa29ac6975fadbf62b434e590822b9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

boost: Added patch to compile with gcc 4.3.0

diff --git a/editors/gle/BUILD b/editors/gle/BUILD
index 764df60..cb3cab1 100755
--- a/editors/gle/BUILD
+++ b/editors/gle/BUILD
@@ -1,3 +1,2 @@
- sedit "s/-O2/$CFLAGS/" config.gcc &&
- sedit "s/\/usr/${INSTALL_ROOT}\/usr/" config.gcc &&
- make -f Makefile.gcc
+OPTS="--with-qt=no $OPTS" &&
+default_build
diff --git a/editors/gle/DEPENDS b/editors/gle/DEPENDS
index 2bc42d3..4196272 100755
--- a/editors/gle/DEPENDS
+++ b/editors/gle/DEPENDS
@@ -1,2 +1,19 @@
-depends boost &&
-depends tiff
+depends boost &&
+depends g++ &&
+depends pkgconfig &&
+depends zlib '--with-z=yes' &&
+
+optional_depends jpeg \
+ '--with-jpeg=yes' \
+ '--with-jpeg=no' \
+ 'for JPEG image support' &&
+
+optional_depends libpng \
+ '--with-png=yes' \
+ '--with-png=no' \
+ 'for PNG image support' &&
+
+optional_depends tiff \
+ '--with-tiff=yes' \
+ '--with-tiff=no' \
+ 'for TIFF image support'
diff --git a/editors/gle/DETAILS b/editors/gle/DETAILS
index 3aa56c7..8e2494e 100755
--- a/editors/gle/DETAILS
+++ b/editors/gle/DETAILS
@@ -1,5 +1,5 @@
SPELL=gle
- VERSION=4.0.12
+ VERSION=4.1.2
SOURCE=GLE-${VERSION}-src.zip
SOURCE2=GLEusersguide.ps.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}${VERSION:0:1}
@@ -8,9 +8,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}${VERSION:0:1}
SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
SOURCE2_GPG=gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME
LICENSE[0]=GPL
+ KEYWORDS="editors"
WEB_SITE=http://glx.sourceforge.net
ENTERED=20020513
- KEYWORDS="editors"
SHORT='High-quality graphics package for scientists'
cat << EOF
GLE (interactive Graphics Language Editor) is a high-quality graphics package
diff --git a/editors/gle/GLE-4.0.12-src.zip.sig
b/editors/gle/GLE-4.0.12-src.zip.sig
deleted file mode 100644
index 6c86143..0000000
Binary files a/editors/gle/GLE-4.0.12-src.zip.sig and /dev/null differ
diff --git a/editors/gle/GLE-4.1.2-src.zip.sig
b/editors/gle/GLE-4.1.2-src.zip.sig
new file mode 100644
index 0000000..25794ff
Binary files /dev/null and b/editors/gle/GLE-4.1.2-src.zip.sig differ
diff --git a/editors/gle/HISTORY b/editors/gle/HISTORY
index f3e79e0..a742510 100644
--- a/editors/gle/HISTORY
+++ b/editors/gle/HISTORY
@@ -1,3 +1,12 @@
+2008-03-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 4.1.2
+ Now works with gcc 4.3.0
+ * PRE_BUILD: Moved sedits to PRE_BUILD, now uses ./configure
+ Use default_pre_build and then unpacke SOURCE2
+ * BUILD: Moved sedits to PRE_BUILD, now uses ./configure
+ Disable QT4 support (fails to compile)
+ * INSTALL: Install documentation to usr/share/doc/gle
+
2007-01-04 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Install-rootify
Check if $INSTALL_ROOT/usr/doc is a directory before trying to copy
diff --git a/editors/gle/INSTALL b/editors/gle/INSTALL
index 443186f..b3994be 100755
--- a/editors/gle/INSTALL
+++ b/editors/gle/INSTALL
@@ -1,7 +1,3 @@
-make -f Makefile.gcc install &&
-
-if [[ ! -d $INSTALL_ROOT/usr/doc ]]; then
- mkdir -p $INSTALL_ROOT/usr/doc
-fi &&
-
-cp $SOURCE_CACHE/$SOURCE2 $INSTALL_ROOT/usr/doc
+make install &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL &&
+cp $SOURCE_CACHE/$SOURCE2 $INSTALL_ROOT/usr/share/doc/$SPELL
diff --git a/editors/gle/PRE_BUILD b/editors/gle/PRE_BUILD
index 6f703c8..e22651e 100755
--- a/editors/gle/PRE_BUILD
+++ b/editors/gle/PRE_BUILD
@@ -1,3 +1,5 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file &&
-unpack_file 2
+default_pre_build &&
+unpack_file 2 &&
+
+sedit "s/-O2/$CFLAGS/" $SOURCE_DIRECTORY/config.gcc &&
+sedit "s/\/usr/${INSTALL_ROOT}\/usr/" $SOURCE_DIRECTORY/config.gcc
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
new file mode 100755
index 0000000..d2decbc
--- /dev/null
+++ b/libs/boost/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/libs/boost/gcc43.patch b/libs/boost/gcc43.patch
new file mode 100644
index 0000000..43b842d
--- /dev/null
+++ b/libs/boost/gcc43.patch
@@ -0,0 +1,255 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=210427
+#
+diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp
boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
+--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp
2005-12-11 00:12:51.000000000 -0600
++++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -17,6 +17,7 @@
+ // See http://www.boost.org for updates, documentation, and revision
history.
+
+ #include <cstddef> // std::size_t
++#include <climits>
+ #include <boost/config.hpp>
+
+ #if defined(BOOST_NO_STDC_NAMESPACE)
+diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp
boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
+--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp
2006-02-11 23:43:06.000000000 -0600
++++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -17,6 +17,7 @@
+ // See http://www.boost.org for updates, documentation, and revision
history.
+
+ #include <cstddef> // size_t
++#include <climits>
+ #include <string>
+
+ #include <boost/config.hpp>
+diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp
boost_1_34_1/boost/date_time/date_facet.hpp
+--- boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp 2005-09-05
16:10:50.000000000 -0500
++++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -429,7 +429,7 @@
+ typedef std::basic_string<CharT> string_type;
+ typedef CharT char_type;
+ typedef boost::date_time::period_parser<date_type, CharT>
period_parser_type;
+- typedef special_values_parser<date_type,CharT>
special_values_parser_type;
++ typedef boost::date_time::special_values_parser<date_type,CharT>
special_values_parser_type;
+ typedef std::vector<std::basic_string<CharT> > input_collection_type;
+ typedef format_date_parser<date_type, CharT> format_date_parser_type;
+ // date_generators stuff goes here
+diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/tz_db_base.hpp
boost_1_34_1/boost/date_time/tz_db_base.hpp
+--- boost_1_34_1-ORIGINAL/boost/date_time/tz_db_base.hpp 2005-10-23
15:15:06.000000000 -0500
++++ boost_1_34_1/boost/date_time/tz_db_base.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -158,7 +158,7 @@
+ typedef typename time_zone_type::base_type time_zone_base_type;
+ typedef typename time_zone_type::time_duration_type
time_duration_type;
+ typedef time_zone_names_base<char_type> time_zone_names;
+- typedef dst_adjustment_offsets<time_duration_type>
dst_adjustment_offsets;
++ typedef boost::date_time::dst_adjustment_offsets<time_duration_type>
dst_adjustment_offsets;
+ typedef std::basic_string<char_type> string_type;
+
+ //! Constructs an empty database
+diff -aNru boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp
boost_1_34_1/boost/mpl/zip_view.hpp
+--- boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp 2004-09-02
10:40:42.000000000 -0500
++++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-03-03 03:08:59.000000000
-0600
+@@ -37,7 +37,7 @@
+ typedef zip_iterator<
+ typename transform1<
+ IteratorSeq
+- , next<_1>
++ , boost::mpl::next<_1>
+ >::type
+ > next;
+ };
+@@ -48,8 +48,8 @@
+ struct zip_view
+ {
+ private:
+- typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
+- typedef typename transform1< Sequences, end<_1> >::type last_ones_;
++ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type
first_ones_;
++ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type
last_ones_;
+
+ public:
+ typedef nested_begin_end_tag tag;
+diff -aNru boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp
boost_1_34_1/boost/python/detail/def_helper.hpp
+--- boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp 2004-09-15
20:00:28.000000000 -0500
++++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -155,7 +155,7 @@
+ , T3 const&
+ , T4 const&
+ , default_call_policies
+- , keywords<0>
++ , boost::python::detail::keywords<0>
+ , char const*
+ , void(not_specified::*)() // A function pointer type which is
never an
+ // appropriate default implementation
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp
boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp
2006-07-16 11:06:38.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -24,6 +24,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+
+ namespace re_detail{
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp
boost_1_34_1/boost/regex/v4/basic_regex.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp 2007-06-05
12:28:18.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ #ifdef BOOST_MSVC
+ #pragma warning(push)
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp
boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp
2006-12-20 11:19:05.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp
boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15
05:09:44.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -41,6 +41,7 @@
+
+ #include <istream>
+ #include <ios>
++#include <climits>
+
+ #ifdef BOOST_HAS_ABI_HEADERS
+ # include BOOST_ABI_PREFIX
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp
boost_1_34_1/boost/regex/v4/perl_matcher.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp 2006-10-18
07:55:30.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -18,6 +18,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp
boost_1_34_1/boost/regex/v4/regex_split.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp 2005-01-21
11:22:38.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -21,6 +21,8 @@
+ #ifndef BOOST_REGEX_SPLIT_HPP
+ #define BOOST_REGEX_SPLIT_HPP
+
++#include <climits>
++
+ namespace boost{
+
+ #ifdef BOOST_HAS_ABI_HEADERS
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp
boost_1_34_1/boost/regex/v4/states.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp 2005-09-20
07:01:25.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/states.hpp 2008-03-03 03:08:59.000000000
-0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+
+diff -aNru boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp
boost_1_34_1/boost/serialization/collection_traits.hpp
+--- boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp
2005-06-21 00:19:04.000000000 -0500
++++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-03-03
03:09:49.000000000 -0600
+@@ -22,6 +22,7 @@
+ // compiles recognize the same set of primitive types, the possibility
+ // exists for archives to be non-portable if class information for primitive
+ // types is included. This is addressed by the following macros.
++#include <climits>
+ #include <boost/config.hpp>
+ #include <boost/mpl/integral_c.hpp>
+ #include <boost/mpl/integral_c_tag.hpp>
+diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp
boost_1_34_1/boost/spirit/phoenix/operators.hpp
+--- boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp 2006-08-25
11:27:30.000000000 -0500
++++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -24,6 +24,7 @@
+ #include <boost/spirit/phoenix/composite.hpp>
+ #include <boost/config.hpp>
+ #include <boost/mpl/if.hpp>
++#include <climits>
+
+
///////////////////////////////////////////////////////////////////////////////
+ namespace phoenix {
+diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/tree/impl/tree_to_xml.ipp
boost_1_34_1/boost/spirit/tree/impl/tree_to_xml.ipp
+--- boost_1_34_1-ORIGINAL/boost/spirit/tree/impl/tree_to_xml.ipp
2006-12-02 12:13:23.000000000 -0600
++++ boost_1_34_1/boost/spirit/tree/impl/tree_to_xml.ipp 2008-03-03
03:08:59.000000000 -0600
+@@ -14,6 +14,7 @@
+ #include <cstdio>
+ #include <cstdarg>
+ #include <locale>
++#include <cstring>
+
+ #include <map>
+ #include <iostream>
+diff -aNru boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp
boost_1_34_1/boost/test/test_tools.hpp
+--- boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp 2007-02-22
11:57:29.000000000 -0600
++++ boost_1_34_1/boost/test/test_tools.hpp 2008-03-03 03:08:59.000000000
-0600
+@@ -42,6 +42,7 @@
+ #include <boost/mpl/or.hpp>
+
+ // STL
++#include <climits>
+ #include <cstddef> // for std::size_t
+ #include <iosfwd>
+
+diff -aNru
boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+--- boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
2006-12-20 10:38:24.000000000 -0600
++++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
2008-03-03 03:08:59.000000000 -0600
+@@ -16,6 +16,7 @@
+ #include <string>
+ #include <cstdio>
+ #include <cstdarg>
++#include <cstring>
+ #if defined(BOOST_SPIRIT_DEBUG)
+ #include <iostream>
+ #endif // defined(BOOST_SPIRIT_DEBUG)
+diff -aNru boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp
boost_1_34_1/boost/wave/util/flex_string.hpp
+--- boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp 2006-04-25
12:21:01.000000000 -0500
++++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -94,6 +94,7 @@
+ #include <limits>
+ #include <stdexcept>
+ #include <cstddef>
++#include <cstring>
+
+ // this must occur after all of the includes and before any code appears
+ #ifdef BOOST_HAS_ABI_HEADERS
+diff -aNru boost_1_34_1-ORIGINAL/libs/spirit/test/numerics_tests.cpp
boost_1_34_1/libs/spirit/test/numerics_tests.cpp
+--- boost_1_34_1-ORIGINAL/libs/spirit/test/numerics_tests.cpp 2006-02-28
16:56:32.000000000 -0600
++++ boost_1_34_1/libs/spirit/test/numerics_tests.cpp 2008-03-03
03:08:59.000000000 -0600
+@@ -11,6 +11,7 @@
+ #include <boost/spirit/actor/assign_actor.hpp>
+ #include <iostream>
+ #include <boost/detail/lightweight_test.hpp>
++#include <climits>
+
+ using namespace std;
+ using namespace boost::spirit;
+diff -aNru boost_1_34_1-ORIGINAL/tools/quickbook/detail/utils.cpp
boost_1_34_1/tools/quickbook/detail/utils.cpp
+--- boost_1_34_1-ORIGINAL/tools/quickbook/detail/utils.cpp 2006-02-01
21:57:36.000000000 -0600
++++ boost_1_34_1/tools/quickbook/detail/utils.cpp 2008-03-03
03:08:59.000000000 -0600
+@@ -8,6 +8,7 @@
+ http://www.boost.org/LICENSE_1_0.txt)
+
=============================================================================*/
+ #include "./utils.hpp"
++#include <cstring>
+ #include <cctype>
+ #include <boost/spirit/core.hpp>
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (b79fe472de7e619094c24033db3d491a61da4ad2), Eric Sandall, 03/22/2008

Archive powered by MHonArc 2.6.24.

Top of Page