Merge branch '2.6' into 2.7

This commit is contained in:
Fredrik Rinnestam 2010-09-08 19:45:42 +02:00
commit 61902f147e
8 changed files with 3297 additions and 3294 deletions

View File

@ -196,6 +196,7 @@ drwxr-xr-x root/root usr/lib/firefox/xulrunner/greprefs/
drwxr-xr-x root/root usr/lib/firefox/xulrunner/icons/
-rw-r--r-- root/root usr/lib/firefox/xulrunner/icons/document.png
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/libmozjs.so
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/libsqlite3.so
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/libxpcom.so
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/libxul.so
drwxr-xr-x root/root usr/lib/firefox/xulrunner/modules/

View File

@ -1,2 +1,2 @@
0ee5f14fd8be07513d16131027ebcb61 firefox-3.6.8.source.tar.bz2
d334d722f0ebbd7988cedb476e21be72 mozconfig
100ecafd6c6c5062bc03bb2fb651fc17 firefox-3.6.9.source.tar.bz2
870d509628f268823289eebbec9f1af8 mozconfig

View File

@ -4,7 +4,7 @@
# Depends on: xulrunner
name=firefox
version=3.6.8
version=3.6.9
release=1
source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2
mozconfig)

View File

@ -16,7 +16,7 @@ ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-mng
ac_add_options --with-pthreads
ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2.8
ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2.9
ac_add_options --enable-system-cairo
ac_add_options --enable-optimize="#CFLAGS#"
ac_add_options --enable-official-branding

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
0ee5f14fd8be07513d16131027ebcb61 firefox-3.6.8.source.tar.bz2
ce6affb339831b2466213b34d02fa4d8 mozconfig
100ecafd6c6c5062bc03bb2fb651fc17 firefox-3.6.9.source.tar.bz2
85f90d7430da5d8b4dac5543d77f2137 mozconfig

View File

@ -4,9 +4,9 @@
# Depends on: libidl, nss, gtk, perl, python, dbus-glib, alsa-lib
name=xulrunner
version=1.9.2.8
version=1.9.2.9
release=1
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.8/source/firefox-3.6.8.source.tar.bz2
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.9/source/firefox-3.6.9.source.tar.bz2
mozconfig)
build() {

View File

@ -13,7 +13,6 @@ ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-mng
ac_add_options --enable-system-cairo
ac_add_options --enable-system-sqlite
ac_add_options --with-pthreads
ac_add_options --disable-tests
ac_add_options --disable-mochitest