summaryrefslogtreecommitdiff
path: root/libre/iceweasel-libre/mozconfig
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-01-12 17:56:54 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-01-12 17:56:54 -0500
commit005cec01792d1fc62eb011ea35acad0f6d9cb70e (patch)
tree8c9c61b3c0dcdead7fd681ddaac41523162855cb /libre/iceweasel-libre/mozconfig
parentf996597c6b79f714ec28ef04bd3fbd4d18bf2046 (diff)
downloadabslibre-005cec01792d1fc62eb011ea35acad0f6d9cb70e.tar.gz
abslibre-005cec01792d1fc62eb011ea35acad0f6d9cb70e.tar.bz2
abslibre-005cec01792d1fc62eb011ea35acad0f6d9cb70e.zip
libre/iceweasel-libre: update to 18.0.1, simplify libre.patch
This means * tweaking the depends * removing now-upstream patches libre.patch: * use vendor.js for some of it * use a sed script for other parts
Diffstat (limited to 'libre/iceweasel-libre/mozconfig')
-rw-r--r--libre/iceweasel-libre/mozconfig18
1 files changed, 2 insertions, 16 deletions
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 619398aae..121d31aea 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,7 +1,7 @@
. $topsrcdir/browser/config/mozconfig
# System libraries
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
ac_add_options --enable-system-ffi
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-pixman
@@ -18,30 +18,16 @@ ac_add_options --with-system-zlib
# Features
ac_add_options --disable-crashreporter
-ac_add_options --disable-gnomevfs
ac_add_options --disable-installer
-ac_add_options --disable-mochitest
ac_add_options --disable-safe-browsing
ac_add_options --disable-tests
ac_add_options --disable-updater
-ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
ac_add_options --enable-startup-notification
# Vendor settings
-# Optimization
-ac_add_options --enable-optimize
ac_add_options --libdir=/usr/lib
ac_add_options --prefix=/usr
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Platform settings
-#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
# Application settings
ac_add_options --disable-official-branding