[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9da8288cf7f60290c6e855ada44dc145956182d9)

Treeve Jelbert scm at sourcemage.org
Tue Jan 13 07:55:55 EST 2009


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

 kde4/FUNCTIONS              |    5 ++++-
 kde4/HISTORY                |    4 ++++
 science-libs/eigen2/DETAILS |    4 ++--
 science-libs/eigen2/HISTORY |    3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 45dfb1494e29c100872a0f4e7845932837f5380e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kde4/FUNCTIONS: fix yesterday's broken fix

commit 3f96a13945dd6c44f3d0a5db5ebc2ec255fc1846
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "eigen2-2.0-beta6"

diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 23cadeb..6f37961 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -1,10 +1,13 @@
 default_build() {
   persistent_add KDE4DIR                          &&
   KDE4DIR="$INSTALL_ROOT/opt/kde4"                &&
+  QTDIR=$INSTALL_ROOT/usr/bin/qt4                 &&
   cd $SOURCE_DIRECTORY                            &&
   mkdir -p build                                  &&
   cd build                                        &&
-  cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR:"         \
+  PATH=$KDE4DIR:$QTDIR:$PATH                      &&
+  CMAKE_PREFIX_PATH=$KDE4DIR                      &&
+  cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR           \
         -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION      \
         ../                                       &&
   make
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 1aae6fd..b49ba74 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,7 @@
+2009-01-13 Treeve Jelbert <treeve at sourcemage.org>
+	* FUNCTIONS: fix CMAKE_PREFIX_PATH
+	  also fix finding qt4
+
 2009-01-12 Treeve Jelbert <treeve at sourcemage.org>
 	* FUNCTIONS: use CMAKE_INSTALL_PREFIX
 	  delete prepare_environment; no longer needed
diff --git a/science-libs/eigen2/DETAILS b/science-libs/eigen2/DETAILS
index f35b39c..6b3bbf1 100755
--- a/science-libs/eigen2/DETAILS
+++ b/science-libs/eigen2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=eigen2
           SPELLX=eigen
-         VERSION=2.0-beta5
-     SOURCE_HASH=sha512:70dcc404c07341b88a3992824ad9a244f85e142cc93e99974ceee51a16a66d0b2e6f904ba1ccb8c61cc92c505c7f1cb2927d6783f7163d34a7f0fd8a0149f239
+         VERSION=2.0-beta6
+     SOURCE_HASH=sha512:280d0385282074933d9fd00b4c0d4939872773d87245c16e7fb08e23c83098c5bb43c5ad7e62ead700e955fe543d2db008ae3bfa5d45a3c3dd9216108a670574
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=http://download.tuxfamily.org/$SPELLX/$SOURCE
diff --git a/science-libs/eigen2/HISTORY b/science-libs/eigen2/HISTORY
index 7005064..d862622 100644
--- a/science-libs/eigen2/HISTORY
+++ b/science-libs/eigen2/HISTORY
@@ -1,3 +1,6 @@
+2009-01-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.0-beta6
+
 2009-01-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.0-beta5
 



More information about the SM-Commit mailing list