Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (0a9ee8ebe91ac23820f86a8d23d690a649434f4c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (0a9ee8ebe91ac23820f86a8d23d690a649434f4c)
  • Date: Thu, 24 Nov 2011 03:30:38 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

http/links-twibright/DETAILS | 4 -
http/links-twibright/HISTORY | 3 +
http/mod_python/DETAILS | 2
http/mod_python/HISTORY | 5 ++
http/mod_python/PRE_BUILD | 3 +
http/mod_python/mod_python-3.3.1-apr.patch | 12 +++++
libs/boost/HISTORY | 2
libs/boost/PRE_BUILD | 1
libs/boost/boost-foreach.patch | 68
+++++++++++++++++++++++++++++
9 files changed, 97 insertions(+), 3 deletions(-)

New commits:
commit edffd14c48727ee38c474f3255a18515be88ea2e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

links-twibright: => 2.4

commit 63cd1378fc2f4bc37f17f7efa04f2fde91b6b887
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

boost: added patch to fix wesnoth build

commit 9182e2a6c7fc3fccfaa0be7dbff4c16287a2560b
Author: Lalo Martins <lalo.martins AT gmail.com>
Commit: Lalo Martins <lalo.martins AT gmail.com>

mod_python compatibility for apr-util >= 1.3.4

diff --git a/http/links-twibright/DETAILS b/http/links-twibright/DETAILS
index 3347715..f387890 100755
--- a/http/links-twibright/DETAILS
+++ b/http/links-twibright/DETAILS
@@ -1,10 +1,10 @@
SPELL=links-twibright
- VERSION=2.3
+ VERSION=2.4
SOURCE_NAME=links
SOURCE=$SOURCE_NAME-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE_NAME-$VERSION
SOURCE_URL[0]=http://links.twibright.com/download/$SOURCE
-
SOURCE_HASH=sha512:da4db7d6cc9b61d0f69b7f56bcee0581fd8d7b2b582c6f0bcd54285e52c3981ed3e53d643530d7a2701abfaf5cc19de04f5851f4c3d5af4fcbc7f6da25c9e22b
+
SOURCE_HASH=sha512:a5be7a2cb27206403a33ef81df6993e154e595553d98e51834ebaf964a80d3e2d438a6bba0093a7471129d984d9d621083fb3d92643036ea01ac723c70965b14
LICENSE[0]=GPL
WEB_SITE=http://links.twibright.com/
ENTERED=20011027
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index dd41b42..051324f 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,6 @@
+2011-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4
+
2011-08-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3

diff --git a/http/mod_python/DETAILS b/http/mod_python/DETAILS
index 76c127f..e705a1e 100755
--- a/http/mod_python/DETAILS
+++ b/http/mod_python/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.apache.org/dist/httpd/modpython/$SOURCE
WEB_SITE=http://www.modpython.org/
ENTERED=20021129
- UPDATED=20030614
+ PATCHLEVEL=1
KEYWORDS="interpreter http python"
SHORT='Mod_python is an Apache module that embeds the Python
interpreter within the server'
cat << EOF
diff --git a/http/mod_python/HISTORY b/http/mod_python/HISTORY
index 0dbb620..abb762c 100644
--- a/http/mod_python/HISTORY
+++ b/http/mod_python/HISTORY
@@ -1,3 +1,8 @@
+2011-11-23 Lalo Martins <lalo AT sourcemage.org>
+ * PRE_BUILD: use a patch for compatibility with apr-util >= 1.3.4
+ see: https://bugzilla.redhat.com/show_bug.cgi?id=465246
+ or https://issues.apache.org/jira/browse/MODPYTHON-249
+
2007-04-25 Bearcat M. Sandor <Sourcemage AT feline-soul.com>
* DETAILS: Updated to 3.3.1

diff --git a/http/mod_python/PRE_BUILD b/http/mod_python/PRE_BUILD
new file mode 100755
index 0000000..47f93db
--- /dev/null
+++ b/http/mod_python/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/mod_python-3.3.1-apr.patch
\ No newline at end of file
diff --git a/http/mod_python/mod_python-3.3.1-apr.patch
b/http/mod_python/mod_python-3.3.1-apr.patch
new file mode 100644
index 0000000..216b049
--- /dev/null
+++ b/http/mod_python/mod_python-3.3.1-apr.patch
@@ -0,0 +1,12 @@
+diff -rNu mod_python-3.3.1/src/connobject.c
mod_python-3.3.1-atomix/src/connobject.c
+--- mod_python-3.3.1/src/connobject.c 2006-12-03 05:36:37.000000000 +0100
++++ mod_python-3.3.1-atomix/src/connobject.c 2008-10-02 14:10:02.000000000
+0200
+@@ -139,7 +139,7 @@
+ bytes_read = 0;
+
+ while ((bytes_read < len || len == 0) &&
+- !(b == APR_BRIGADE_SENTINEL(b) ||
++ !(b == APR_BRIGADE_SENTINEL(bb) ||
+ APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
+
+ const char *data;
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index ebf887f..bb0aa07 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,5 +1,7 @@
2011-11-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1_48_0
+ * PRE_BUILD: added appying foreach patch
+ https://svn.boost.org/trac/boost/ticket/6131

2011-08-18 Bor Kraljič <pyrobor AT ver.si>
* PRE_BUILD: added patch converter_policies_hpp.patch so rocs
compiles without an error
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index ff9a3f2..a438fb5 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -3,5 +3,6 @@ message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
$SCRIPT_DIRECTORY/boost-use-cxxflags.patch &&
patch -p1 -d $SOURCE_DIRECTORY <
$SCRIPT_DIRECTORY/converter_policies_hpp.patch &&
+patch -p1 -d $SOURCE_DIRECTORY < $SCRIPT_DIRECTORY/boost-foreach.patch &&
message "patching done"

diff --git a/libs/boost/boost-foreach.patch b/libs/boost/boost-foreach.patch
new file mode 100644
index 0000000..363fb98
--- /dev/null
+++ b/libs/boost/boost-foreach.patch
@@ -0,0 +1,68 @@
+diff -ur boost_1_48_0/boost/foreach_fwd.hpp boost-mod/boost/foreach_fwd.hpp
+--- boost_1_48_0/boost/foreach_fwd.hpp 2010-06-10 10:22:27.000000000 -0500
++++ boost-mod/boost/foreach_fwd.hpp 2011-11-23 23:12:33.314912050 -0600
+@@ -14,6 +14,8 @@
+ #ifndef BOOST_FOREACH_FWD_HPP
+ #define BOOST_FOREACH_FWD_HPP
+
++#include <utility> // for std::pair
++
+ // This must be at global scope, hence the uglified name
+ enum boost_foreach_argument_dependent_lookup_hack
+ {
+@@ -25,6 +27,9 @@
+
+ namespace foreach
+ {
++ template<typename T>
++ std::pair<T, T> in_range(T begin, T end);
++
+
///////////////////////////////////////////////////////////////////////////////
+ // boost::foreach::tag
+ //
+@@ -46,6 +51,24 @@
+
+ } // namespace foreach
+
++// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
++namespace BOOST_FOREACH
++{
++ using foreach::in_range;
++ using foreach::tag;
++
++ template<typename T>
++ struct is_lightweight_proxy
++ : foreach::is_lightweight_proxy<T>
++ {};
++
++ template<typename T>
++ struct is_noncopyable
++ : foreach::is_noncopyable<T>
++ {};
++
++} // namespace BOOST_FOREACH
++
+ } // namespace boost
+
+ #endif
+diff -ur boost_1_48_0/boost/foreach.hpp boost-mod/boost/foreach.hpp
+--- boost_1_48_0/boost/foreach.hpp 2011-10-20 22:46:27.000000000 -0500
++++ boost-mod/boost/foreach.hpp 2011-11-23 23:08:21.403914875 -0600
+@@ -165,7 +165,7 @@
+ // this one works on legacy compilers. Overload
boost_foreach_is_lightweight_proxy
+ // at the global namespace for your type.
+ template<typename T>
+-inline boost::foreach::is_lightweight_proxy<T> *
++inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
+ boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) {
return 0; }
+
+ template<typename T>
+@@ -190,7 +190,7 @@
+ // this one works on legacy compilers. Overload
boost_foreach_is_noncopyable
+ // at the global namespace for your type.
+ template<typename T>
+-inline boost::foreach::is_noncopyable<T> *
++inline boost::BOOST_FOREACH::is_noncopyable<T> *
+ boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
+
+ namespace boost



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (0a9ee8ebe91ac23820f86a8d23d690a649434f4c), Vlad Glagolev, 11/24/2011

Archive powered by MHonArc 2.6.24.

Top of Page