diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-02-07 11:29:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-02-07 11:47:57 +0000 |
| commit | 4857b46c042b6e261281aa5c5801789de7734b67 (patch) | |
| tree | 468e8171636f2bc78b91b64f4200215aea794f04 /community/firefox-esr | |
| parent | fce1a3211b8a9811f40aee96b788154903b9c1ea (diff) | |
| download | aports-4857b46c042b6e261281aa5c5801789de7734b67.tar.bz2 aports-4857b46c042b6e261281aa5c5801789de7734b67.tar.xz | |
community/firefox-esr: rebuild against new libevent
Diffstat (limited to 'community/firefox-esr')
| -rw-r--r-- | community/firefox-esr/APKBUILD | 6 | ||||
| -rw-r--r-- | community/firefox-esr/libevent.patch | 34 |
2 files changed, 39 insertions, 1 deletions
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD index 98fe82ca96..608ffd256c 100644 --- a/community/firefox-esr/APKBUILD +++ b/community/firefox-esr/APKBUILD @@ -5,7 +5,7 @@ pkgname=firefox-esr pkgver=45.7.0 _pkgver=$pkgver _xulver=$pkgver -pkgrel=0 +pkgrel=1 pkgdesc="Firefox web browser" url="https://www.mozilla.org/en-US/firefox/organizations/faq/" arch="all" @@ -73,6 +73,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox libavutil.patch mallinfo.patch gcc6-fix-compilation.patch + libevent.patch firefox.desktop firefox-safe.desktop" @@ -193,6 +194,7 @@ f29e0036edc7b3a4158a82fa97bde500 fix-fortify-inline.patch b8b2a3cdb38f402e4eb4885908233811 libavutil.patch 0db0cce8350d59a91ae2c4f0400f7146 mallinfo.patch c35d743dd706093ff5aa7dbb7e6168bb gcc6-fix-compilation.patch +bc38c397e184c71166ea08ff402a19c5 libevent.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" sha256sums="4b5610691d32b77dd0dec25902f0d19e530c184cedc11babb530621cbdd33143 firefox-45.7.0esr.source.tar.xz @@ -214,6 +216,7 @@ a1ba79ec0c50c19edcfb24bb2686a718a77b02035e412989b9208b9b818abe14 allow-utf8-fal 83113f1fbc0389602b3623e8a5428d41837c4ec9557615c37ca05619526a7404 libavutil.patch 2f564fa5f347f3c7f20d589ef273f000ca9c9aeca2c6ad0fb5b15bfc715d8b81 mallinfo.patch 5ae2edf65b65a29c8d266343230c0ba9268f864697fc1f984d79e980a365a8fc gcc6-fix-compilation.patch +4412f69c038931ff0e491dd63ff23a367c913c647852dbe77672c01869002b74 libevent.patch b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop" sha512sums="6424101b6958191ce654d0619950dfbf98d4aa6bdd979306a2df8d6d30d3fecf1ab44638061a2b4fb1af85fe972f5ff49400e8eeda30cdcb9087c4b110b97a7d firefox-45.7.0esr.source.tar.xz @@ -235,5 +238,6 @@ ebbc2b1336197c289e9b7c073d196fb5734e1dad0109fe70538f8089b1873e4b55305cd39cefcf95 2213dbd7eb36f954add09977c0bb979aea79376164bc98d7e8957ecf584776bc11cc88b6d8235f9e04ac69d5975a47c2f52fd9aff9076326f15997657af8c9f3 libavutil.patch bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f26b54a3679387b2f33a51e945b650671ad85c0a2d59a5a29 mallinfo.patch 09288e3c9b94e7bfb4f764c506d98315ab3a44926cca59183dd22a84184c1de44f5dbe973367ec0ee0200d438c028e1dbe9fce4d9ce92f0e1367be50a9a72671 gcc6-fix-compilation.patch +8419f5b2632bfaea969025335563f68b2e036effb18291f692e7eef1f2a746b5499b6a3b1e9ef1ed0909f5a9bb20bbe4fa62145514799419067e0c5c9699a5ef libevent.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/community/firefox-esr/libevent.patch b/community/firefox-esr/libevent.patch new file mode 100644 index 0000000000..3e2a200146 --- /dev/null +++ b/community/firefox-esr/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: |