From c53220fe7ab31e962b482ec995f1e72d3aa8ad42 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 27 Feb 2017 14:49:04 +0100 Subject: [PATCH] icecat: rebuild against libevent-2.1.8, icu-58.2, nss-3.28.3 --- srcpkgs/icecat/patches/libevent.patch | 34 +++++++++++++++++++++++++++ srcpkgs/icecat/template | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/icecat/patches/libevent.patch diff --git a/srcpkgs/icecat/patches/libevent.patch b/srcpkgs/icecat/patches/libevent.patch new file mode 100644 index 00000000000..6c2a7f661c6 --- /dev/null +++ b/srcpkgs/icecat/patches/libevent.patch @@ -0,0 +1,34 @@ +commit 6dbb1148210e +Author: Mike Hommey +Date: Sun Nov 20 17:51:17 2016 +0900 + + Bug 1318914 - Fix --with-system-libevent build against libevent 2.1. r=billm + + --HG-- + extra : rebase_source : da25767f6045507447f90ab03291c60a4f2c6b3d +--- + ipc/chromium/src/base/message_pump_libevent.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git ipc/chromium/src/base/message_pump_libevent.cc ipc/chromium/src/base/message_pump_libevent.cc +index 2db827e5bade..3cca238c1e7c 100644 +--- ipc/chromium/src/base/message_pump_libevent.cc ++++ ipc/chromium/src/base/message_pump_libevent.cc +@@ -22,9 +22,17 @@ + + // This macro checks that the _EVENT_SIZEOF_* constants defined in + // ipc/chromiume/src/third_party//event2/event-config.h are correct. ++#if defined(_EVENT_SIZEOF_SHORT) + #define CHECK_EVENT_SIZEOF(TYPE, type) \ + static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \ + "bad _EVENT_SIZEOF_"#TYPE); ++#elif defined(EVENT__SIZEOF_SHORT) ++#define CHECK_EVENT_SIZEOF(TYPE, type) \ ++ static_assert(EVENT__SIZEOF_##TYPE == sizeof(type), \ ++ "bad EVENT__SIZEOF_"#TYPE); ++#else ++#error Cannot find libevent type sizes ++#endif + + CHECK_EVENT_SIZEOF(LONG, long); + CHECK_EVENT_SIZEOF(LONG_LONG, long long); diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 3014001da4b..2a329a0b5e8 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -1,7 +1,7 @@ # Template build file for 'icecat'. pkgname=icecat version=45.7.0 -revision=1 +revision=2 short_desc="GNU version of the Firefox browser" maintainer="Jürgen Buchmüller " homepage="https://www.gnu.org/software/${pkgname}/"