Attachment #118972 for bug #161421

Lines 775-780 Link Here

(-)Mk/bsd.gecko.mk (+4 lines)
775	@${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/iconv.h	782	@${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/iconv.h
776	@${ECHO_CMD} "#include \"${LOCALBASE}/include/iconv.h\"" >> ${MOZSRC}/${subdir}/iconv.h	783	@${ECHO_CMD} "#include \"${LOCALBASE}/include/iconv.h\"" >> ${MOZSRC}/${subdir}/iconv.h
777	@${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/iconv.h	784	@${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/iconv.h
		785	@${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/event.h
		786	@${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/event.h
		787	@${ECHO_CMD} "#include <event2/compat/event.h>" >> ${MOZSRC}/${subdir}/event.h
		788	@${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/event.h
778	.endfor	789	.endfor
779	.for subdir in "" nsprpub js/src	790	.for subdir in "" nsprpub js/src
780	@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \	791	@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \

Lines 16-25 DISTNAME= ${PORTNAME}-${DISTVERSION}.sou Link Here

(-)www/firefox/Makefile (-1 / +1 lines)
16	MAINTAINER= gecko@FreeBSD.org	16	MAINTAINER= gecko@FreeBSD.org
17	COMMENT= Web browser based on the browser portion of Mozilla	17	COMMENT= Web browser based on the browser portion of Mozilla
18		18
19	BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \	19	BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \
20	cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo	20	cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
21	LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \	21	LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
22	event-1.4:${PORTSDIR}/devel/libevent	22	event-2.0.6:${PORTSDIR}/devel/libevent2
23		23
24	CONFLICTS_BUILD= spidermonkey-*	24	CONFLICTS_BUILD= spidermonkey-*
25		25




     AC_DEFINE(HAVE_CLOCK_MONOTONIC)
     AC_SUBST(HAVE_CLOCK_MONOTONIC)
     AC_SUBST(REALTIME_LIBS)
@@ -4019,17 +4019,17 @@ else
     if test "${LIBEVENT_DIR}" = "yes"; then
         LIBEVENT_DIR=/usr
     fi
-    CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
-    LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+    CFLAGS="-I${LIBEVENT_DIR}/include/event2 -I${LIBEVENT_DIR}/include/event2/compat $CFLAGS"
+    LDFLAGS="-L${LIBEVENT_DIR}/lib/event2 $LDFLAGS"
     MOZ_CHECK_HEADER(event.h,
-        [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
-             AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
+        [if test ! -f "${LIBEVENT_DIR}/include/event2/event.h"; then
+             AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include/event2])
          fi],
         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
-    AC_CHECK_LIB(event, event_init,
+    AC_CHECK_LIB(event-2.0, event_init,
                  [MOZ_NATIVE_LIBEVENT=1
-                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-                  MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include/event2 ${LIBEVENT_DIR}/include/event2/compat"
+                  MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib/event2 -levent-2.0"],
                  [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
 fi
 CFLAGS=$_SAVE_CFLAGS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
 LDFLAGS=$_SAVE_LDFLAGS
 LIBS=$_SAVE_LIBS

Return to bug 161421

Lines 45-50 Link Here

(-)www/firefox/files/patch-configure.in (+25 lines)
45	AC_DEFINE(HAVE_CLOCK_MONOTONIC)	45	AC_DEFINE(HAVE_CLOCK_MONOTONIC)
46	AC_SUBST(HAVE_CLOCK_MONOTONIC)	46	AC_SUBST(HAVE_CLOCK_MONOTONIC)
47	AC_SUBST(REALTIME_LIBS)	47	AC_SUBST(REALTIME_LIBS)
		48	@@ -4019,17 +4019,17 @@ else
		49	if test "${LIBEVENT_DIR}" = "yes"; then
		50	LIBEVENT_DIR=/usr
		51	fi
		52	- CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
		53	- LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
		54	+ CFLAGS="-I${LIBEVENT_DIR}/include/event2 -I${LIBEVENT_DIR}/include/event2/compat $CFLAGS"
		55	+ LDFLAGS="-L${LIBEVENT_DIR}/lib/event2 $LDFLAGS"
		56	MOZ_CHECK_HEADER(event.h,
		57	- [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
		58	- AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
		59	+ [if test ! -f "${LIBEVENT_DIR}/include/event2/event.h"; then
		60	+ AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include/event2])
		61	fi],
		62	AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
		63	- AC_CHECK_LIB(event, event_init,
		64	+ AC_CHECK_LIB(event-2.0, event_init,
		65	[MOZ_NATIVE_LIBEVENT=1
		66	- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
		67	- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
		68	+ MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include/event2 ${LIBEVENT_DIR}/include/event2/compat"
		69	+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib/event2 -levent-2.0"],
		70	[MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
		71	fi
		72	CFLAGS=$_SAVE_CFLAGS
48	@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS	73	@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
49	LDFLAGS=$_SAVE_LDFLAGS	74	LDFLAGS=$_SAVE_LDFLAGS
50	LIBS=$_SAVE_LIBS	75	LIBS=$_SAVE_LIBS