[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3bf1a04db636d3c03349c387a73860057ea30f83)

Treeve Jelbert scm at sourcemage.org
Sun Sep 14 16:15:05 EDT 2008


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

 ChangeLog                  |    1 +
 kde4-apps/FUNCTIONS        |    2 +-
 kde4-apps/koffice2/DEPENDS |    3 ++-
 kde4-apps/koffice2/HISTORY |    3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3bf1a04db636d3c03349c387a73860057ea30f83
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    koffice2 - fix eigen2 detection

commit 6f28c5eac5e663068be7b4c6310b304c65883fbf
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kde4-apps/FUNCTIONS - pass $OPTS to cmake

diff --git a/ChangeLog b/ChangeLog
index 0a7442c..dce6245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2008-09-14  Treeve Jelbert <treeve at sourcemage.org>
 	* graphics-libs/libraw: new spell, RAW image manipulation
+	* kde4-apps/FUNCTIONS: pass $OPTS to cmake
 
 2008-09-14  Treeve Jelbert <treeve at sourcemage.org>
 	* kde4-apps/libksane: spell deprecated [replaced by kdegraphics4]
diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index 957e78a..4034f5b 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -18,7 +18,7 @@ default_build() {
   cd build                                        &&
   cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR"         \
         -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION      \
-        ../                                       &&
+        $OPTS ../                                 &&
   make
 }
 
diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index 4571f33..24a1b0a 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -1,6 +1,7 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS     &&
 depends OPENGL                             &&
-optional_depends eigen2         '' '' 'for KSpread'           &&
+optional_depends eigen2         '-DEIGEN2_INCLUDE_DIR=/usr/include/eigen2' '' \
+                                      'for KSpread'           &&
 optional_depends freetype2      '' '' ''                      &&
 optional_depends fontconfig     '' '' ''                      &&
 optional_depends lcms           '' '' 'colour management'     &&
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index ad00527..ebef5e9 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,6 @@
+2008-09-14 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: fix path for eigen2
+
 2008-09-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: eigen -> eigen2
 



More information about the SM-Commit mailing list