summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Johnson2010-07-08 02:44:24 -0500
committerGeorge Sherwood2010-07-10 11:29:58 -0500
commit39d014b83db32ac241b2d5b36582d962b1719b48 (patch)
tree23e8954012ea8e6ef65d91557b810a3834983437
parented4487dbacdadbbd877f1fa3f521b3ba4cf07351 (diff)
x11/tint2: Fixed cmake issues (bug #15756)
(cherry picked from commit 454b23f40ce6a863b7609940fcaea4f937ae077e)
-rwxr-xr-xx11/tint2/BUILD2
-rwxr-xr-xx11/tint2/CONFIGURE4
-rwxr-xr-xx11/tint2/DEPENDS4
-rw-r--r--x11/tint2/HISTORY5
4 files changed, 10 insertions, 5 deletions
diff --git a/x11/tint2/BUILD b/x11/tint2/BUILD
index db9e927dd3..d3953c1be0 100755
--- a/x11/tint2/BUILD
+++ b/x11/tint2/BUILD
@@ -1,3 +1,3 @@
OPTS="$TINT2_OPTS $OPTS" &&
-
+prepare_cmake_flags &&
cmake_build
diff --git a/x11/tint2/CONFIGURE b/x11/tint2/CONFIGURE
index c4dde24246..d717fec4b9 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 ef050621d9..8ff5c5ac74 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 2552a97bc9..a884aae7e9 100644
--- a/x11/tint2/HISTORY
+++ b/x11/tint2/HISTORY
@@ -1,3 +1,8 @@
+2010-07-08 Donald Johnson <minozake@codemages.net>
+ * CONFIGURE, DEPENDS: Replaced colons with percents. (bug #15756)
+ * BUILD: Added prepare_cmake_flags() call in preperation for integration.
+ (bug #15756)
+
2010-07-01 Donald Johnson <minozake@codemages.net>
* DETAILS: version up to 0.11
* DEPENDS: libxrandr dependency.