[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (31f85e56518ab23a189b660010764faff350e0f9)

Treeve Jelbert scm at sourcemage.org
Thu Sep 27 10:56:29 EDT 2007


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

 x11-toolkits/sptk/BUILD    |    7 ++++++-
 x11-toolkits/sptk/DEPENDS  |   19 +++++++++++++------
 x11-toolkits/sptk/HISTORY  |    4 ++++
 x11-toolkits/wxgtk/DETAILS |    4 ++--
 x11-toolkits/wxgtk/HISTORY |    3 +++
 5 files changed, 28 insertions(+), 9 deletions(-)

New commits:
commit 68536395ca87711e2fb601abcdce3837199318bf
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    wxgtk-2.8.6

commit 5fe0a873781c254a6fa8bf758f45547d3d21197e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sptk - update depnds

diff --git a/x11-toolkits/sptk/BUILD b/x11-toolkits/sptk/BUILD
index f3d9560..4ca0850 100755
--- a/x11-toolkits/sptk/BUILD
+++ b/x11-toolkits/sptk/BUILD
@@ -1,4 +1,9 @@
 # avoid building examples, as they won't link properly
 sed -i "/examples/D" CMakeLists.txt &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ./   &&
+# replace @ by :BOOL=ON in OPTS
+local NN                                                &&
+for NN in ASPELL FLTK SQLITE3 POSTGRESQL ODBC; do
+  OPTS="${OPTS/@/:BOOL=ON}"
+done                                                    &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS ./ &&
 make
diff --git a/x11-toolkits/sptk/DEPENDS b/x11-toolkits/sptk/DEPENDS
index 6970f54..b1eedde 100755
--- a/x11-toolkits/sptk/DEPENDS
+++ b/x11-toolkits/sptk/DEPENDS
@@ -1,9 +1,16 @@
 depends cmake    &&
 depends g++      &&
 
-optional_depends  X11-LIBS    "" "" "for X support"               &&
-optional_depends  fltk        "" "" "gui support"                 &&
-optional_depends  postgresql  "" "" "PostgreSQL database support" &&
-optional_depends  sqlite      "" "" "sqlite3 database support"    &&
-optional_depends  ODBC-MGR    "" "" "ODBC database support"       &&
-optional_depends  aspell      "" "" "spell checking"
+# using @ instead of : to avoid a sorcery problem,
+# as the colon is used as a separator in depends processing
+# @ will be rpelace during BUILD
+optional_depends  fltk       '' '-DNO_FLTK@'                  \
+                             'gui support'                    &&
+optional_depends  postgresql '' '-DNO_POSTGRESQL@'            \
+                             'PostgreSql database support'    &&
+optional_depends  sqlite     '' '-DNO_SQLITE3@'               \
+                             'sqlite3 database support'       &&
+optional_depends  ODBC-MGR   '' '-DNO_ODBC@'                  \
+                             'ODBC database support'          &&
+optional_depends  aspell     '' '-DNO_ASPELL@'                \
+                             'spell checking'
diff --git a/x11-toolkits/sptk/HISTORY b/x11-toolkits/sptk/HISTORY
index 433dab2..ec38ab0 100644
--- a/x11-toolkits/sptk/HISTORY
+++ b/x11-toolkits/sptk/HISTORY
@@ -1,4 +1,8 @@
 2007-09-27 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit disable options
+	* BUILD: edit and apply depends options
+
+2007-09-27 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.5.5-r1
 	  LICENSE=BSD
 	* DEPENDS: add optional postgresql
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index 4e6e64e..bcc05ef 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,8 +1,8 @@
            SPELL=wxgtk
           SPELLX=wxGTK
 if [[ "$WX_DEV" == "y" ]];then
-         VERSION=2.8.5
-    SOURCE_HASH=sha512:472ce32e2f2138c48e749d502c6e2a7c332a8427b95238554564d745bd8ac16b115114e3477cf932beb19803f21773bcadcd7e86d7f7963f7fd42478025976d4
+         VERSION=2.8.6
+    SOURCE_HASH=sha512:7aa9f8b76846417534dc5b76b1a4df66388d98d93e870c6ac3e302f62c22b8fde7acfa564bbd8f64446cb46102db5f36963772f82c39827bcc6e6d692d0bda99
 else
          VERSION=2.6.4
     SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 4698421..ad9d319 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.8.6 (new)
+
 2007-09-16 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* PRE_BUILD, debdiff.patch: patch to fix an issue triggered by glibc
 	  2.6, see



More information about the SM-Commit mailing list