Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (84d4c374a5bc9f2066627da4782df870d44525a7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (84d4c374a5bc9f2066627da4782df870d44525a7)
  • Date: Mon, 5 Jan 2009 08:12:55 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4/akonadi/DEPENDS | 1 +
kde4/akonadi/DETAILS | 6 +++---
kde4/akonadi/HISTORY | 6 ++++++
kde4/akonadi/PRE_BUILD | 1 +
kde4/akonadi/boost.diff | 16 ++++++++++++++++
libs/boost/HISTORY | 5 +++++
libs/boost/REPAIR^*^SUB_DEPENDS | 25 +++++++++++++++++++++++++
libs/boost/SUB_DEPENDS | 40
++++++++++++++++++++--------------------
8 files changed, 77 insertions(+), 23 deletions(-)

New commits:
commit e7e527b94e65ba95578fffd25b214372fd8794d6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

akonadi-1.1.0

commit 345940411c202ec71737028d4d2d841f62b1c5e6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

boost - fix SUB_DEPENDS

diff --git a/kde4/akonadi/DEPENDS b/kde4/akonadi/DEPENDS
index 5cd6500..81019f6 100755
--- a/kde4/akonadi/DEPENDS
+++ b/kde4/akonadi/DEPENDS
@@ -1,4 +1,5 @@
depends -sub DBUS qt4 &&
+depends -sub PROGRAM_OPTIONS boost &&
depends g++ &&
depends cmake &&
depends libxslt &&
diff --git a/kde4/akonadi/DETAILS b/kde4/akonadi/DETAILS
index 4603a2f..57cb0c2 100755
--- a/kde4/akonadi/DETAILS
+++ b/kde4/akonadi/DETAILS
@@ -2,11 +2,11 @@
#persistent_read kdelibs4 KDE_VER KDE_VER
#persistent_read kdelibs4 KDE_VCS_AUTOUPDATE KDE_VCS_AUTOUPDATE
if [[ $AK_VER != devel ]]; then
- VERSION=1.0.81
-
SOURCE_HASH=sha512:b62c96267391aa89eae3b5d6dbd6bf13b33e3790a2cafbef974ec240d9b3bcde034c0c22ced290c5b98dac8eacb61ff3e0a89b62482e290382dd8b664eef30c8
+ VERSION=1.1.0
+
SOURCE_HASH=sha512:a366af984b59a922f30722a5a34b09952e69b3d39e949aeaffd7948d3f3892d9d671a63ba9e
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VX}/support/$SOURCE
- SOURCE_URL[0]=http://akonadi.omat.nl//$SOURCE
+ SOURCE_URL[0]=http://akonadi.omat.nl/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
if [[ $AK_VCS_AUTOUPDATE == y ]]; then
diff --git a/kde4/akonadi/HISTORY b/kde4/akonadi/HISTORY
index 3165988..5e869ce 100644
--- a/kde4/akonadi/HISTORY
+++ b/kde4/akonadi/HISTORY
@@ -1,3 +1,9 @@
+2009-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0
+ * DEPENDS: add '-sub PROGRAM_OPTIONS boost'
+ * PRE_BUILD, boost.diff: added
+ fix detection of latest boost
+
2008-12-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.81

diff --git a/kde4/akonadi/PRE_BUILD b/kde4/akonadi/PRE_BUILD
index d0ea6d7..b8342d0 100755
--- a/kde4/akonadi/PRE_BUILD
+++ b/kde4/akonadi/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/boost.diff &&
sed -i '/update_xdg_mimetypes/D' CMakeLists.txt
diff --git a/kde4/akonadi/boost.diff b/kde4/akonadi/boost.diff
new file mode 100644
index 0000000..752f700
--- /dev/null
+++ b/kde4/akonadi/boost.diff
@@ -0,0 +1,16 @@
+diff -uNr akonadi-1.1.0/cmake/modules/FindBoost.cmake
+akonadi-1.1.0.cp/cmake/modules/FindBoost.cmake
+--- akonadi-1.1.0/cmake/modules/FindBoost.cmake 2009-01-03
17:11:36.000000000 +0100
++++ akonadi-1.1.0.cp/cmake/modules/FindBoost.cmake 2009-01-05
12:22:57.000000000 +0100
+@@ -93,7 +93,7 @@
+
+ OPTION(Boost_USE_MULTITHREADED "Use the multithreaded versions of the boost
libraries" ON)
+
+-SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.36.1" "1.36.0"
"1.35.1" "1.35.0"
+"1.35" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33" )
++SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.37.0" "1.36.1"
"1.36.0" "1.35.1"
+"1.35.0" "1.35" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33" )
+
+
+ ############################################
+
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 92cb892..573ae9e 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,8 @@
+2008-12-17 Treeeve Jelbert <treeve AT sourcemage.org>
+ * SUB_DEPENDS: OPTS1 -> LIBS
+ make usage consistent between SUB_DEPENDS and PRE_SUB_DEPENDS
+ * REPAIR^*^SUB_DEPENDS: added
+
2008-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1_37_0

diff --git a/libs/boost/REPAIR^*^SUB_DEPENDS b/libs/boost/REPAIR^*^SUB_DEPENDS
new file mode 100755
index 0000000..ee55fdc
--- /dev/null
+++ b/libs/boost/REPAIR^*^SUB_DEPENDS
@@ -0,0 +1,25 @@
+persistent_add BOOST_LIBS
+case $THIS_SUB_DEPENDS in
+ PROGRAM_OPTIONS) list_add BOOST_LIBS program_options ;;
+ FUNCTION_TYPES) list_add BOOST_LIBS function_types ;;
+ SERIALIZATION) list_add BOOST_LIBS serialization ;;
+ FILESYSTEM) list_add BOOST_LIBS filesystem ;;
+ STATECHART) list_add BOOST_LIBS statechart ;;
+ DATE_TIME) list_add BOOST_LIBS date_time ;;
+ IOSTREAMS) list_add BOOST_LIBS iostreams ;;
+ XPRESSIVE) list_add BOOST_LIBS xpressive ;;
+ SIGNALS) list_add BOOST_LIBS signals ;;
+ PYTHON) list_add BOOST_LIBS python &&
+ depends python ;;
+ SYSTEM) list_add BOOST_LIBS system ;;
+ THREAD) list_add BOOST_LIBS thread ;;
+ TYPEOF) list_add BOOST_LIBS typeof ;;
+ GRAPH) list_add BOOST_LIBS graph ;;
+ REGEX) list_add BOOST_LIBS regex ;;
+ TEST) list_add BOOST_LIBS test ;;
+ WAVE) list_add BOOST_LIBS wave ;;
+ MPI) list_add BOOST_LIBS mpi ;;
+ TR1) list_add BOOST_LIBS tr1 ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/libs/boost/SUB_DEPENDS b/libs/boost/SUB_DEPENDS
index 097db7f..ee55fdc 100755
--- a/libs/boost/SUB_DEPENDS
+++ b/libs/boost/SUB_DEPENDS
@@ -1,25 +1,25 @@
-persistent_add BOOST_OPTS1
+persistent_add BOOST_LIBS
case $THIS_SUB_DEPENDS in
- PROGRAM_OPTIONS) list_add BOOST_OPTS1 program_options ;;
- FUNCTION_TYPES) list_add BOOST_OPTS1 function_types ;;
- SERIALIZATION) list_add BOOST_OPTS1 serialization ;;
- FILESYSTEM) list_add BOOST_OPTS1 filesystem ;;
- STATECHART) list_add BOOST_OPTS1 statechart ;;
- DATE_TIME) list_add BOOST_OPTS1 date_time ;;
- IOSTREAMS) list_add BOOST_OPTS1 iostreams ;;
- XPRESSIVE) list_add BOOST_OPTS1 xpressive ;;
- SIGNALS) list_add BOOST_OPTS1 signals ;;
- PYTHON) list_add BOOST_OPTS1 python &&
+ PROGRAM_OPTIONS) list_add BOOST_LIBS program_options ;;
+ FUNCTION_TYPES) list_add BOOST_LIBS function_types ;;
+ SERIALIZATION) list_add BOOST_LIBS serialization ;;
+ FILESYSTEM) list_add BOOST_LIBS filesystem ;;
+ STATECHART) list_add BOOST_LIBS statechart ;;
+ DATE_TIME) list_add BOOST_LIBS date_time ;;
+ IOSTREAMS) list_add BOOST_LIBS iostreams ;;
+ XPRESSIVE) list_add BOOST_LIBS xpressive ;;
+ SIGNALS) list_add BOOST_LIBS signals ;;
+ PYTHON) list_add BOOST_LIBS python &&
depends python ;;
- SYSTEM) list_add BOOST_OPTS1 system ;;
- THREAD) list_add BOOST_OPTS1 thread ;;
- TYPEOF) list_add BOOST_OPTS1 typeof ;;
- GRAPH) list_add BOOST_OPTS1 graph ;;
- REGEX) list_add BOOST_OPTS1 regex ;;
- TEST) list_add BOOST_OPTS1 test ;;
- WAVE) list_add BOOST_OPTS1 wave ;;
- MPI) list_add BOOST_OPTS1 mpi ;;
- TR1) list_add BOOST_OPTS1 tr1 ;;
+ SYSTEM) list_add BOOST_LIBS system ;;
+ THREAD) list_add BOOST_LIBS thread ;;
+ TYPEOF) list_add BOOST_LIBS typeof ;;
+ GRAPH) list_add BOOST_LIBS graph ;;
+ REGEX) list_add BOOST_LIBS regex ;;
+ TEST) list_add BOOST_LIBS test ;;
+ WAVE) list_add BOOST_LIBS wave ;;
+ MPI) list_add BOOST_LIBS mpi ;;
+ TR1) list_add BOOST_LIBS tr1 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac




Archive powered by MHonArc 2.6.24.

Top of Page