Index: head/www/waterfox/Makefile =================================================================== --- head/www/waterfox/Makefile (revision 455549) +++ head/www/waterfox/Makefile (revision 455550) @@ -1,74 +1,73 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.0.s20171130 -PORTREVISION= 1 +DISTVERSION= 56.0.s20171203 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment EXPIRATION_DATE=2017-12-19 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 -GH_TAGNAME= 8c17fb8d3c7f +GH_TAGNAME= eadf0f15d05e 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" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -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/distinfo =================================================================== --- head/www/waterfox/distinfo (revision 455549) +++ head/www/waterfox/distinfo (revision 455550) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512000823 -SHA256 (MrAlex94-Waterfox-56.0.s20171130-8c17fb8d3c7f_GH0.tar.gz) = 6d452052eb4eb618459a39ebe41ed343312cf07bc1f9668c550502844b376dcc -SIZE (MrAlex94-Waterfox-56.0.s20171130-8c17fb8d3c7f_GH0.tar.gz) = 394188551 +TIMESTAMP = 1512266552 +SHA256 (MrAlex94-Waterfox-56.0.s20171203-eadf0f15d05e_GH0.tar.gz) = edc9c603192ad20ddddbf3f9c1557619c05c545fb10ca33435c79239ff667505 +SIZE (MrAlex94-Waterfox-56.0.s20171203-eadf0f15d05e_GH0.tar.gz) = 394204922 Index: head/www/waterfox/files/patch-typos =================================================================== --- head/www/waterfox/files/patch-typos (revision 455549) +++ head/www/waterfox/files/patch-typos (revision 455550) @@ -1,33 +1,22 @@ Mismerges found by comparing changes with Firefox 56 --- dom/base/nsNodeUtils.cpp.orig +++ dom/base/nsNodeUtils.cpp @@ -589,6 +589,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep, if (wasRegistered) { aNode->OwnerDoc()->UnregisterActivityObserver(aNode->AsElement()); } + aNode->mNodeInfo.swap(newNodeInfo); if (elem) { elem->NodeInfoChanged(newDoc); } ---- netwerk/test/unit/test_idn_urls.js.orig -+++ netwerk/test/unit/test_idn_urls.js -@@ -286,7 +286,7 @@ const testcases = [ - // Thai (also tests that node with over 63 UTF-8 octets doesn't fail) - ["เครื่องทําน้ําทําน้ําแข็ง", - "xn--22cdjb2fanb9fyepcbbb9dwh4a3igze4fdcd", -- false, true, true] -+ false, true, true], - - // Effect of adding valid or invalid subdomains (bug 1399540) - ["䕮䕵䕶䕱.ascii", "xn--google.ascii", false, true, true], --- security/nss/lib/softoken/softkver.h.orig +++ security/nss/lib/softoken/softkver.h @@ -26,6 +26,6 @@ #define SOFTOKEN_VMINOR 32 #define SOFTOKEN_VPATCH 1 #define SOFTOKEN_VBUILD 0 -#define SOFTOKEN_BETA PR_TRUE +#define SOFTOKEN_BETA PR_FALSE #endif /* _SOFTKVER_H_ */