[SM-Commit] GIT changes to master grimoire by Donald Johnson (0229c5e17755e5b4ce1605567d529efbf5db25d4)

Donald Johnson scm at sourcemage.org
Thu Jul 8 03:57:14 EDT 2010


GIT changes to master grimoire by Donald Johnson <minozake at codemages.net>:

 ChangeLog           |    3 +++
 FUNCTIONS           |    1 +
 x11/tint2/BUILD     |    1 -
 x11/tint2/CONFIGURE |    4 ++--
 x11/tint2/DEPENDS   |    4 ++--
 x11/tint2/HISTORY   |    6 ++++++
 6 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 0229c5e17755e5b4ce1605567d529efbf5db25d4
Author: Donald Johnson <minozake at codemages.net>
Commit: Donald Johnson <minozake at codemages.net>

    x11/tint2: BUILD doesn't call prepare_cmake_flags()

commit a23a1e8719115d29b84b70a4b3add213508dca46
Author: Donald Johnson <minozake at codemages.net>
Commit: Donald Johnson <minozake at codemages.net>

    FUNCTIONS: cmake_build() calls prepare_cmake_flags()

commit 454b23f40ce6a863b7609940fcaea4f937ae077e
Author: Donald Johnson <minozake at codemages.net>
Commit: Donald Johnson <minozake at codemages.net>

    x11/tint2: Fixed cmake issues (bug #15756)

diff --git a/ChangeLog b/ChangeLog
index 6338108..0871675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-07-08 Donald Johnson <minozake at codemages.net>
+	* FUNCTIONS: cmake_build() calls prepare_cmake_flags()
+
 2010-07-07 Treeve Jelbert <treeve at sourcemage.org>
 	* kde4-apps/kshowmail: new spell, view POP3 mail on server
 
diff --git a/FUNCTIONS b/FUNCTIONS
index 8e6a160..f9ad35c 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -514,6 +514,7 @@ cmake_build() {
   cd $SOURCE_DIRECTORY  &&
   mkdir -p build        &&
   cd build              &&
+  prepare_cmake_flags   &&
   cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr -DSYSCONFDIR=$INSTALL_ROOT/etc $OPTS ../  &&
   make
 }
diff --git a/x11/tint2/BUILD b/x11/tint2/BUILD
index db9e927..3f0803b 100755
--- a/x11/tint2/BUILD
+++ b/x11/tint2/BUILD
@@ -1,3 +1,2 @@
 OPTS="$TINT2_OPTS $OPTS" &&
-
 cmake_build
diff --git a/x11/tint2/CONFIGURE b/x11/tint2/CONFIGURE
index c4dde24..d717fec 100755
--- a/x11/tint2/CONFIGURE
+++ b/x11/tint2/CONFIGURE
@@ -1,6 +1,6 @@
 config_query_option  TINT2_OPTS                        \
                      "Enable example configuration?" n \
-                     "-DENABLE_EXAMPLES:BOOL=ON"  "-DENABLE_EXAMPLES:BOOL=OFF" &&
+                     "-DENABLE_EXAMPLES%BOOL=ON"  "-DENABLE_EXAMPLES%BOOL=OFF" &&
 config_query_option  TINT2_OPTS                        \
                      "Enable battery status monitor?" y \
-                     "-DENABLE_BATTERY:BOOL=ON"  "-DENABLE_BATTERY:BOOL=OFF"
+                     "-DENABLE_BATTERY%BOOL=ON"  "-DENABLE_BATTERY%BOOL=OFF"
diff --git a/x11/tint2/DEPENDS b/x11/tint2/DEPENDS
index ef05062..8ff5c5a 100755
--- a/x11/tint2/DEPENDS
+++ b/x11/tint2/DEPENDS
@@ -21,6 +21,6 @@ depends pygtk2 &&
 depends libxrandr &&
 
 optional_depends  'gtk+2' \
-                  '-DENABLE_TINT2CONF:BOOL=ON' \
-                  '-DENABLE_TINT2CONF:BOOL=OFF' \
+                  '-DENABLE_TINT2CONF%BOOL=ON' \
+                  '-DENABLE_TINT2CONF%BOOL=OFF' \
                   'for a GTK+2 theme switcher'
diff --git a/x11/tint2/HISTORY b/x11/tint2/HISTORY
index 2552a97..82d55ec 100644
--- a/x11/tint2/HISTORY
+++ b/x11/tint2/HISTORY
@@ -1,3 +1,9 @@
+2010-07-08 Donald Johnson <minozake at codemages.net>
+	* CONFIGURE, DEPENDS: Replaced colons with percents. (bug #15756)
+	* BUILD: Added prepare_cmake_flags() call in preperation for integration.
+	(bug #15756)
+	* BUILD: Removed prepare_cmake_flags()
+
 2010-07-01 Donald Johnson <minozake at codemages.net>
 	* DETAILS: version up to 0.11
 	* DEPENDS: libxrandr dependency.



More information about the SM-Commit mailing list