diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-25 08:39:04 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-25 08:45:11 +0000 |
| commit | a36c4471f164397818d10002faf9bb1dcd08cab2 (patch) | |
| tree | 012426095e0f7a1fa0d6f95aa83473eed08906c0 /main | |
| parent | 6d5ee10f7b60baccb08e8b9a985635207693198c (diff) | |
| download | aports-a36c4471f164397818d10002faf9bb1dcd08cab2.tar.bz2 aports-a36c4471f164397818d10002faf9bb1dcd08cab2.tar.xz | |
main/firefox: upgrade to 12.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/firefox/APKBUILD | 6 | ||||
| -rw-r--r-- | main/firefox/libvpx.patch | 29 |
2 files changed, 2 insertions, 33 deletions
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index 65b5eff3d3..6277ed9ced 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=firefox -pkgver=11.0 +pkgver=12.0 _pkgver=$pkgver _xulver=$pkgver pkgrel=0 @@ -49,7 +49,6 @@ subpackages="" source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${_pkgver}.source.tar.bz2 mozconfig firefox-5.0-asciidel.patch - libvpx.patch firefox.desktop firefox-safe.desktop" @@ -116,9 +115,8 @@ __EOF__ chmod 755 "$pkgdir"/usr/bin/firefox } -md5sums="4b07acf47857aff72776d805409cdd1b firefox-11.0.source.tar.bz2 +md5sums="80c3e5927274de7f181fb5f931ac5fd4 firefox-12.0.source.tar.bz2 3ba2cb7cda675e78eb0eeb0652ee3457 mozconfig 2328df219e042f6aaec361cbf83cf9e9 firefox-5.0-asciidel.patch -1084155dd8d32c488dfcafff336d2634 libvpx.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" diff --git a/main/firefox/libvpx.patch b/main/firefox/libvpx.patch deleted file mode 100644 index 503ac1bbcb..0000000000 --- a/main/firefox/libvpx.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.in.orig -+++ ./configure.in -@@ -5616,7 +5616,7 @@ - [MOZ_NATIVE_LIBVPX_DEC_TEST=1], - ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) - if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then -- AC_MSG_CHECKING([for libvpx version >= v0.9.7]) -+ AC_MSG_CHECKING([for libvpx version >= v1.0.0]) - dnl We need at least v0.9.7 to fix several crash bugs (for which we - dnl had local patches prior to v0.9.7). - dnl -@@ -5629,7 +5629,7 @@ - dnl v0.9.6 one to check for. - AC_TRY_COMPILE([ - #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) -+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) - #error "test failed." - #endif - ], -@@ -5639,7 +5639,7 @@ - MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" - MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], - [AC_MSG_RESULT([no]) -- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])]) -+ AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) - fi - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS |