New commits:
commit 33d550a954c848845fe947ddbb71b7207d51adb2
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
epiphany: added switch to build with webkit if gecko is installed as well
diff --git a/gnome2-apps/epiphany/CONFIGURE b/gnome2-apps/epiphany/CONFIGURE
index e48ff0a..921209e 100755
--- a/gnome2-apps/epiphany/CONFIGURE
+++ b/gnome2-apps/epiphany/CONFIGURE
@@ -1,2 +1,3 @@
message "${PROBLEM_COLOR}WebKit support is still experimental, and many
features are still not implemented!${DEFAULT_COLOR}" &&
config_query EPIPHANY_WEBKIT "Do you want to use the (experimental) WebKit
rendering engine?" n
+
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index 19cb4e0..b8e1f52 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -8,7 +8,7 @@ depends dbus-glib &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Use gtk-doc to build documentation" &&
+ "Use gtk-doc to build documentation (say N if using
webkit)?" &&
if [[ "${EPIPHANY_WEBKIT}" == "y" ]]; then
- depends webkitgtk
+ depends webkitgtk "--with-engine=webkit"
else
depends GECKO
fi
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 532b40e..f25072b 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,5 +1,7 @@
2008-05-04 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: set +x
+ * DEPENDS: added switch needed to build with webkit if both installed
+ added comment to say no to gtk-doc if using webkit
2008-04-24 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS: added prompts for WebKit engine support
[SM-Commit] GIT changes to master grimoire by Robin Cook (c0b2f0419de658db3f47fd2ac9ba93840d1c9a1e),
Robin Cook, 05/04/2008