Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (1e2e8e0aa5dacaa6e806a15edfc79998f8772478)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (1e2e8e0aa5dacaa6e806a15edfc79998f8772478)
  • Date: Thu, 9 Oct 2008 18:36:28 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

gnome2-apps/epiphany/BUILD | 17 ++---------------
gnome2-apps/epiphany/DEPENDS | 2 +-
gnome2-apps/epiphany/HISTORY | 6 ++++++
gnome2-apps/epiphany/INSTALL | 6 ++++++
4 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 1e2e8e0aa5dacaa6e806a15edfc79998f8772478
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

epiphany: Only gecko provider will be xulrunner. Updated
spell to use this.

diff --git a/gnome2-apps/epiphany/BUILD b/gnome2-apps/epiphany/BUILD
index ed60ee9..24c76de 100755
--- a/gnome2-apps/epiphany/BUILD
+++ b/gnome2-apps/epiphany/BUILD
@@ -1,21 +1,8 @@
-
if [[ "${EPIPHANY_WEBKIT}" == "n" ]]; then
- case "$(get_spell_provider $SPELL GECKO)" in
- "firefox" )
- OPTS="${OPTS} --with-gecko=firefox"
- ;;
- "seamonkey" )
- OPTS="${OPTS} --with-gecko=seamonkey"
- ;;
- "xulrunner" )
- OPTS="${OPTS} --with-gecko=xulrunner"
- ;;
- * )
- OPTS="${OPTS} --with-gecko=mozilla"
- ;;
- esac
+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/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index b8e1f52..f61a094 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -18,5 +18,5 @@ optional_depends gnome-python2 \
if [[ "${EPIPHANY_WEBKIT}" == "y" ]]; then
depends webkitgtk "--with-engine=webkit"
else
- depends GECKO
+ depends xulrunner
fi
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index b627eb2..e86e79d 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,9 @@
+2008-10-09 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Only use xulrunner for gecko
+ * BUILD: Set the correct option for xulrunner if gecko desired.
+ * INSTALL: Create a common plugins directory for gecko based
+ browsers.
+
2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
* PRE_SUB_DEPENDS: fixed broken check (gnome-python2 != python)
* DETAILS: updated VERSION to 2.24.0.1
diff --git a/gnome2-apps/epiphany/INSTALL b/gnome2-apps/epiphany/INSTALL
new file mode 100755
index 0000000..4c5b226
--- /dev/null
+++ b/gnome2-apps/epiphany/INSTALL
@@ -0,0 +1,6 @@
+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



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (1e2e8e0aa5dacaa6e806a15edfc79998f8772478), George Sherwood, 10/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page