New commits:
commit 337601ab079565f1d997a19f8d0abe9c1422ae06
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
firefox: fix up dependencies
commit 33facd2957a0563f78fc6320df53598467de687e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
thunderbird: version 17.0.6, fix up dependencies
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 6e7d374..e2ce3dd 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -30,7 +30,9 @@ if [[ $gccmajor == "4" ]] && [[ $gccminor -ge "6" ]]; then
CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
fi
-echo ac_add_options --enable-optimize=-O2 >> .mozconfig &&
+for option in $OPTS; do
+ echo "ac_add_options $option" >> .mozconfig
+done &&
+depends atk &&
+depends glib2 &&
+depends pango &&
+depends cairo &&
+
+optional_depends gnome-vfs2 \
+ "--enable-gnomevfs" \
+ "--disable-gnomevfs" \
+ "for GnomeVFS support" &&
+
+optional_depends startup-notification \
+ '--enable-startup-notification' \
+ '--disable-startup-notification' \
+ 'for startup notifications' &&
+
+optional_depends gconf2 \
+ '--enable-gconf' \
+ '--disable-gconf' \
+ 'for gconf support' &&
+
+optional_depends 'wireless_tools' \
+ '--enable-necko-wifi' \
+ '--disable-necko-wifi' \
+ 'for Necko WiFi scanning' &&
+
+# Firefox is currently borked and does not compile without alsa-lib, this
+# should be fixed after Firefox starts using Mozilla core 23
+depends alsa-lib &&
+#optional_depends alsa-lib \
+# '--enable-wave' \
+# '--disable-wave --disable-ogg --disable-webm
--disable-dash' \
+# 'for audio/video support' &&
+
+if is_depends_enabled $SPELL alsa-lib; then
+ # Firefox tries to use ogg/ogg.h even with --disable-ogg given
+ #optional_depends libogg \
+ # '--enable-ogg' \
+ # '--disable-ogg' \
+ # 'for sound support' &&
+ depends libogg &&
+
+ # configure script checks for yasm even when --disable-webm and
--disable-dash are given
+ #optional_depends yasm \
+ # '--enable-webm --enable-dash' \
+ # '--disable-webm --disable-dash' \
+ # 'for WebM video support'
+ depends yasm
+fi &&
+
+optional_depends dbus-glib \
+ '--enable-dbus' \
+ '--disable-dbus' \
+ 'for dbus support' &&
suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 39d8663..d4c3bcb 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: Fix up dependencies
+ * BUILD, mozconfig: use proper way to add flags to .mozconfig
+ * PRE_BUILD: removed unnecessary options constructs in lieu of OPTS
+ handling in BUILD
+
2013-04-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 21.0, SECURITY_PATCH++
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 1ed86c5..e3142bb 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -19,23 +19,6 @@ 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
-fi &&
-
if [[ "$FIREFOX_STRIP" == "y" ]]; then
sed -i '27iac_add_options --enable-strip' .mozconfig
fi &&
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index 609fcbb..7e41a7e 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -5,22 +5,16 @@
# Options for client.mk.
mk_add_options MOZ_CO_PROJECT=browser
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
-mk_add_options AUTOCONF=autoconf2.13
+#mk_add_options AUTOCONF=autoconf2.13