Index: branches/2018Q1/www/seamonkey/Makefile =================================================================== --- branches/2018Q1/www/seamonkey/Makefile (revision 466437) +++ branches/2018Q1/www/seamonkey/Makefile (revision 466438) @@ -1,87 +1,87 @@ # Created by: eivind/dima/jseger # $FreeBSD$ PORTNAME= seamonkey DISTVERSION= 2.49.3 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ nss>=3.28.6:security/nss \ libevent>=2.0.21_2:devel/libevent \ harfbuzz>=1.4.1:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.25:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.17.0: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 SSP_UNSAFE= yes USE_GECKO= gecko USE_GL= gl USES= tar:xz MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default MOZ_OPTIONS+= --enable-application=suite USE_MOZILLA= -soundtouch MOZ_PKGCONFIG_FILES= OPTIONS_DEFINE= LDAP LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=CANBERRA GTK3 LDAP LIGHTNING LDAP_DESC?= LDAP support for Mailnews .include "${.CURDIR}/../../www/firefox/Makefile.options" .include MOZSRC:= ${WRKSRC}/mozilla .if ! ${PORT_OPTIONS:MLDAP} MOZ_OPTIONS+= --disable-ldap .else MOZ_OPTIONS+= --enable-ldap .endif .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/suite/app/nsSuiteApp.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/init/all.js @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png .include Index: branches/2018Q1/www/seamonkey/distinfo =================================================================== --- branches/2018Q1/www/seamonkey/distinfo (revision 466437) +++ branches/2018Q1/www/seamonkey/distinfo (revision 466438) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522389599 -SHA256 (seamonkey-2.49.3.source.tar.xz) = 3d149ccb0c5bafe086182b071343561bff430907cbd67f0516282722942f098a -SIZE (seamonkey-2.49.3.source.tar.xz) = 231791060 +TIMESTAMP = 1522802344 +SHA256 (seamonkey-2.49.3.source.tar.xz) = 1823ed983bbc62e40f622288d5b24be9214ff28f15bf3f21028cc992fa96484b +SIZE (seamonkey-2.49.3.source.tar.xz) = 231547028 Index: branches/2018Q1/www/seamonkey/files/patch-bug1440717 =================================================================== --- branches/2018Q1/www/seamonkey/files/patch-bug1440717 (revision 466437) +++ branches/2018Q1/www/seamonkey/files/patch-bug1440717 (nonexistent) @@ -1,40 +0,0 @@ -commit ae9da5994b51 -Author: Nicolas Silva -Date: Mon Mar 12 13:36:00 2018 +0100 - - Bug 1440717 - Use RefPtr for CompositingRenderTargetOGL::mGL. r=Bas, a=ritu - - --HG-- - extra : source : b6d2d55223d2aa5cb85bbdf33075d1d38f2a9a30 - extra : intermediate-source : 0ec90964e0bc479412a4da8a61d48b665211736e ---- - gfx/layers/opengl/CompositingRenderTargetOGL.cpp | 2 +- - gfx/layers/opengl/CompositingRenderTargetOGL.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp -index c05b8edfd346..a1521c56da87 100644 ---- mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp -+++ mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp -@@ -60,7 +60,7 @@ CompositingRenderTargetOGL::BindRenderTarget() - msg.AppendPrintf("Framebuffer not complete -- CheckFramebufferStatus returned 0x%x, " - "GLContext=%p, IsOffscreen()=%d, mFBO=%d, aFBOTextureTarget=0x%x, " - "aRect.width=%d, aRect.height=%d", -- result, mGL, mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget, -+ result, mGL.get(), mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget, - mInitParams.mSize.width, mInitParams.mSize.height); - NS_WARNING(msg.get()); - } -diff --git mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h -index 501701d6f1a3..071dc5cac1c2 100644 ---- mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h -+++ mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.h -@@ -184,7 +184,7 @@ private: - * the target is always cleared at the end of a frame. - */ - RefPtr mCompositor; -- GLContext* mGL; -+ RefPtr mGL; - GLuint mTextureHandle; - GLuint mFBO; - }; Property changes on: branches/2018Q1/www/seamonkey/files/patch-bug1440717 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q1/www/seamonkey-i18n/Makefile =================================================================== --- branches/2018Q1/www/seamonkey-i18n/Makefile (revision 466437) +++ branches/2018Q1/www/seamonkey-i18n/Makefile (revision 466438) @@ -1,85 +1,85 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= seamonkey-i18n PORTVERSION= 2.49.3 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi \ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi \ LOCAL/jbeich/${DIST_SUBDIR} PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} DIST_SUBDIR= xpi/${DISTNAME} MAINTAINER= gecko@FreeBSD.org COMMENT= Localized interface for SeaMonkey USES= zip gecko:seamonkey USE_XPI= seamonkey linux-seamonkey NO_ARCH= yes USE_SUBMAKE= yes WDIR= langpack-*@seamonkey.mozilla.org XPI_DISTNAMES= ${SEAMONKEY_I18N_} PLIST?= ${WRKDIR}/plist PLISTF?= ${WRKDIR}/plist_files .include "${.CURDIR}/Makefile.option" .include .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:www/xpi-quick-locale-switcher .endif .include "${.CURDIR}/Makefile.lang" SEAMONKEY_I18N_?= ${SEAMONKEY_I18N} .for dist in ${XPI_DISTNAMES} XPI_ID_${dist}= langpack-${dist}@seamonkey.mozilla.org .endfor pre-everything:: @${ECHO_CMD} @${ECHO_CMD} "Please define SEAMONKEY_I18N_ALL to install all languages." @${ECHO_CMD} do-extract: @${MKDIR} ${WRKSRC} @for lang in ${SEAMONKEY_I18N_}; do \ if ! (${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/seamonkey-${PORTVERSION}.$$lang.langpack.xpi -d ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org);\ then \ exit 1; \ fi; \ cd ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org/; \ ${FIND} -H -s * ! -type d | \ ${SED} -e "s|^|lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTF}; \ done ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${XPI_LINKFARMS:S,^,${STAGEDIR},} cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${XPI_LIBDIR} ${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${WDIR}/ @for sldir in ${XPI_LINKFARMS}; do \ ${ECHO_CMD} "@dir $${sldir}" ${_A}; \ done @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS}; { ${RM} $$_dir/${WDIR} ; }' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/ Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 466437) +++ branches/2018Q1 (revision 466438) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r466436