Skip to Content.
Sympa Menu

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

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 (13edb0fc587e7d1612e8ba1c0865bdbf71c83bb8)
  • Date: Sat, 6 Aug 2011 15:29:49 -0500

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

http/firefox/CONFIGURE | 6 ++++--
http/firefox/DEPENDS | 2 +-
http/firefox/HISTORY | 5 +++++
http/firefox/PRE_BUILD | 12 ++++++++++++
4 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 13edb0fc587e7d1612e8ba1c0865bdbf71c83bb8
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox: Added a few missing options

diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index 331cb81..704b84d 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -1,7 +1,9 @@
-config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n
+config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n &&

config_query FIREFOX_OFFICIAL "Enable official branding? If enabled, you may
\
-be restricted in distributing these binaries IAW mozilla policies" n
+be restricted in distributing these binaries IAW mozilla policies" n &&
+
+config_query FIREFOX_SAFE "Enable safe browsing (anti-phishing)
implementation?" n &&

config_query FIREFOX_STRIP \
'Remove debugging symbols?' \
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 5b3ff13..e860798 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -15,8 +15,8 @@ depends -sub "3.12.x" nss &&
depends autoconf-2.13 &&
depends gtk+2 &&
depends libidl &&
-depends yasm &&

+optional_depends yasm "" "" "Support for WebM media (VP8 video and Vorbis
Audio)" &&
optional_depends wireless_tools "" "" "for geolocation via WiFi access
points" &&
optional_depends alsa-lib "" "" "for audio support" &&

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 607205f..53c87c2 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2011-08-06 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Added option for safe browsing
+ * DEPENDS: Added optional depends yasm removed depends yasm
+ * PRE_BUILD: Enable options for safe browsing and optioanl yasm
+
2011-08-05 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated devel and stable to version 5.0.1
* CONFIGURE: Added option to strip debugging symbols
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 735c7a5..635e323 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -13,12 +13,24 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&

cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&

+if [[ "$FIREFOX_SAFE" == "y" ]]; then
+ sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
+else
+ sed -i '27iac_add_options --disable-safe-browsing' .mozconfig
+fi &&
+
if is_depends_enabled $SPELL wireless_tools; then
sed -i '27iac_add_options --enable-necko-wifi' .mozconfig
else
sed -i '27iac_add_options --disable-necko-wifi' .mozconfig
fi &&

+if is_depends_enabled $SPELL yasm; then
+ sed -i '27iac_add_options --enable-webm' .mozconfig
+else
+ sed -i '27iac_add_options --disable-webm' .mozconfig
+fi &&
+
if ! is_depends_enabled $SPELL alsa-lib; then
sed -i '27iac_add_options --disable-ogg' .mozconfig &&
sed -i '27iac_add_options --disable-wave' .mozconfig



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (13edb0fc587e7d1612e8ba1c0865bdbf71c83bb8), George Sherwood, 08/06/2011

Archive powered by MHonArc 2.6.24.

Top of Page