Index: head/www/waterfox/Makefile =================================================================== --- head/www/waterfox/Makefile (revision 472026) +++ head/www/waterfox/Makefile (revision 472027) @@ -1,78 +1,78 @@ # $FreeBSD$ PORTNAME= waterfox DISTVERSION= 56.2.0-31 DISTVERSIONSUFFIX= -gf435a827f82ac -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment EXPIRATION_DATE=2018-07-10 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.4.7:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ png>=1.6.31:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.19.3:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GITHUB= yes GH_ACCOUNT= MrAlex94 GH_PROJECT= Waterfox USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Waterfox USE_GL= gl WATERFOX_ICON= ${MOZILLA}.png WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default256.png WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop MOZ_OPTIONS= --enable-application=browser \ --with-app-name=${MOZILLA} \ --with-app-basename=${MOZILLA_NAME} \ --with-distribution-id=org.${MOZILLA}project OPTIONS_DEFAULT= BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" # Inconsistent fallback order (libcubeb vs. audio_device) SNDIO_PREVENTS= ${OPTIONS_MULTI_AUDIO:NSNDIO} post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e 's/firefox/${MOZILLA}/' \ -e 's/Firefox/${MOZILLA_NAME}/' \ ${WATERFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${WATERFOX_DESKTOP} \ ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON} .include Index: head/www/waterfox/files/patch-bug1334981 =================================================================== --- head/www/waterfox/files/patch-bug1334981 (nonexistent) +++ head/www/waterfox/files/patch-bug1334981 (revision 472027) @@ -0,0 +1,29 @@ +commit 57a68dc342dd +Author: Henrik Skupin +Date: Thu Jun 7 15:48:48 2018 +0200 + + Bug 1334981 - Backed out changeset d6ca24ba3673 for regression caused by bug 887718. r=enndeakin, a=RyanVM + + MozReview-Commit-ID: 9hIcRVRseO1 + + --HG-- + extra : source : 1f16a2ff45ab492025e42afb8122f4d52cb24c0b +--- + dom/base/nsFocusManager.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git dom/base/nsFocusManager.cpp dom/base/nsFocusManager.cpp +index 864c76402cb12..c5758cfabd523 100644 +--- dom/base/nsFocusManager.cpp ++++ dom/base/nsFocusManager.cpp +@@ -742,9 +742,7 @@ nsFocusManager::WindowRaised(mozIDOMWindowProxy* aWindow) + return NS_ERROR_FAILURE; + } + +- if (!sTestMode) { +- baseWindow->SetVisibility(true); +- } ++ baseWindow->SetVisibility(true); + } + + // If this is a parent or single process window, send the activate event. Property changes on: head/www/waterfox/files/patch-bug1334981 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/waterfox/files/patch-bug1395246 =================================================================== --- head/www/waterfox/files/patch-bug1395246 (nonexistent) +++ head/www/waterfox/files/patch-bug1395246 (revision 472027) @@ -0,0 +1,83 @@ +commit be7a92ebe633 +Author: Randell Jesup +Date: Thu Jun 7 15:26:25 2018 -0400 + + Bug 1395246 - Nullcheck DataChannel SendPacket calls, add some diagnostics. r=drno, a=RyanVM + + --HG-- + extra : source : 4d7a8d001f087fc500be3b4ca2469310fa39e6be +--- + netwerk/sctp/datachannel/DataChannel.cpp | 12 +++++++++++- + netwerk/sctp/datachannel/DataChannel.h | 8 ++++++-- + 2 files changed, 17 insertions(+), 3 deletions(-) + +diff --git netwerk/sctp/datachannel/DataChannel.cpp netwerk/sctp/datachannel/DataChannel.cpp +index b07cfaa4c273d..d7a9b64f155b7 100644 +--- netwerk/sctp/datachannel/DataChannel.cpp ++++ netwerk/sctp/datachannel/DataChannel.cpp +@@ -220,6 +220,9 @@ DataChannelConnection::DataChannelConnection(DataConnectionListener *listener, + mRemotePort = 0; + LOG(("Constructor DataChannelConnection=%p, listener=%p", this, mListener.get())); + mInternalIOThread = nullptr; ++#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED ++ mShutdown = false; ++#endif + } + + DataChannelConnection::~DataChannelConnection() +@@ -307,6 +310,10 @@ void DataChannelConnection::DestroyOnSTS(struct socket *aMasterSocket, + if (aMasterSocket) + usrsctp_close(aMasterSocket); + ++#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED ++ mShutdown = true; ++#endif ++ + disconnect_all(); + } + +@@ -657,7 +664,10 @@ int + DataChannelConnection::SendPacket(unsigned char data[], size_t len, bool release) + { + //LOG(("%p: SCTP/DTLS sent %ld bytes", this, len)); +- int res = mTransportFlow->SendPacket(data, len) < 0 ? 1 : 0; ++ int res = 0; ++ if (mTransportFlow) { ++ res = mTransportFlow->SendPacket(data, len) < 0 ? 1 : 0; ++ } + if (release) + delete [] data; + return res; +@@ -670,6 +680,7 @@ DataChannelConnection::SctpDtlsOutput(void *addr, void *buffer, size_t length, + { + DataChannelConnection *peer = static_cast(addr); + int res; ++ MOZ_DIAGNOSTIC_ASSERT(!peer->mShutdown); + + if (MOZ_LOG_TEST(gSCTPLog, LogLevel::Debug)) { + char *buf; +diff --git netwerk/sctp/datachannel/DataChannel.h netwerk/sctp/datachannel/DataChannel.h +index 8141ed64e3176..eaf2055aacaa0 100644 +--- netwerk/sctp/datachannel/DataChannel.h ++++ netwerk/sctp/datachannel/DataChannel.h +@@ -113,8 +113,8 @@ public: + virtual void NotifyDataChannel(already_AddRefed channel) = 0; + }; + +- explicit DataChannelConnection(DataConnectionListener *listener, +- nsIEventTarget *aTarget); ++ DataChannelConnection(DataConnectionListener *listener, ++ nsIEventTarget *aTarget); + + bool Init(unsigned short aPort, uint16_t aNumStreams, bool aUsingDtls); + void Destroy(); // So we can spawn refs tied to runnables in shutdown +@@ -285,6 +285,9 @@ private: + bool mUsingDtls; + + nsCOMPtr mInternalIOThread; ++#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED ++ bool mShutdown; ++#endif + }; + + #define ENSURE_DATACONNECTION \ Property changes on: head/www/waterfox/files/patch-bug1395246 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/waterfox/files/patch-bug1464079 =================================================================== --- head/www/waterfox/files/patch-bug1464079 (nonexistent) +++ head/www/waterfox/files/patch-bug1464079 (revision 472027) @@ -0,0 +1,28 @@ +commit 3b9d019a49e9 +Author: Byron Campen [:bwc] +Date: Thu May 31 11:30:19 2018 -0500 + + Bug 1464079 - Bring ICE connection state change callback up to spec. r=jib, a=RyanVM + + --HG-- + extra : source : 4e4dadfffd60538ec94ff6e77e47cf8dc0cec4e4 +--- + dom/media/PeerConnection.js | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git dom/media/PeerConnection.js dom/media/PeerConnection.js +index 694deaa78d26f..18ae4a8231f37 100644 +--- dom/media/PeerConnection.js ++++ dom/media/PeerConnection.js +@@ -1801,7 +1801,10 @@ class PeerConnectionObserver { + break; + + case "IceConnectionState": +- this.handleIceConnectionStateChange(this._dompc._pc.iceConnectionState); ++ let connState = this._dompc._pc.iceConnectionState; ++ this._dompc._queueTaskWithClosedCheck(() => { ++ this.handleIceConnectionStateChange(connState); ++ }); + break; + + case "IceGatheringState": Property changes on: head/www/waterfox/files/patch-bug1464079 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property