Index: branches/2018Q1/mail/thunderbird/Makefile =================================================================== --- branches/2018Q1/mail/thunderbird/Makefile (revision 466106) +++ branches/2018Q1/mail/thunderbird/Makefile (revision 466107) @@ -1,86 +1,87 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= thunderbird DISTVERSION= 52.7.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above 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_MOZILLA= -soundtouch USE_GL= gl USES= tar:xz MOZ_OPTIONS= --enable-application=mail --enable-official-branding MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_PKGCONFIG_FILES= PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK3 LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include MOZSRC:= ${WRKSRC}/mozilla .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp 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) port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} .include Index: branches/2018Q1/mail/thunderbird/files/patch-bug1440717 =================================================================== --- branches/2018Q1/mail/thunderbird/files/patch-bug1440717 (nonexistent) +++ branches/2018Q1/mail/thunderbird/files/patch-bug1440717 (revision 466107) @@ -0,0 +1,40 @@ +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/mail/thunderbird/files/patch-bug1440717 ___________________________________________________________________ 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: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 466106) +++ branches/2018Q1 (revision 466107) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r466104