[SM-Commit] GIT changes to master grimoire by Tommy Boatman (bd2979ea4f32ee7203e16e4068e24b6a82f66133)

Tommy Boatman scm at sourcemage.org
Wed Sep 24 06:24:11 EDT 2008


GIT changes to master grimoire by Tommy Boatman <tboatman at sourcemage.org>:

 http/icecat/BUILD     |    2 ++
 http/icecat/CONFIGURE |    3 +++
 http/icecat/DEPENDS   |    8 ++++++++
 http/icecat/HISTORY   |    4 +++-
 4 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit bd2979ea4f32ee7203e16e4068e24b6a82f66133
Author: Tommy Boatman <tboatman at sourcemage.org>
Commit: Tommy Boatman <tboatman at sourcemage.org>

       icecat: bug 14753 continued
               menu to enable gtk+,gtk+2,qt-x11,xlib dependency
               and choose which to build against

commit 8154ecfa7258aac772572d698861fe7c63a6c7ec
Author: Tommy Boatman <tboatman at sourcemage.org>
Commit: Tommy Boatman <tboatman at sourcemage.org>

       icecat: added gtk+2 dependency (bug 14753)

diff --git a/http/icecat/BUILD b/http/icecat/BUILD
index 19c5a36..709f45a 100755
--- a/http/icecat/BUILD
+++ b/http/icecat/BUILD
@@ -12,6 +12,8 @@ then
   OPTS="--enable-svg-renderer=$ICECAT_RENDER $OPTS"
 fi  &&
 
+  OPTS="--enable-default-toolkit=$ICECAT_TOOLKIT $OPTS"
+
 [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=$HOST"
 
 ./configure --prefix=${INSTALL_ROOT}/usr             \
diff --git a/http/icecat/CONFIGURE b/http/icecat/CONFIGURE
index 5333cf5..8e8b771 100755
--- a/http/icecat/CONFIGURE
+++ b/http/icecat/CONFIGURE
@@ -31,6 +31,9 @@ config_query_option  ICECAT_JS                           \
 config_query_list  ICECAT_RENDER                         \
                    'Possible SVG renderers:'             \
                    'cairo' 'libart' 'none'               &&
+config_query_list  ICECAT_TOOLKIT                        \
+                   'Possible graphics toolkits'          \
+                   'gtk' 'gtk2' 'qt-x11' 'xlib'          &&
 
 config_query  ICECAT_NULLPLUGIN                          \
 "Do you want nullplugin installed (to enable auto search and install of other plugins)" \
diff --git a/http/icecat/DEPENDS b/http/icecat/DEPENDS
index 9d5808b..3fc605d 100755
--- a/http/icecat/DEPENDS
+++ b/http/icecat/DEPENDS
@@ -9,6 +9,14 @@ case $ICECAT_RENDER in
   *) true  ;;
 esac                           &&
 
+case $ICECAT_TOOLKIT in
+  gtk) depends gtk+  ;;
+  gtk2) depends gtk+2 ;;
+  qt-x11) depends qt-x11 ;;
+  *) true ;;
+  
+esac                 	      &&
+
 optional_depends  libxp                          \
                   ""                             \
                   "--disable-xprint"             \
diff --git a/http/icecat/HISTORY b/http/icecat/HISTORY
index 2ce4d5c..a24dbd3 100644
--- a/http/icecat/HISTORY
+++ b/http/icecat/HISTORY
@@ -1,5 +1,7 @@
 2008-09-24 Tommy Boatman <tboatman at sourcemage.org>
-	* DEPENDS: Added zip
+	* DEPENDS: Added zip (bug 14753)
+	* DEPENDS: Added menu to select gtk+, gtk+2, qt-x11, xlib
+	  continuing bug 14753 - one HAS to be enabled
 
 2008-04-14 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: updated to 2.0.0.13-g1, added GPL and LPPL to LICENSE[0]



More information about the SM-Commit mailing list