diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-04-09 06:30:19 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-04-09 06:50:05 +0000 |
| commit | af9fa6a1656fd58379e3c89d63b85edd5fe4ef70 (patch) | |
| tree | 7971651cd9a95fda33edc3f4d17870a64eba8c3f | |
| parent | 936d5848654a1dbd9884b577dc9498f0fa51fc46 (diff) | |
| download | aports-af9fa6a1656fd58379e3c89d63b85edd5fe4ef70.tar.bz2 aports-af9fa6a1656fd58379e3c89d63b85edd5fe4ef70.tar.xz | |
main/firefox: upgrade to 31.6.0 esr, and fix compile with fortify
| -rw-r--r-- | main/firefox/APKBUILD | 14 | ||||
| -rw-r--r-- | main/firefox/fix-fortify-inline.patch | 11 |
2 files changed, 20 insertions, 5 deletions
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index 7aa5a63b57..3455079132 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -1,10 +1,10 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=firefox -pkgver=31.5.0 +pkgver=31.6.0 _pkgver=$pkgver _xulver=$pkgver -pkgrel=1 +pkgrel=0 pkgdesc="Firefox web browser" url="https://www.mozilla.org/en-US/firefox/organizations/faq/" arch="all" @@ -68,6 +68,7 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-$ stab.h rhbz-966424.patch + fix-fortify-inline.patch firefox.desktop firefox-safe.desktop" @@ -168,7 +169,7 @@ dev() { default_dev } -md5sums="b23f1b80de7b4d00bc8b73a329514ef4 firefox-31.5.0esr.source.tar.bz2 +md5sums="7763129c3bdc393c1f3b4a917ac48ee4 firefox-31.6.0esr.source.tar.bz2 1f4c60e662ed93784431bd06c5141719 mozconfig 1515663477ce427cbdc42f04d8d5ca4e vendor.js f43c1f0ae57aa8289b130c6de8caf3ce 0002-Use-C99-math-isfinite.patch @@ -184,9 +185,10 @@ ce4839160acf3986a2118326ed2b8444 fix-media-webrtc.patch d9a2245b93a7f5855ee029b5fa44e4e9 stat.patch 4383d038b8d8411ea46f4a109197c19e stab.h 15ebeeeb6823c185f4fed98e9bf1b786 rhbz-966424.patch +4272fe0d076566e16daf67faee4090b0 fix-fortify-inline.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" -sha256sums="d4243bf74a4421b590f5580f71486f8608a1a483d4779b44ab0e39d6bbf64b6a firefox-31.5.0esr.source.tar.bz2 +sha256sums="88ad45202a7aee9c43378879863b023270aa29463d312f396a78a6e9cdcbf5c3 firefox-31.6.0esr.source.tar.bz2 23c2b4535ce83c92ba978e15ce328c9f140def155d12523c00df30baf41b98dc mozconfig d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46 vendor.js 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039 0002-Use-C99-math-isfinite.patch @@ -202,9 +204,10 @@ d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4 getchar.patch a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc stat.patch 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28 stab.h a50d15a640f230a2c66e1eb2afd2bed4117605d0f1591dcfec1ca30f0bc2352f rhbz-966424.patch +bcd8759804a52ffd542292f28d0aafc6f4f1f9408fe0f36adb9ba11fe3b85afc fix-fortify-inline.patch b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop" -sha512sums="e891c42ca3cc19b155a44c47d2518df96b3a0a9e5a43bc1132f604833c7fb2adf6a9a51a0d77f6fc9b9e20610d5749786cbacadbc96c6ab08300c0aad16f2198 firefox-31.5.0esr.source.tar.bz2 +sha512sums="6b81059b3a38f2a264cf5bea665ad107e5439a8614644fd3a910034381ab6c0635cea50aa30bd83fec8d8cfebea76c3480eee3a96dfdcbb606c1dd62ef3880a4 firefox-31.6.0esr.source.tar.bz2 e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5 mozconfig 93570f821e59af4d233fc4b1df85e1d145a5e041ad402fd72921987a5a2f5218538d7a13d59bbf0bda5e7df1d5281407674a3765625936340106d1185b15b5d8 vendor.js 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26 0002-Use-C99-math-isfinite.patch @@ -220,5 +223,6 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1 1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7 stat.patch 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h 06ededcd196af98b77991dcba3b710b0dfc061404adb4676fcc380be80410a2621f64d67257b0aefdf36f566e0ea1294b5405b7b4db43e83281a1c64d02da579 rhbz-966424.patch +0f7a6b71dd25048b353cafa8147b56a90e0c324e78a721ea4c0777bd6c193a985591b936209f026bc3aa6f64f8b749a27a212c51754af48f8f237bd7eb59faa2 fix-fortify-inline.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/main/firefox/fix-fortify-inline.patch b/main/firefox/fix-fortify-inline.patch new file mode 100644 index 0000000000..61af42ed62 --- /dev/null +++ b/main/firefox/fix-fortify-inline.patch @@ -0,0 +1,11 @@ +--- a/media/webrtc/signaling/src/sipcc/core/sdp/sdp_os_defs.h ++++ b/media/webrtc/signaling/src/sipcc/core/sdp/sdp_os_defs.h +@@ -27,8 +27,5 @@ + typedef int16_t int16; + typedef unsigned short ushort; + typedef unsigned long ulong; +-#ifndef __GNUC_STDC_INLINE__ +-#define inline +-#endif + + #endif /* _SDP_OS_DEFS_H_ */ |