Skip to Content.
Sympa Menu

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

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 (a1f89d4a89be105e0411a5a9093a48df9c4f0311)
  • Date: Mon, 9 Nov 2009 07:18:28 -0600

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

devel/apiextractor/HISTORY | 4 ++++
devel/apiextractor/PRE_BUILD | 4 ++--
devel/generatorrunner/DEPENDS | 2 --
devel/generatorrunner/HISTORY | 5 +++++
devel/generatorrunner/PRE_BUILD | 4 ++--
devel/generatorrunner/TRIGGERS | 1 -
kde4-apps/digikam4/DETAILS | 4 ++--
kde4-apps/digikam4/HISTORY | 4 ++++
kde4-apps/digikam4/PRE_BUILD | 3 ---
9 files changed, 19 insertions(+), 12 deletions(-)

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

digikam4 => 1.0.0-beta6

commit 9a60841aaf5a08079cd126e094140b48d098bcdc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

apiextractor - better fix

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

generatorrunner - fix locaation for cmake modules

commit 84b46af17dfb8953192dca1e8febacdd7ed52a0d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

apiextractor - fix locaation for cmake modules

diff --git a/devel/apiextractor/HISTORY b/devel/apiextractor/HISTORY
index 4ffa5d0..0c1e414 100644
--- a/devel/apiextractor/HISTORY
+++ b/devel/apiextractor/HISTORY
@@ -1,3 +1,7 @@
+2009-11-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix location for cmake modules
+ better fix
+
2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.1

diff --git a/devel/apiextractor/PRE_BUILD b/devel/apiextractor/PRE_BUILD
index c7b6ed8..e86fd30 100755
--- a/devel/apiextractor/PRE_BUILD
+++ b/devel/apiextractor/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# ensure that all cmake files are in same place
-sed -i 's|-2.6||' CMakeLists.txt
+# fix location of cmake modules
+sed -i 's|share/cmake-2.6|${CMAKE_ROOT}|' CMakeLists.txt
diff --git a/devel/generatorrunner/DEPENDS b/devel/generatorrunner/DEPENDS
index 328aa0e..d417274 100755
--- a/devel/generatorrunner/DEPENDS
+++ b/devel/generatorrunner/DEPENDS
@@ -1,7 +1,5 @@
depends qt4 &&
depends cmake &&
-depends python &&
-depends -sub PYTHON boost &&
depends apiextractor &&
if [[ $PYSIDE == git ]];then
depends git
diff --git a/devel/generatorrunner/HISTORY b/devel/generatorrunner/HISTORY
index acc7b28..393cff5 100644
--- a/devel/generatorrunner/HISTORY
+++ b/devel/generatorrunner/HISTORY
@@ -1,3 +1,8 @@
+2009-11-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: delete boost, python
+ * TRIGGERS: deleted
+ * PRE_BUILD: fix location for cmake modules
+
2009-10-10 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: added
remove version from cmake directory
diff --git a/devel/generatorrunner/PRE_BUILD b/devel/generatorrunner/PRE_BUILD
index 0fbba80..e86fd30 100755
--- a/devel/generatorrunner/PRE_BUILD
+++ b/devel/generatorrunner/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# remove version from cmake directory
-sed -i 's|-2.6||' CMakeLists.txt
+# fix location of cmake modules
+sed -i 's|share/cmake-2.6|${CMAKE_ROOT}|' CMakeLists.txt
diff --git a/devel/generatorrunner/TRIGGERS b/devel/generatorrunner/TRIGGERS
deleted file mode 100755
index 1696e74..0000000
--- a/devel/generatorrunner/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast boost check_self
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index 51e7259..cafa120 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then
SOURCE=${SPELLX}-$VERSION.tar.bz2

SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
else
- VERSION=1.0.0-beta5
-
SOURCE_HASH=sha512:122e4c38988e143a4c680bbdce280348a6bfbc2c8f6f1d52a534d8aa102f2d5715a035c4150edc6a377c7923d3bc46a5a682640c3f00eed06e89654e6ac12342
+ VERSION=1.0.0-beta6
+
SOURCE_HASH=sha512:677ca5587121661a4fca6106c8cb1aafe094c08b927c651dc1589fcba0c0808e00fdb97daad7d58fc61ee60c952850d82d768f61c47236df324bbca769c9d14e
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
fi
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 1bb0bf4..c890a36 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2009-11-09 Treeve Jelbert <treevesourcemage.org>
+ * DETAILS: version 1.0.0-beta6
+ * PRE_BUILD: deleted - no longer needed
+
2009-10-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: removing trigger on kdelibs4

diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD
deleted file mode 100755
index 762c89f..0000000
--- a/kde4-apps/digikam4/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sed -i '/tests/D' CMakeLists.txt



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a1f89d4a89be105e0411a5a9093a48df9c4f0311), Treeve Jelbert, 11/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page