diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-15 14:32:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-15 14:32:38 +0000 |
| commit | b3a1f37a733763b824205890f8b98270d729bd3b (patch) | |
| tree | ea91f87a323850dcdd7c4cb8a1297c489ab636de | |
| parent | 0c96f83bef7f3cf30ffab693dd90126bb87e8ce1 (diff) | |
| download | aports-b3a1f37a733763b824205890f8b98270d729bd3b.tar.bz2 aports-b3a1f37a733763b824205890f8b98270d729bd3b.tar.xz | |
main/firefox: upgrade to 6.0
| -rw-r--r-- | main/firefox/APKBUILD | 15 | ||||
| -rw-r--r-- | main/firefox/mozconfig | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index 4a58c978c2..6aebe0f272 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -1,9 +1,9 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=firefox -pkgver=5.0.1 -_pkgver=5.0.1 -_xulver=5.0.1 +pkgver=6.0 +_pkgver=6.0 +_xulver=6.0 pkgrel=0 pkgdesc="firefox web browser" url="http://www.firefox.com" @@ -83,18 +83,19 @@ package() { install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 "$_builddir"/mozilla-2.0/other-licenses/branding/firefox/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png + install -m644 "$_builddir"/browser/branding/official/default48.png \ + ${pkgdir}/usr/share/pixmaps/firefox.png || return 1 install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/firefox.desktop install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop # firefox currently does not work with mprotect. disable it for now - paxctl -c -m "$pkgdir"/usr/lib/firefox-$pkgver/firefox + paxctl -c -m "$pkgdir"/usr/lib/firefox-$pkgver/firefox || return 1 # xulrunner stub launcher has changed to using a symlink overlay... go figure ln -sf /usr/lib/xulrunner-${_xulver} ${pkgdir}/usr/lib/firefox-${pkgver}/xulrunner } -md5sums="6d1f43e402cec84459a3d7f950bd5192 firefox-5.0.1.source.tar.bz2 -9f6877ab36cbdaeead59a31b7b9fdb21 mozconfig +md5sums="1840185865a1a8975df4a3db59080ddc firefox-6.0.source.tar.bz2 +226f723ce7090d1ac590c880ffc8695b mozconfig ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" diff --git a/main/firefox/mozconfig b/main/firefox/mozconfig index b94af41b48..ed8912089c 100644 --- a/main/firefox/mozconfig +++ b/main/firefox/mozconfig @@ -22,9 +22,8 @@ ac_add_options --enable-startup-notification ac_add_options --enable-libxul ac_add_options --disable-crashreporter ac_add_options --disable-updater -ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-5.0.1 +ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-6.0 ac_add_options --enable-safe-browsing -ac_add_options --with-branding=other-licenses/branding/firefox ac_add_options --enable-chrome-format=jar ac_add_options --disable-elf-hack |