Merge branch '2.5' into 2.6

Conflicts:
	xulrunner/Pkgfile
This commit is contained in:
Tilman Sauerbeck 2009-06-12 21:48:43 +02:00
commit c809bca321
6 changed files with 3714 additions and 3714 deletions

View File

@ -1,3 +1,3 @@
1012e835a5c130d18479bccdee240640 firefox-3.0.10-source.tar.bz2 b509f7c05e9566ed290e2c098316c7c3 firefox-3.0.11-source.tar.bz2
86ebb10b368aaed83fad6f53fb3feeb0 mozconfig ffeb2a78f9f6ffa77b151c8a299544bf mozconfig
62530844efda8b387e518162b7922f2f xulrunner.patch 62530844efda8b387e518162b7922f2f xulrunner.patch

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
1012e835a5c130d18479bccdee240640 firefox-3.0.10-source.tar.bz2 b509f7c05e9566ed290e2c098316c7c3 firefox-3.0.11-source.tar.bz2
3a043809a9e0dbf39efe95359fcc5fe7 mozconfig 3a043809a9e0dbf39efe95359fcc5fe7 mozconfig
36727f8c44071fe974d99676180dec8a xulrunner.diff 36727f8c44071fe974d99676180dec8a xulrunner.diff

View File

@ -4,9 +4,9 @@
# Depends on: libidl, nss, gtk, perl, python, dbus-glib # Depends on: libidl, nss, gtk, perl, python, dbus-glib
name=xulrunner name=xulrunner
version=1.9.0.10 version=1.9.0.11
release=2 release=1
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.10/source/firefox-3.0.10-source.tar.bz2 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/source/firefox-3.0.11-source.tar.bz2
mozconfig $name.diff) mozconfig $name.diff)
build() { build() {