summaryrefslogtreecommitdiff
path: root/mozilla-testing/icecat
diff options
context:
space:
mode:
Diffstat (limited to 'mozilla-testing/icecat')
-rw-r--r--mozilla-testing/icecat/PKGBUILD85
-rw-r--r--mozilla-testing/icecat/firefox-install-dir.patch28
-rw-r--r--mozilla-testing/icecat/mozconfig109
-rw-r--r--mozilla-testing/icecat/mozconfig.default61
-rw-r--r--mozilla-testing/icecat/mozconfig.firefox46
-rw-r--r--mozilla-testing/icecat/mozconfig.old87
-rw-r--r--mozilla-testing/icecat/parabola.patch22
-rw-r--r--mozilla-testing/icecat/vendor.js5
8 files changed, 227 insertions, 216 deletions
diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD
index af040596a..b2b5eadef 100644
--- a/mozilla-testing/icecat/PKGBUILD
+++ b/mozilla-testing/icecat/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Figue <ffigue at gmail>
+# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
@@ -11,12 +11,10 @@
# the value for 'browser.dictionaries.download.url' in 'libre.patch'
pkgname=icecat
-_pkgver=9.0
pkgver=9.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/gnuzilla/"
license=('MPL' 'GPL' 'LGPL')
depends=(
'alsa-lib'
@@ -32,7 +30,7 @@ depends=(
'mime-types'
'mozilla-common'
'mozilla-searchplugins'
- 'nss'
+ 'nss>=3.13.1'
'sqlite3'
'startup-notification'
)
@@ -49,29 +47,28 @@ makedepends=(
'yasm'
'zip'
)
-options=(!buildflags !distcc)
+url="http://www.gnu.org/software/gnuzilla/"
install=icecat.install
source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
mozconfig
- mozconfig.old
- mozconfig.default
- libre.patch
- parabola.patch
icecat.desktop
- icecat-safe.desktop)
+ icecat-safe.desktop
+ libre.patch
+ firefox-install-dir.patch
+ vendor.js)
build() {
- ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/$pkgname-$pkgver"
cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+ patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
- patch -Np1 -i "$srcdir/parabola.patch" # Parabola settings
# Fix PRE_RELEASE_SUFFIX
- sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in
+ sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+ browser/base/Makefile.in
- export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
export PYTHON="/usr/bin/python2"
LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
@@ -80,43 +77,49 @@ build() {
}
package() {
- ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
- cd "${srcdir}/${pkgname}-${pkgver}"
-
+ cd "$srcdir/$pkgname-$pkgver"
make -j1 -f client.mk DESTDIR="$pkgdir" install
- msg2 "Finishing..."
- install -m755 -d "${pkgdir}/usr/share/pixmaps"
- install -m644 browser/branding/unofficial/default48.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref"
- install -m755 -d "${pkgdir}/usr/share/applications"
- install -m644 "${srcdir}/icecat.desktop" "${pkgdir}/usr/share/applications"
- install -m644 "${srcdir}/icecat-safe.desktop" "${pkgdir}/usr/share/applications"
+ brandingdir="browser/branding/unofficial"
+ for i in 16x16 32x32 48x48; do
+ install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png"
+ done
- ln -s "${pkgname}-${pkgver}" "${pkgdir}/usr/lib/${pkgname}-${_pkgver}" # WHY???!!!
- ln -s "${pkgname}-${_pkgver}" "${pkgdir}/usr/lib/${pkgname}"
+ install -d "$pkgdir/usr/share/applications"
+ install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications"
+ install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications"
- rm -rf "${pkgdir}${ICECATDIR}/"{dictionaries,hyphenation,searchplugins,plugins}
- ln -sf /usr/share/hunspell "${pkgdir}${ICECATDIR}/dictionaries"
- ln -sf /usr/share/hyphen "${pkgdir}${ICECATDIR}/hyphenation"
- ln -sf /usr/lib/mozilla/plugins "${pkgdir}${ICECATDIR}/plugins"
- ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}${ICECATDIR}/searchplugins"
+ rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
+ ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+ ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
+ ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgname/plugins"
+ ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/searchplugins"
# We don't want the development stuff
- rm -rf "${pkgdir}/usr/include"
- rm -rf "${pkgdir}/usr/lib/${pkgname}-devel-${pkgver}"
- rm -rf "${pkgdir}/usr/share/idl"
+ rm -rf "$pkgdir"/usr/{include,lib/$pkgname-devel,share/idl}
- # Workaround for now:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
- ln -sf "${ICECATDIR}/${pkgname}-bin" "${pkgdir}${ICECATDIR}/$pkgname"
+ # Fix a bug with https-everywhere (duplicate rules)
+ rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD"
+
+ # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+ ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
}
md5sums=('a135581da2fd2845f268d7ca91054c06'
'9c0cd5b45a3c4b04b872b6a900f62286'
'0e5057d9427c6cd5e2f3b78fe34f50d9'
'44959606e4a704e68a913e73fc941926'
+ 'e81ad01dbc16ba28bf92ba4b7c309ca7'
+ 'd93fe402b87cd000a869e1fd6badc6c9'
'07e65752416e615fe04ce586bc58f86b'
- '037b44b6e07d7115e0fb221d67b94272'
+ '1e4bcac59e93d21fffa6a1d1ad235247'
+ '0d053487907de4376d67d8f499c5502b')
+md5sums=('a135581da2fd2845f268d7ca91054c06'
+ '9c0cd5b45a3c4b04b872b6a900f62286'
'e81ad01dbc16ba28bf92ba4b7c309ca7'
- 'd93fe402b87cd000a869e1fd6badc6c9')
+ 'd93fe402b87cd000a869e1fd6badc6c9'
+ '07e65752416e615fe04ce586bc58f86b'
+ '1e4bcac59e93d21fffa6a1d1ad235247'
+ 'c382e35315047e4ca368d09383b39b8d')
diff --git a/mozilla-testing/icecat/firefox-install-dir.patch b/mozilla-testing/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/mozilla-testing/icecat/firefox-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir = @datadir@
+ mandir = @mandir@
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig
index 5a04038be..c1305ac60 100644
--- a/mozilla-testing/icecat/mozconfig
+++ b/mozilla-testing/icecat/mozconfig
@@ -1,92 +1,57 @@
-# We are building the browser
-ac_add_options --enable-application=browser
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-# Branding
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-
-# GNUzilla things
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
+. $topsrcdir/browser/config/mozconfig
-# Operating system things
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
-ac_add_options --with-pthreads
-
-ac_add_options --enable-toolkit-cairo-gtk2
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-svg-renderer=cairo
-ac_add_options --disable-toolkit-qt
-
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
+# System libraries
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 --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
-ac_add_options --enable-freetype2
-ac_add_options --enable-pango
+# Features
ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
-
-# Enable/Disable web technologies
-ac_add_options --enable-canvas
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-smil
-ac_add_options --enable-svg
-
-# Enable/Disable "user-y" features
-ac_add_options --enable-extensions="default spellcheck"
-
-ac_add_options --disable-safe-browsing
-ac_add_options --enable-url-classifier
-ac_add_options --disable-chatzilla
-ac_add_options --disable-accessibility
-ac_add_options --disable-calendar
-ac_add_options --disable-composer
-
-# Enable/Disable "system-y" features
+ac_add_options --disable-gnomevfs
ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-installer
ac_add_options --disable-updater
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-gio
-ac_add_options --enable-libnotify
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-ac_add_options --enable-xterm-updates
-
-# Build settings
-ac_add_options --disable-mochitest
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
ac_add_options --disable-tests
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
+# Optimization
+ac_add_options --enable-optimize
# PGO
ac_add_options --enable-profile-guided-optimization
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# IceCat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default
index 21aaa0edd..01e047fc3 100644
--- a/mozilla-testing/icecat/mozconfig.default
+++ b/mozilla-testing/icecat/mozconfig.default
@@ -1,57 +1,35 @@
# This is a better commented version of the default .mozconfig from 9.0.1
-
-# We are building the browser
ac_add_options --enable-application=browser
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-# Branding
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-
-# GNUzilla things
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Operating system things
ac_add_options --prefix=/usr/local
#ac_add_options --with-default-mozilla-five-home=/usr/local/lib
+
+# System libraries
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+#ac_add_options --with-system-png
+ac_add_options --disable-system-cairo
#ac_add_options --with-pthreads
+ac_add_options --disable-toolkit-qt
ac_add_options --enable-toolkit-cairo-gtk2
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --enable-svg-renderer=cairo
-ac_add_options --disable-toolkit-qt
-
-ac_add_options --disable-system-cairo
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
+# Features
+ac_add_options --enable-extensions="default spellcheck"
ac_add_options --enable-freetype2
ac_add_options --enable-pango
-
-# Enable/Disable web technologies
ac_add_options --enable-crypto
#ac_add_options --enable-postscript
ac_add_options --enable-svg
ac_add_options --enable-xft
-# Enable/Disable "user-y" features
-ac_add_options --enable-extensions="default spellcheck"
-
ac_add_options --disable-chatzilla
ac_add_options --disable-accessibility
ac_add_options --disable-calendar
ac_add_options --disable-composer
-# Enable/Disable "system-y" features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-
#ac_add_options --disable-jsd
#ac_add_options --disable-libxul
ac_add_options --disable-ipc
@@ -62,9 +40,24 @@ ac_add_options --disable-profilesharing
ac_add_options --disable-xinerama
ac_add_options --disable-xprint
-# Build settings
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --disable-mochitest
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+ac_add_options --disable-debug
+
+# Optimization
+ac_add_options --disable-elf-dynstr-gc
ac_add_options --enable-optimize="-pipe -O3"
ac_add_options --enable-strip
+
+# IceCat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
diff --git a/mozilla-testing/icecat/mozconfig.firefox b/mozilla-testing/icecat/mozconfig.firefox
new file mode 100644
index 000000000..428503642
--- /dev/null
+++ b/mozilla-testing/icecat/mozconfig.firefox
@@ -0,0 +1,46 @@
+# This is the .mozconfig used by Arch for Firefox
+. $topsrcdir/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+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 --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
diff --git a/mozilla-testing/icecat/mozconfig.old b/mozilla-testing/icecat/mozconfig.old
index 3ae3e1c2e..a790aee48 100644
--- a/mozilla-testing/icecat/mozconfig.old
+++ b/mozilla-testing/icecat/mozconfig.old
@@ -1,85 +1,78 @@
# This is a better commented version of the .mozconfig used by the Parabola
# package < v9
-
-# We are building the browser
. $topsrcdir/browser/config/mozconfig
-# Branding
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-
-# GNUzilla things
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Operating system things
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
-ac_add_options --with-pthreads
-
-ac_add_options --enable-default-toolkit=cairo-gtk2
-
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
+# System libraries
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-cairo
+ac_add_options --with-pthreads
-ac_add_options --enable-pango
-ac_add_options --enable-startup-notification
+ac_add_options --enable-default-toolkit=cairo-gtk2
+# Features
+ac_add_options --enable-extensions=default
+
+ac_add_options --enable-url-classifier
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
-# Enable/Disable web technologies
ac_add_options --enable-canvas
ac_add_options --enable-canvas3d
ac_add_options --enable-places
ac_add_options --enable-smil
ac_add_options --enable-svg
-# Enable/Disable "user-y" features
-ac_add_options --enable-extensions=default
-
-ac_add_options --disable-safe-browsing
-ac_add_options --enable-url-classifier
-
-# Enable/Disable "system-y" features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --disable-update
-
-ac_add_options --disable-gnomevfs
ac_add_options --disable-javaxpcom
-ac_add_options --enable-gio
ac_add_options --enable-libnotify
ac_add_options --enable-printing
ac_add_options --enable-xinerama
ac_add_options --enable-xterm-updates
-# Build settings
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-update
+ac_add_options --disable-tests
ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+ac_add_options --disable-debug
+
+# Optimization
ac_add_options --disable-pedantic
ac_add_options --disable-static
-ac_add_options --disable-tests
ac_add_options --enable-install-strip
ac_add_options --enable-jemalloc
ac_add_options --enable-optimize
ac_add_options --enable-strip
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
# PGO
ac_add_options --enable-profile-guided-optimization
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# IceCat
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
diff --git a/mozilla-testing/icecat/parabola.patch b/mozilla-testing/icecat/parabola.patch
deleted file mode 100644
index b8000c3ea..000000000
--- a/mozilla-testing/icecat/parabola.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru icecat-9.0.1.orig/browser/app/profile/firefox.js icecat-9.0.1/browser/app/profile/firefox.js
---- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-27 00:11:30.000000000 -0500
-+++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-27 00:11:39.000000000 -0500
-@@ -48,6 +48,8 @@
- #endif
- #endif
-
-+pref("general.startup.browser", true);
-+
- pref("browser.chromeURL","chrome://browser/content/");
- pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
-
-@@ -487,6 +489,9 @@
- pref("browser.gesture.twist.left", "");
- pref("browser.gesture.tap", "cmd_fullZoomReset");
-
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- #ifdef XP_MACOSX
- // On OS X, if the wheel has one axis only, shift+wheel comes through as a
diff --git a/mozilla-testing/icecat/vendor.js b/mozilla-testing/icecat/vendor.js
new file mode 100644
index 000000000..808d1b118
--- /dev/null
+++ b/mozilla-testing/icecat/vendor.js
@@ -0,0 +1,5 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 02:43:16 +0000