diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-02-07 12:19:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-02-07 13:17:18 +0000 |
| commit | 5ce840b8fea027a77077da7dc2275e150999e6e3 (patch) | |
| tree | d85d1981bbc082103f9a109f2ebe779e3b4a6fa4 /testing/firefox | |
| parent | 4777ebdef1e16cc319cbc438a092d1b9492174b8 (diff) | |
| download | aports-5ce840b8fea027a77077da7dc2275e150999e6e3.tar.bz2 aports-5ce840b8fea027a77077da7dc2275e150999e6e3.tar.xz | |
testing/firefox: rebuild against new libevent
Diffstat (limited to 'testing/firefox')
| -rw-r--r-- | testing/firefox/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/firefox/libevent.patch | 34 |
2 files changed, 39 insertions, 1 deletions
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD index d2044b4676..d31919a4b6 100644 --- a/testing/firefox/APKBUILD +++ b/testing/firefox/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox pkgver=51.0 _pkgver=$pkgver _xulver=$pkgver -pkgrel=0 +pkgrel=1 pkgdesc="Firefox web browser" url="http://www.firefox.com" arch="all !aarch64" @@ -67,6 +67,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg fix-arm-version-detect.patch mozilla-build-arm.patch disable-moz-stackwalk.patch + libevent.patch firefox.desktop firefox-safe.desktop" @@ -238,6 +239,7 @@ bc81fa31947912c661c6a9c592ff1e46 fix-tools.patch d209d8fc7c4f06d94e4bda097c0178bf fix-arm-version-detect.patch 308ba5b54116a035fe68d0d5c3974857 mozilla-build-arm.patch 5d058c89f6e4384f78068a6a983eb224 disable-moz-stackwalk.patch +bc38c397e184c71166ea08ff402a19c5 libevent.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" sha256sums="6535b7a69c28e3613a815801aa2d9416d133dd92e17e7c8eb68d9776ce9eebea firefox-51.0.source.tar.xz @@ -255,6 +257,7 @@ cd19195cb4c316ad9f7d377cd8581218c888863b1bc4d112c97f48a4425fb946 fix-fortify-sy 1c1ca7a60bcb571f3d2894a9b6ced9c57705f7b737e1e64a9cd451f91c2d3705 fix-arm-version-detect.patch 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3 mozilla-build-arm.patch 17ad8d3e3b1b93cf29f0360f52cb033771c1b57aa26cce8b1d64444500a54b09 disable-moz-stackwalk.patch +4412f69c038931ff0e491dd63ff23a367c913c647852dbe77672c01869002b74 libevent.patch b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop" sha512sums="4406f840a7a2b4e76a74e846d702b717618fb5b677f1c6df864c3428033dd22aad295d656f1fc57e581fd202d894c5483a16691a60b6ca7710315b157b812467 firefox-51.0.source.tar.xz @@ -272,5 +275,6 @@ ed0d344c66fc8e1cc83a11e9858b32c42e841cbeedd9eb9438811e9fcc3593dc824a8336d00058d5 015e1ff6dbf920033982b5df95d869a0b7bf56c6964e45e50649ddf46d1ce09563458e45240c3ecb92808662b1300b67507f7af272ba184835d91068a9e7d5b0 fix-arm-version-detect.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch 4797d2d89ac63a57abb826b8ea9f751314ce66946194033deb9d78c2ff377b88106fd2c7bc5034dc13ad03dd5085b1893c3ccae1a9e63fde35655bb0921f7188 disable-moz-stackwalk.patch +8419f5b2632bfaea969025335563f68b2e036effb18291f692e7eef1f2a746b5499b6a3b1e9ef1ed0909f5a9bb20bbe4fa62145514799419067e0c5c9699a5ef libevent.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/testing/firefox/libevent.patch b/testing/firefox/libevent.patch new file mode 100644 index 0000000000..3e2a200146 --- /dev/null +++ b/testing/firefox/libevent.patch @@ -0,0 +1,34 @@ +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +index 9ce230c..d980f9e 100644 +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -18,18 +18,18 @@ + #include "event.h" + #include "mozilla/UniquePtr.h" + +-// This macro checks that the _EVENT_SIZEOF_* constants defined in ++// This macro checks that the EVENT__SIZEOF_* constants defined in + // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct. +-#define CHECK_EVENT_SIZEOF(TYPE, type) \ +- static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \ +- "bad _EVENT_SIZEOF_"#TYPE); +- +-CHECK_EVENT_SIZEOF(LONG, long); +-CHECK_EVENT_SIZEOF(LONG_LONG, long long); +-CHECK_EVENT_SIZEOF(PTHREAD_T, pthread_t); +-CHECK_EVENT_SIZEOF(SHORT, short); +-CHECK_EVENT_SIZEOF(SIZE_T, size_t); +-CHECK_EVENT_SIZEOF(VOID_P, void*); ++#define CHECKEVENT__SIZEOF(TYPE, type) \ ++ static_assert(EVENT__SIZEOF_##TYPE == sizeof(type), \ ++ "bad EVENT__SIZEOF_"#TYPE); ++ ++CHECKEVENT__SIZEOF(LONG, long); ++CHECKEVENT__SIZEOF(LONG_LONG, long long); ++CHECKEVENT__SIZEOF(PTHREAD_T, pthread_t); ++CHECKEVENT__SIZEOF(SHORT, short); ++CHECKEVENT__SIZEOF(SIZE_T, size_t); ++CHECKEVENT__SIZEOF(VOID_P, void*); + + // Lifecycle of struct event + // Libevent uses two main data structures: |