[Lunar-commits] <moonbase> webkit: new build option: gtk+-3

[Michael 'v4hn' Goerner]

commit 4be8bb5e85e9ab0152100659a46b2954132da1cc
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Mon Apr 30 10:46:37 2012 +0200

    webkit: new build option: gtk+-3
---
 web/webkit/BUILD   |    1 -
 web/webkit/DEPENDS |    3 ++-
 web/webkit/DETAILS |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/webkit/BUILD b/web/webkit/BUILD
index 2b8b8fa..abb41c1 100644
--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -11,7 +11,6 @@
           --enable-svg-foreign-object   \
           --enable-svg-as-image         \
           --enable-optimizations        \
-          --with-gtk=2.0                \
           --disable-gtk-doc-html"      &&
 
   default_build &&
diff --git a/web/webkit/DEPENDS b/web/webkit/DEPENDS
index a9eefa2..cb0e64b 100644
--- a/web/webkit/DEPENDS
+++ b/web/webkit/DEPENDS
@@ -1,4 +1,3 @@
-depends gtk+-2
 depends icu4c
 depends gperf
 depends libxslt
@@ -13,6 +12,8 @@ depends gst-plugins-base
 # workaround for make_names.pl
 depends Switch
 
+optional_depends "gtk+-3"                "--with-gtk=3.0"         ""                        "select ${PROBLEM_COLOR}either${DEFAULT_COLOR}${MESSAGE_COLOR} GTK+2 or GTK+3"
+optional_depends "gtk+-2"                "--with-gtk=2.0"         ""                        "select ${PROBLEM_COLOR}either${DEFAULT_COLOR}${MESSAGE_COLOR} GTK+2 or GTK+3"
 optional_depends "gst-plugins-good"      "--enable-video"         "--disable-video"         "for HTML5 video support"
 optional_depends "geoclue"               "--enable-geolocation"   "--disable-geolocation"   "for geolocation support"
 optional_depends "gobject-introspection" "--enable-introspection" "--disable-introspection" "say Y for Epiphany, and possibly others"
diff --git a/web/webkit/DETAILS b/web/webkit/DETAILS
index be9e84a..eab70ba 100644
--- a/web/webkit/DETAILS
+++ b/web/webkit/DETAILS
@@ -7,8 +7,8 @@
          ENTERED=20070919
          UPDATED=20120203
            SHORT="gtk+ web rendering engine"
+           PSAFE=no
 
-PSAFE=no
 cat << EOF
 WebKitGTK+ is a web content engine, derived from KHTML and KJS from KDE,
 and used primarily in Apple's Safari browser. It is made to be embedded