svn commit: r432566 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files
Jan Beich
jbeich at FreeBSD.org
Fri Jan 27 19:26:43 UTC 2017
Author: jbeich
Date: Fri Jan 27 19:26:42 2017
New Revision: 432566
URL: https://svnweb.freebsd.org/changeset/ports/432566
Log:
gecko: unbreak with libevent >= 2.1
In file included from objdir//ipc/chromium/Unified_cpp_ipc_chromium0.cpp:119:
ipc/chromium/src/base/message_pump_libevent.cc:29:1: error: use of undeclared identifier '_EVENT_SIZEOF_LONG'
CHECK_EVENT_SIZEOF(LONG, long);
^
ipc/chromium/src/base/message_pump_libevent.cc:26:19: note: expanded from macro 'CHECK_EVENT_SIZEOF'
static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
^
<scratch space>:50:1: note: expanded from here
_EVENT_SIZEOF_LONG
^
PR: 216527
Obtained from: upstream
Added:
head/mail/thunderbird/files/patch-bug1318914 (contents, props changed)
head/www/firefox-esr/files/patch-bug1318914 (contents, props changed)
head/www/firefox/files/patch-bug1318914 (contents, props changed)
head/www/libxul/files/patch-bug1318914 (contents, props changed)
head/www/seamonkey/files/patch-bug1318914 (contents, props changed)
Added: head/mail/thunderbird/files/patch-bug1318914
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1318914 Fri Jan 27 19:26:42 2017 (r432566)
@@ -0,0 +1,34 @@
+commit 6dbb1148210e
+Author: Mike Hommey <mh+mozilla at glandium.org>
+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
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc
++++ mozilla/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/<platform>/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);
Added: head/www/firefox-esr/files/patch-bug1318914
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1318914 Fri Jan 27 19:26:42 2017 (r432566)
@@ -0,0 +1,34 @@
+commit 6dbb1148210e
+Author: Mike Hommey <mh+mozilla at glandium.org>
+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/<platform>/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);
Added: head/www/firefox/files/patch-bug1318914
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox/files/patch-bug1318914 Fri Jan 27 19:26:42 2017 (r432566)
@@ -0,0 +1,34 @@
+commit 6dbb1148210e
+Author: Mike Hommey <mh+mozilla at glandium.org>
+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/<platform>/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);
Added: head/www/libxul/files/patch-bug1318914
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/libxul/files/patch-bug1318914 Fri Jan 27 19:26:42 2017 (r432566)
@@ -0,0 +1,34 @@
+commit 6dbb1148210e
+Author: Mike Hommey <mh+mozilla at glandium.org>
+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/<platform>/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);
Added: head/www/seamonkey/files/patch-bug1318914
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/seamonkey/files/patch-bug1318914 Fri Jan 27 19:26:42 2017 (r432566)
@@ -0,0 +1,34 @@
+commit 6dbb1148210e
+Author: Mike Hommey <mh+mozilla at glandium.org>
+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
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc
++++ mozilla/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/<platform>/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);
More information about the svn-ports-head
mailing list