summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2009-09-26 23:07:53 +0200
committerLadislav Hagara2009-09-26 23:07:53 +0200
commit130b76f4cc570532747dc1852311d6169a203489 (patch)
tree3da9b7060b93cac892657bd464fe95e3a461d8e6
parent80de4b7d385a272c1e7c778836adfe0bd35a499e (diff)
epiphany: xulrunner rendering engine removed
-rwxr-xr-xgnome2-apps/epiphany/BUILD5
-rwxr-xr-xgnome2-apps/epiphany/CONFIGURE3
-rwxr-xr-xgnome2-apps/epiphany/DEPENDS6
-rw-r--r--gnome2-apps/epiphany/HISTORY3
-rwxr-xr-xgnome2-apps/epiphany/INSTALL6
5 files changed, 4 insertions, 19 deletions
diff --git a/gnome2-apps/epiphany/BUILD b/gnome2-apps/epiphany/BUILD
index 24c76de115..406267e32d 100755
--- a/gnome2-apps/epiphany/BUILD
+++ b/gnome2-apps/epiphany/BUILD
@@ -1,8 +1,3 @@
-if [[ "${EPIPHANY_WEBKIT}" == "n" ]]; then
-OPTS="${OPTS} --with-gecko=libxul-embedding"
-fi &&
-
-
# requires at least -O2 to not segfault on startup with gcc 4.0
if ! echo "$CFLAGS" | grep -q -- '-O3'; then
CFLAGS="$CFLAGS -O2" &&
diff --git a/gnome2-apps/epiphany/CONFIGURE b/gnome2-apps/epiphany/CONFIGURE
deleted file mode 100755
index 8e9f9f06d4..0000000000
--- a/gnome2-apps/epiphany/CONFIGURE
+++ /dev/null
@@ -1,3 +0,0 @@
-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 (Requires devel version)?" n
-
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index 6d795fc945..4179816789 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -30,8 +30,4 @@ optional_depends rarian \
optional_depends libgnomeprintui '' '' 'Enable printing?' &&
-if [[ "${EPIPHANY_WEBKIT}" == "y" ]]; then
- depends webkitgtk "--with-engine=webkit"
-else
- depends xulrunner
-fi
+depends webkitgtk
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index eed1160788..61e1d56589 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2009-09-26 Ladislav Hagara <hgr@vabo.cz>
+ * DEPENDS, CONFIGURE, BUILD, INSTALL: xulrunner rendering engine removed
+
2009-09-22 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.28.0
* PRE_BUILD, epiphany.patch: removed
diff --git a/gnome2-apps/epiphany/INSTALL b/gnome2-apps/epiphany/INSTALL
deleted file mode 100755
index 4c5b226f34..0000000000
--- a/gnome2-apps/epiphany/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ "${EPIPHANY_WEBKIT}" == "n" ]]; then
-mkdir -p $INSTALL_ROOT/usr/lib/epiphany/$(echo $VERSION|cut -d . -f 1,2) &&
-ln -sf $INSTALL_ROOT/usr/lib/xulrunner/plugins $INSTALL_ROOT/usr/lib/epiphany/$(echo $VERSION|cut -d . -f 1,2)/plugins
-fi &&
-
-default_install