From f4444da8f7943507e90c4b169205809221f2744e Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Sun, 13 Jan 2013 21:51:57 -0200
Subject: ice{cat,weasel}: revert to back pkg stables and mv lukeshu pkgs to
 libre-testing

---
 libre/icecat/mozconfig | 73 ++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 32 deletions(-)

(limited to 'libre/icecat/mozconfig')

diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index c5cea7185..5df8547f7 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,51 +1,60 @@
 . $topsrcdir/browser/config/mozconfig
 
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
 # System libraries
-ac_add_options --disable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
-ac_add_options --with-pthreads
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-png
+ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --disable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
 
 # Features
-ac_add_options --disable-crashreporter
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
 ac_add_options --disable-gnomevfs
-ac_add_options --disable-installer
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
+ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
-ac_add_options --enable-gio
-#ac_add_options --enable-gstreamer
-ac_add_options --enable-startup-notification
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
 
-# Vendor settings
-ac_add_options --enable-optimize="-pipe -O3"
-ac_add_options --libdir=/usr/lib
-ac_add_options --prefix=/usr
-# Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+
+# Icecat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
 
-# Application settings
 ac_add_options --disable-official-branding
-# since with-user-appdir with .gnuzilla doesn't do the trick,
-# use app-basename instead
-ac_add_options --with-app-basename=icecat
 ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.mozilla
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
+ac_add_options --with-user-appdir=.gnuzilla
 
-# Other
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+# ConnochaetOS
+#ac_add_options --build=i586-pc-linux-gnu
+#ac_add_options --host=i586-pc-linux-gnu
+#export USE_SHORT_LIBNAME=1
+#mk_add_options USE_SHORT_LIBNAME=1
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 
 # Build-generated
-- 
cgit v1.2.3