Index: head/Mk/Uses/gecko.mk =================================================================== --- head/Mk/Uses/gecko.mk (revision 423122) +++ head/Mk/Uses/gecko.mk (revision 423123) @@ -1,127 +1,127 @@ # $FreeBSD$ # # Handle dependency of different gecko based applications # # MAINTAINER: gecko@FreeBSD.org # # Feature: gecko # Usage: USES=gecko or USES=gecko:ARGS # Valid ARGS: libxul, firefox, seamonkey, thunderbird # in case the first argument is not libxul # The following arguments are available # - build: also add the dependency as a build # dependency # - [0-9][0-9][+]?: a version optionnally # followed by a + # .if !defined(_INCLUDE_USES_GECKO_MK) _INCLUDE_USES_GECKO_MK= yes .if empty(gecko_ARGS) gecko_ARGS= libxul .endif _GECKO_VERSION= ${gecko_ARGS:M[0-9][0-9]*} .if ${gecko_ARGS:Mlibxul} # Compat with older versions GECKO= libxul GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO}-config XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` BUILD_DEPENDS+= libxul>=45:www/libxul RUN_DEPENDS+= libxul>=45:www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 45 _GECKO_VERSIONS= 45 49 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 45_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr 49_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} .endif .elif ${gecko_ARGS:Mseamonkey} -_GECKO_DEFAULT_VERSION= 39 -_GECKO_VERSIONS= 39 +_GECKO_DEFAULT_VERSION= 40 +_GECKO_VERSIONS= 40 _GECKO_TYPE= seamonkey .if exists(${LOCALBASE}/bin/seamonkey) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/seamonkey --version 2>/dev/null _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/g} .endif # Dependence lines for different Seamonkey versions -39_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey +40_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey .elif ${gecko_ARGS:Mthunderbird} _GECKO_DEFAULT_VERSION= 45 _GECKO_VERSIONS= 45 _GECKO_TYPE= thunderbird .if exists(${LOCALBASE}/bin/thunderbird) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} .endif # Dependence lines for different Thunderbird versions 45_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:mail/thunderbird .else IGNORE= Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird .endif .if defined(_GECKO_TYPE) .if ${_GECKO_VERSION:M*+} _GECKO_MIN_VERSION:= ${_GECKO_VERSION:S/+//} _GECKO_WANTED_VERSIONS:= ${_GECKO_DEFAULT_VERSION} .endif .if ${_GECKO_VERSION:M[0-9][0-9]} _GECKO_WANTED_VERSIONS:= ${_GECKO_VERSION:M[0-9][0-9]} .endif _GECKO_WANTED_VERSIONS?= ${_GECKO_DEFAULT_VERSION} .if defined(_GECKO_MIN_VERSION) . for _v in ${_GECKO_VERSIONS} . if ${_GECKO_MIN_VERSION} <= ${_v} _GECKO_WANTED_VERSIONS+= ${_v} . endif . endfor .endif .for _v in ${_GECKO_WANTED_VERSIONS:O:u} _GECKO_HIGHEST_VERSION:= ${_v} .if defined(_GECKO_INSTALLED_VER) && ${_GECKO_INSTALLED_VER} == ${_v} _GECKO_WANTED_VERSION:= ${_v} .endif .endfor .if !defined(_GECKO_WANTED_VERSION) .if defined(_GECKO_INSTALLED_VER) IGNORE= cannot install: ${_GECKO_TYPE} versions mismatch: ${_GECKO_TYPE}-${_GECKO_INSTALLED_VER} is installed and wanted version is ${_GECKO_TYPE}-${_GECKO_VERSION:M[0-9][0-9]} .else _GECKO_WANTED_VERSION:= ${_GECKO_HIGHEST_VERSION} .endif .endif .if ${gecko_ARGS:Mbuild} BUILD_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS} .endif RUN_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS} .endif .endif Index: head/www/linux-seamonkey/Makefile =================================================================== --- head/www/linux-seamonkey/Makefile (revision 423122) +++ head/www/linux-seamonkey/Makefile (revision 423123) @@ -1,17 +1,16 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.39 -PORTREVISION= 1 +DISTVERSION= 2.40 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser USES= tar:bzip2 .include "${.CURDIR}/Makefile.common" .include Index: head/www/linux-seamonkey/distinfo =================================================================== --- head/www/linux-seamonkey/distinfo (revision 423122) +++ head/www/linux-seamonkey/distinfo (revision 423123) @@ -1,6 +1,7 @@ -SHA256 (seamonkey-2.39.tar.bz2) = 035cef6a3839fc5e86b554070fbf111b2e33bf2ea74b565fb10c527761fc52b1 -SIZE (seamonkey-2.39.tar.bz2) = 50222506 +TIMESTAMP = 1475123784 +SHA256 (seamonkey-2.40.tar.bz2) = dc42044206fe4f3d2f2c797ef1516635e27789d6983293a56c6557626e1841be +SIZE (seamonkey-2.40.tar.bz2) = 50683245 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b SIZE (gtk2-2.18.3-19.fc12.i686.rpm) = 3198708 Index: head/www/linux-seamonkey/pkg-plist =================================================================== --- head/www/linux-seamonkey/pkg-plist (revision 423122) +++ head/www/linux-seamonkey/pkg-plist (revision 423123) @@ -1,120 +1,119 @@ bin/%%APP_NAME%% share/applications/%%APP_NAME%%.desktop lib/%%APP_NAME%%/Throbber-small.gif lib/%%APP_NAME%%/application.ini lib/%%APP_NAME%%/blocklist.xml lib/%%APP_NAME%%/chrome.manifest lib/%%APP_NAME%%/chrome/icons/default/JSConsoleWindow.png lib/%%APP_NAME%%/chrome/icons/default/JSConsoleWindow16.png lib/%%APP_NAME%%/chrome/icons/default/JSConsoleWindow48.png lib/%%APP_NAME%%/chrome/icons/default/abcardWindow.png lib/%%APP_NAME%%/chrome/icons/default/abcardWindow16.png lib/%%APP_NAME%%/chrome/icons/default/abcardWindow48.png lib/%%APP_NAME%%/chrome/icons/default/ablistWindow.png lib/%%APP_NAME%%/chrome/icons/default/ablistWindow16.png lib/%%APP_NAME%%/chrome/icons/default/ablistWindow48.png lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow.png lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow16.png lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow48.png lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties.png lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties16.png lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties48.png lib/%%APP_NAME%%/chrome/icons/default/default.png lib/%%APP_NAME%%/chrome/icons/default/default16.png lib/%%APP_NAME%%/chrome/icons/default/default48.png lib/%%APP_NAME%%/chrome/icons/default/downloadManager.png lib/%%APP_NAME%%/chrome/icons/default/downloadManager16.png lib/%%APP_NAME%%/chrome/icons/default/downloadManager48.png lib/%%APP_NAME%%/chrome/icons/default/editorWindow.png lib/%%APP_NAME%%/chrome/icons/default/editorWindow16.png lib/%%APP_NAME%%/chrome/icons/default/editorWindow48.png lib/%%APP_NAME%%/chrome/icons/default/findBookmarkWindow.png lib/%%APP_NAME%%/chrome/icons/default/findBookmarkWindow16.png lib/%%APP_NAME%%/chrome/icons/default/findBookmarkWindow48.png lib/%%APP_NAME%%/chrome/icons/default/findHistoryWindow.png lib/%%APP_NAME%%/chrome/icons/default/findHistoryWindow16.png lib/%%APP_NAME%%/chrome/icons/default/findHistoryWindow48.png lib/%%APP_NAME%%/chrome/icons/default/history-window.png lib/%%APP_NAME%%/chrome/icons/default/history-window16.png lib/%%APP_NAME%%/chrome/icons/default/history-window48.png lib/%%APP_NAME%%/chrome/icons/default/main-window.png lib/%%APP_NAME%%/chrome/icons/default/main-window16.png lib/%%APP_NAME%%/chrome/icons/default/main-window48.png lib/%%APP_NAME%%/chrome/icons/default/messengerWindow.png lib/%%APP_NAME%%/chrome/icons/default/messengerWindow16.png lib/%%APP_NAME%%/chrome/icons/default/messengerWindow48.png lib/%%APP_NAME%%/chrome/icons/default/msgcomposeWindow.png lib/%%APP_NAME%%/chrome/icons/default/msgcomposeWindow16.png lib/%%APP_NAME%%/chrome/icons/default/msgcomposeWindow48.png lib/%%APP_NAME%%/chrome/icons/default/places.png lib/%%APP_NAME%%/chrome/icons/default/places16.png lib/%%APP_NAME%%/chrome/icons/default/places48.png lib/%%APP_NAME%%/chrome/icons/default/seamonkey.png lib/%%APP_NAME%%/components/components.manifest -lib/%%APP_NAME%%/components/libdbusservice.so lib/%%APP_NAME%%/components/libmozgnome.so lib/%%APP_NAME%%/components/libsuite.so lib/%%APP_NAME%%/crashreporter lib/%%APP_NAME%%/crashreporter-override.ini lib/%%APP_NAME%%/crashreporter.ini lib/%%APP_NAME%%/defaults/messenger/mailViews.dat lib/%%APP_NAME%%/defaults/pref/browser-prefs.js lib/%%APP_NAME%%/defaults/pref/channel-prefs.js lib/%%APP_NAME%%/defaults/profile/chrome/userChrome-example.css lib/%%APP_NAME%%/defaults/profile/chrome/userContent-example.css lib/%%APP_NAME%%/defaults/profile/mimeTypes.rdf lib/%%APP_NAME%%/defaults/profile/panels.rdf lib/%%APP_NAME%%/dependentlibs.list lib/%%APP_NAME%%/dictionaries/en-US.aff lib/%%APP_NAME%%/dictionaries/en-US.dic lib/%%APP_NAME%%/distribution/extensions/inspector@mozilla.org.xpi lib/%%APP_NAME%%/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi lib/%%APP_NAME%%/extensions/modern@themes.mozilla.org.xpi lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi lib/%%APP_NAME%%/icons/updater.png lib/%%APP_NAME%%/isp/Bogofilter.sfd lib/%%APP_NAME%%/isp/DSPAM.sfd lib/%%APP_NAME%%/isp/POPFile.sfd lib/%%APP_NAME%%/isp/SpamAssassin.sfd lib/%%APP_NAME%%/isp/SpamPal.sfd lib/%%APP_NAME%%/isp/movemail.rdf lib/%%APP_NAME%%/isp/rss.rdf lib/%%APP_NAME%%/libfreebl3.chk lib/%%APP_NAME%%/libfreebl3.so lib/%%APP_NAME%%/libldap60.so lib/%%APP_NAME%%/libldif60.so lib/%%APP_NAME%%/liblgpllibs.so lib/%%APP_NAME%%/libmozsqlite3.so lib/%%APP_NAME%%/libnspr4.so lib/%%APP_NAME%%/libnss3.so lib/%%APP_NAME%%/libnssckbi.so lib/%%APP_NAME%%/libnssdbm3.chk lib/%%APP_NAME%%/libnssdbm3.so lib/%%APP_NAME%%/libnssutil3.so lib/%%APP_NAME%%/libplc4.so lib/%%APP_NAME%%/libplds4.so lib/%%APP_NAME%%/libprldap60.so lib/%%APP_NAME%%/libsmime3.so lib/%%APP_NAME%%/libsoftokn3.chk lib/%%APP_NAME%%/libsoftokn3.so lib/%%APP_NAME%%/libssl3.so lib/%%APP_NAME%%/libxul.so lib/%%APP_NAME%%/license.txt lib/%%APP_NAME%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container lib/%%APP_NAME%%/plugins lib/%%APP_NAME%%/precomplete lib/%%APP_NAME%%/removed-files lib/%%APP_NAME%%/run-mozilla.sh lib/%%APP_NAME%%/seamonkey lib/%%APP_NAME%%/seamonkey-bin lib/%%APP_NAME%%/searchplugins/duckduckgo.xml lib/%%APP_NAME%%/searchplugins/google.xml lib/%%APP_NAME%%/searchplugins/wikipedia.xml lib/%%APP_NAME%%/searchplugins/yahoo.xml lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true Index: head/www/seamonkey/Makefile =================================================================== --- head/www/seamonkey/Makefile (revision 423122) +++ head/www/seamonkey/Makefile (revision 423123) @@ -1,184 +1,183 @@ # Created by: eivind/dima/jseger # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.39 -MOZILLA_VER= 42 # above + 3 -PORTREVISION= 15 +DISTVERSION= 2.40 +MOZILLA_VER= 43 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.10.10:devel/nspr \ nss>=3.19.4:security/nss \ libevent2>=2.0.21_2:devel/libevent2 \ soundtouch>=1.8.0:audio/soundtouch \ harfbuzz>=0.9.42:print/harfbuzz \ graphite2>=1.2.4:graphics/graphite2 \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.3.0:multimedia/libvpx \ sqlite3>=3.8.9:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # opus>=1.1:audio/opus \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l -EM_VERSION= 1.9.1 -L_VERSION= 4.4 +EM_VERSION= 1.9.5 +L_VERSION= 4.5 SSP_UNSAFE= yes USE_GECKO= gecko USE_GL= gl USES= tar:xz MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite USE_MOZILLA= -opus MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 -OPTIONS_EXCLUDE=LOGGING -OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS +OPTIONS_EXCLUDE=GSTREAMER LOGGING +OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS RUST +OPTIONS_SINGLE= TOOLKIT +OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 +OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL GTK2 LDAP LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module LDAP_DESC?= LDAP support for Mailnews MAILNEWS_DESC?= Mail and News modules .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${PORT_OPTIONS:MCHATZILLA} MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif .include WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi .if ! ${PORT_OPTIONS:MMAILNEWS} MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if ! ${PORT_OPTIONS:MLDAP} MOZ_OPTIONS+= --disable-ldap --enable-mailnews .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .if ${PORT_OPTIONS:MENIGMAIL} MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail DISTFILES+= ${EM_DISTFILE}:enigmail RUN_DEPENDS+= gpg2:security/gnupg EM_DISTNAME= enigmail-${EM_VERSION} EM_DISTFILE= ${EM_DISTNAME}.tar.gz EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}.xpi EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} EM_ID= ${PORTNAME}@mozilla-enigmail.org EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ ${XPI_LIBDIR}/${EM_ID}/modules/app.jsm .endif .endif .if ! ${PORT_OPTIONS:MCOMPOSER} MOZ_OPTIONS+= --disable-composer .endif .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning XPI_FILE= ${MOZ_OBJDIR}/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else MOZ_OPTIONS+= --disable-calendar .endif .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} post-extract: @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ -C ${WRKSRC}/mailnews/extensions .endif post-patch: - @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ - ${MOZSRC}/configure.in ${WRKSRC}/configure.in @${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 .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ ${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \ ${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ -e '/^all/s/ xpi//' \ -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ ${WRKSRC}/mailnews/extensions/enigmail/Makefile @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ -e '/em:maxVersion/s/pre//' \ ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf .endif 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) .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} post-configure: cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure .endif .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} post-build: ${DO_MAKE_BUILD:N-j*:S,${MAKEFILE},Makefile,} all xpi \ -C ${WRKSRC}/mailnews/extensions/enigmail .endif 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 .if ${PORT_OPTIONS:MLIGHTNING} @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/seamonkey @(cd ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE}) @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}/install.rdf @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/seamonkey 2>/dev/null || true @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} @(cd ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES:S/^/${STAGEDIR}/g} @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} .endif .include Index: head/www/seamonkey/distinfo =================================================================== --- head/www/seamonkey/distinfo (revision 423122) +++ head/www/seamonkey/distinfo (revision 423123) @@ -1,4 +1,5 @@ -SHA256 (seamonkey-2.39.source.tar.xz) = c871de0a64cb60acf785df0ea3859b729353e5d1e3274947840386766859930e -SIZE (seamonkey-2.39.source.tar.xz) = 182627632 -SHA256 (enigmail-1.9.1.tar.gz) = 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 -SIZE (enigmail-1.9.1.tar.gz) = 1736876 +TIMESTAMP = 1475123784 +SHA256 (seamonkey-2.40.source.tar.xz) = 7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01 +SIZE (seamonkey-2.40.source.tar.xz) = 193702432 +SHA256 (enigmail-1.9.5.tar.gz) = 831e53a4add0f465241f075be9475103367aa1452675adae054d8fb272e5d3ad +SIZE (enigmail-1.9.5.tar.gz) = 1744278 Index: head/www/seamonkey/files/extra-patch-bug1125514 =================================================================== --- head/www/seamonkey/files/extra-patch-bug1125514 (revision 423122) +++ head/www/seamonkey/files/extra-patch-bug1125514 (nonexistent) @@ -1,36 +0,0 @@ -changeset: 258513:ffbd5f5f46f1 -user: Guilherme Goncalves -date: Thu Aug 20 10:05:29 2015 +0900 -summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium - ---- mozilla/memory/build/mozjemalloc_compat.c~ -+++ mozilla/memory/build/mozjemalloc_compat.c -@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st - { - unsigned narenas; - size_t active, allocated, mapped, page, pdirty; -+ size_t meta, ameta; - size_t lg_chunk; - - // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in -@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st - CTL_GET("stats.active", active); - CTL_GET("stats.allocated", allocated); - CTL_GET("stats.mapped", mapped); -+ CTL_GET("stats.metadata", meta); - CTL_GET("opt.lg_chunk", lg_chunk); -- CTL_GET("stats.bookkeeping", stats->bookkeeping); - - /* get the summation for all arenas, i == narenas */ - CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); -+ CTL_I_GET("stats.arenas.0.metadata.allocated", ameta, narenas); - - stats->chunksize = (size_t) 1 << lg_chunk; - stats->mapped = mapped; - stats->allocated = allocated; - stats->waste = active - allocated; - stats->page_cache = pdirty * page; -+ stats->bookkeeping = meta - ameta; - stats->bin_unused = compute_bin_unused(narenas); - stats->waste -= stats->bin_unused; - } Property changes on: head/www/seamonkey/files/extra-patch-bug1125514 ___________________________________________________________________ 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: head/www/seamonkey/files/patch-1194520 =================================================================== --- head/www/seamonkey/files/patch-1194520 (revision 423122) +++ head/www/seamonkey/files/patch-1194520 (nonexistent) @@ -1,35 +0,0 @@ -From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Fri, 14 Aug 2015 08:50:38 +0900 -Subject: [PATCH] Bug 1194520 - Add a system header wrapper for - - ---- - config/system-headers | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config/system-headers b/config/system-headers -index bee35da..ad1f88d 100644 ---- mozilla/config/system-headers -+++ mozilla/config/system-headers -@@ -450,16 +450,17 @@ foundation/base64.h - foundation/hexdump.h - #endif - fp.h - fpieee.h - frame/log.h - frame/req.h - freetype/freetype.h - freetype/ftcache.h -+freetype/ftfntfmt.h - freetype/ftglyph.h - freetype/ftsynth.h - freetype/ftoutln.h - freetype/ttnameid.h - freetype/tttables.h - freetype/t1tables.h - freetype/ftlcdfil.h - freetype/ftsizes.h --- -2.5.0.3.ge81d485 - Property changes on: head/www/seamonkey/files/patch-1194520 ___________________________________________________________________ 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: head/www/seamonkey/files/patch-bug1026499 =================================================================== --- head/www/seamonkey/files/patch-bug1026499 (revision 423122) +++ head/www/seamonkey/files/patch-bug1026499 (nonexistent) @@ -1,68 +0,0 @@ -commit 8d0efe4 -Author: Martin Husemann -Date: Wed Jun 18 18:12:22 2014 +0200 - - Bug 1026499 - Use MOZ_ALIGNED_DECL to declare union members in ipdl value declarations. r=bsmedberg ---- - ipc/ipdl/ipdl/cxx/ast.py | 7 ++++--- - ipc/ipdl/ipdl/cxx/cgen.py | 5 ++++- - ipc/ipdl/ipdl/lower.py | 2 +- - 4 files changed, 10 insertions(+), 5 deletions(-) - -diff --git ipc/ipdl/ipdl/cxx/ast.py ipc/ipdl/ipdl/cxx/ast.py -index 3180a65..c2d945b 100644 ---- mozilla/ipc/ipdl/ipdl/cxx/ast.py -+++ mozilla/ipc/ipdl/ipdl/cxx/ast.py -@@ -336,12 +336,13 @@ Type.VOID = Type('void') - Type.VOIDPTR = Type('void', ptr=1) - - class TypeArray(Node): -- def __init__(self, basetype, nmemb): -- '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr''' -+ def __init__(self, basetype, nmemb, alignType): -+ '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr, |alignType| is a type''' - self.basetype = basetype - self.nmemb = nmemb -+ self.alignType = alignType - def __deepcopy__(self, memo): -- return TypeArray(deepcopy(self.basetype, memo), nmemb) -+ return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType) - - class TypeEnum(Node): - def __init__(self, name=None): -diff --git ipc/ipdl/ipdl/cxx/cgen.py ipc/ipdl/ipdl/cxx/cgen.py -index 48b0988..bc914cf 100644 ---- mozilla/ipc/ipdl/ipdl/cxx/cgen.py -+++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py -@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor): - def visitDecl(self, d): - # C-syntax arrays make code generation much more annoying - if isinstance(d.type, TypeArray): -+ self.write('MOZ_ALIGNED_DECL(') - d.type.basetype.accept(self) - else: - d.type.accept(self) -@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor): - if isinstance(d.type, TypeArray): - self.write('[') - d.type.nmemb.accept(self) -- self.write(']') -+ self.write('], MOZ_ALIGNOF(') -+ d.type.alignType.accept(self) -+ self.write('))') - - def visitParam(self, p): - self.visitDecl(p) -diff --git ipc/ipdl/ipdl/lower.py ipc/ipdl/ipdl/lower.py -index e97a34c..9360f3c 100644 ---- mozilla/ipc/ipdl/ipdl/lower.py -+++ mozilla/ipc/ipdl/ipdl/lower.py -@@ -768,7 +768,7 @@ IPDL union type.""" - if self.recursive: - return self.ptrToType() - else: -- return TypeArray(Type('char'), ExprSizeof(self.internalType())) -+ return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType()) - - def unionValue(self): - # NB: knows that Union's storage C union is named |mValue| Property changes on: head/www/seamonkey/files/patch-bug1026499 ___________________________________________________________________ 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: head/www/seamonkey/files/patch-media_libav_config__unix.h =================================================================== --- head/www/seamonkey/files/patch-media_libav_config__unix.h (revision 423122) +++ head/www/seamonkey/files/patch-media_libav_config__unix.h (nonexistent) @@ -1,11 +0,0 @@ ---- mozilla/media/libav/config_unix.h.orig 2015-10-29 22:17:49 UTC -+++ mozilla/media/libav/config_unix.h -@@ -144,7 +144,7 @@ - #define HAVE_MACH_MACH_TIME_H 0 - #define HAVE_MACHINE_IOCTL_BT848_H 0 - #define HAVE_MACHINE_IOCTL_METEOR_H 0 --#define HAVE_MALLOC_H 1 -+#define HAVE_MALLOC_H 0 - #define HAVE_POLL_H 1 - #define HAVE_SNDIO_H 0 - #define HAVE_SOUNDCARD_H 0 Property changes on: head/www/seamonkey/files/patch-media_libav_config__unix.h ___________________________________________________________________ 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: head/www/seamonkey/files/patch-bug779713 =================================================================== --- head/www/seamonkey/files/patch-bug779713 (revision 423122) +++ head/www/seamonkey/files/patch-bug779713 (nonexistent) @@ -1,68 +0,0 @@ -diff --git mfbt/Alignment.h mfbt/Alignment.h -index e0843ca..353ec36 100644 ---- mozilla/mfbt/Alignment.h -+++ mozilla/mfbt/Alignment.h -@@ -15,6 +15,13 @@ - - namespace mozilla { - -+#if defined(MOZ_HAVE_CXX11_ALIGNAS) -+#define MOZ_ALIGNOF(T) alignof(T) -+#elif defined(__GNUC__) -+#define MOZ_ALIGNOF(T) __alignof__(T) -+#elif defined(_MSC_VER) -+#define MOZ_ALIGNOF(T) __alignof(T) -+#else - /* - * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many - * bytes of alignment a given type needs. -@@ -32,6 +41,7 @@ public: - }; - - #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder::alignment -+#endif - - /* - * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types. -@@ -43,7 +53,10 @@ public: - * will declare a two-character array |arr| aligned to 8 bytes. - */ - --#if defined(__GNUC__) -+#if defined(MOZ_HAVE_CXX11_ALIGNAS) -+# define MOZ_ALIGNED_DECL(_type, _align) \ -+ alignas(_align) _type -+#elif defined(__GNUC__) - # define MOZ_ALIGNED_DECL(_type, _align) \ - _type __attribute__((aligned(_align))) - #elif defined(_MSC_VER) -diff --git mfbt/Attributes.h mfbt/Attributes.h -index d317766..ddb13da 100644 ---- mozilla/mfbt/Attributes.h -+++ mozilla/mfbt/Attributes.h -@@ -50,6 +50,7 @@ - * don't indicate support for them here, due to - * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug - */ -+# define MOZ_HAVE_CXX11_ALIGNAS - # define MOZ_HAVE_NEVER_INLINE __declspec(noinline) - # define MOZ_HAVE_NORETURN __declspec(noreturn) - # ifdef __clang__ -@@ -70,6 +71,9 @@ - # ifndef __has_extension - # define __has_extension __has_feature /* compatibility, for older versions of clang */ - # endif -+# if __has_extension(cxx_alignas) -+# define MOZ_HAVE_CXX11_ALIGNAS -+# endif - # if __has_extension(cxx_constexpr) - # define MOZ_HAVE_CXX11_CONSTEXPR - # endif -@@ -86,6 +90,7 @@ - # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L - # define MOZ_HAVE_CXX11_CONSTEXPR - # if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) -+# define MOZ_HAVE_CXX11_ALIGNAS - # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES - # endif - # define MOZ_HAVE_EXPLICIT_CONVERSION Property changes on: head/www/seamonkey/files/patch-bug779713 ___________________________________________________________________ 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: head/www/seamonkey/files/patch-bug1209410 =================================================================== --- head/www/seamonkey/files/patch-bug1209410 (nonexistent) +++ head/www/seamonkey/files/patch-bug1209410 (revision 423123) @@ -0,0 +1,169 @@ +# Use MP3Demuxer/MediaFormatReader by default when available + +diff --git a/dom/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp +--- mozilla/dom/media/DecoderTraits.cpp ++++ mozilla/dom/media/DecoderTraits.cpp +@@ -200,10 +200,10 @@ DecoderTraits::IsWebMTypeAndEnabled(cons + static bool + IsGStreamerSupportedType(const nsACString& aMimeType) + { +- if (!MediaDecoder::IsGStreamerEnabled()) ++ if (DecoderTraits::IsWebMTypeAndEnabled(aMimeType)) + return false; + +- if (DecoderTraits::IsWebMTypeAndEnabled(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false)) ++ if (!MediaDecoder::IsGStreamerEnabled()) + return false; + + if (IsOggType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false)) +@@ -366,7 +366,7 @@ static bool + IsMP3SupportedType(const nsACString& aType, + const nsAString& aCodecs = EmptyString()) + { +- return aType.EqualsASCII("audio/mpeg") && MP3Decoder::IsEnabled(); ++ return MP3Decoder::CanHandleMediaType(aType, aCodecs); + } + + #ifdef MOZ_APPLEMEDIA +diff --git a/dom/media/MP3Decoder.cpp b/dom/media/MP3Decoder.cpp +--- mozilla/dom/media/MP3Decoder.cpp ++++ mozilla/dom/media/MP3Decoder.cpp +@@ -10,10 +10,7 @@ + #include "MediaFormatReader.h" + #include "MP3Demuxer.h" + #include "mozilla/Preferences.h" +- +-#ifdef MOZ_WIDGET_ANDROID +-#include "AndroidBridge.h" +-#endif ++#include "PlatformDecoderModule.h" + + namespace mozilla { + +@@ -32,14 +29,61 @@ MP3Decoder::CreateStateMachine() { + return new MediaDecoderStateMachine(this, reader); + } + ++static already_AddRefed ++CreateTestMP3Decoder(AudioInfo& aConfig) ++{ ++ PlatformDecoderModule::Init(); ++ ++ nsRefPtr platform = PlatformDecoderModule::Create(); ++ if (!platform || !platform->SupportsMimeType(aConfig.mMimeType)) { ++ return nullptr; ++ } ++ ++ nsRefPtr decoder( ++ platform->CreateDecoder(aConfig, nullptr, nullptr)); ++ if (!decoder) { ++ return nullptr; ++ } ++ ++ return decoder.forget(); ++} ++ ++static bool ++CanCreateMP3Decoder() ++{ ++ static bool haveCachedResult = false; ++ static bool result = false; ++ if (haveCachedResult) { ++ return result; ++ } ++ AudioInfo config; ++ config.mMimeType = "audio/mpeg"; ++ config.mRate = 48000; ++ config.mChannels = 2; ++ config.mBitDepth = 16; ++ nsRefPtr decoder(CreateTestMP3Decoder(config)); ++ if (decoder) { ++ result = true; ++ } ++ haveCachedResult = true; ++ return result; ++} ++ ++/* static */ + bool + MP3Decoder::IsEnabled() { +-#ifdef MOZ_WIDGET_ANDROID +- // We need android.media.MediaCodec which exists in API level 16 and higher. +- return AndroidBridge::Bridge()->GetAPIVersion() >= 16; +-#else +- return Preferences::GetBool("media.mp3.enabled"); +-#endif ++ return CanCreateMP3Decoder(); ++} ++ ++/* static */ ++bool MP3Decoder::CanHandleMediaType(const nsACString& aType, ++ const nsAString& aCodecs) ++{ ++ if (aType.EqualsASCII("audio/mp3") || aType.EqualsASCII("audio/mpeg")) { ++ return CanCreateMP3Decoder() && ++ (aCodecs.IsEmpty() || aCodecs.EqualsASCII("mp3")); ++ } ++ return false; + } + + } // namespace mozilla +diff --git a/dom/media/MP3Decoder.h b/dom/media/MP3Decoder.h +--- mozilla/dom/media/MP3Decoder.h ++++ mozilla/dom/media/MP3Decoder.h +@@ -19,6 +19,8 @@ public: + // Returns true if the MP3 backend is preffed on, and we're running on a + // platform that is likely to have decoders for the format. + static bool IsEnabled(); ++ static bool CanHandleMediaType(const nsACString& aType, ++ const nsAString& aCodecs); + }; + + } // namespace mozilla +diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js +--- mozilla/dom/media/test/manifest.js ++++ mozilla/dom/media/test/manifest.js +@@ -76,7 +76,7 @@ var gPlayedTests = [ + { name:"seek.ogv", type:"video/ogg", duration:3.966 }, + { name:"seek.webm", type:"video/webm", duration:3.966 }, + { name:"gizmo.mp4", type:"video/mp4", duration:5.56 }, +- { name:"owl.mp3", type:"audio/mpeg", duration:3.29 }, ++ { name:"owl.mp3", type:"audio/mpeg", duration:3.343 }, + // Disable vbr.mp3 to see if it reduces the error of AUDCLNT_E_CPUUSAGE_EXCEEDED. + // See bug 1110922 comment 26. + //{ name:"vbr.mp3", type:"audio/mpeg", duration:10.0 }, +@@ -237,13 +237,13 @@ var gPlayTests = [ + + { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 }, + { name:"small-shot.mp3", type:"audio/mpeg", duration:0.27 }, +- { name:"owl.mp3", type:"audio/mpeg", duration:3.29 }, ++ { name:"owl.mp3", type:"audio/mpeg", duration:3.343 }, + // owl.mp3 as above, but with something funny going on in the ID3v2 tag + // that causes DirectShow to fail. +- { name:"owl-funny-id3.mp3", type:"audio/mpeg", duration:3.29 }, ++ { name:"owl-funny-id3.mp3", type:"audio/mpeg", duration:3.343 }, + // owl.mp3 as above, but with something even funnier going on in the ID3v2 tag + // that causes DirectShow to fail. +- { name:"owl-funnier-id3.mp3", type:"audio/mpeg", duration:3.29 }, ++ { name:"owl-funnier-id3.mp3", type:"audio/mpeg", duration:3.343 }, + // One second of silence with ~140KB of ID3 tags. Usually when the first MP3 + // frame is at such a high offset into the file, MP3FrameParser will give up + // and report that the stream is not MP3. However, it does not count ID3 tags +@@ -469,7 +469,7 @@ var gSeekTests = [ + { name:"split.webm", type:"video/webm", duration:1.967 }, + { name:"detodos.opus", type:"audio/ogg; codecs=opus", duration:2.9135 }, + { name:"gizmo.mp4", type:"video/mp4", duration:5.56 }, +- { name:"owl.mp3", type:"audio/mpeg", duration:3.29 }, ++ { name:"owl.mp3", type:"audio/mpeg", duration:3.343 }, + { name:"bogus.duh", type:"bogus/duh", duration:123 } + ]; + +@@ -523,7 +523,7 @@ if (getAndroidVersion() >= 18) { + var gAudioTests = [ + { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 }, + { name:"sound.ogg", type:"audio/ogg" }, +- { name:"owl.mp3", type:"audio/mpeg", duration:3.29 }, ++ { name:"owl.mp3", type:"audio/mpeg", duration:3.343 }, + { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 }, + { name:"bogus.duh", type:"bogus/duh", duration:123 } + ]; Property changes on: head/www/seamonkey/files/patch-bug1209410 ___________________________________________________________________ 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/seamonkey/files/patch-bug1228255 =================================================================== --- head/www/seamonkey/files/patch-bug1228255 (nonexistent) +++ head/www/seamonkey/files/patch-bug1228255 (revision 423123) @@ -0,0 +1,39 @@ +diff --git a/test/test_audio.cpp b/test/test_audio.cpp +index 0158fb7..6a6ebf5 100644 +--- mozilla/media/libcubeb/tests/test_audio.cpp ++++ mozilla/media/libcubeb/tests/test_audio.cpp +@@ -10,7 +10,7 @@ + #ifdef NDEBUG + #undef NDEBUG + #endif +-#define _XOPEN_SOURCE 500 ++#define _XOPEN_SOURCE 600 + #include + #include + #include +diff --git a/test/test_sanity.cpp b/test/test_sanity.cpp +index 8c80f80..ff31a96 100644 +--- mozilla/media/libcubeb/tests/test_sanity.cpp ++++ mozilla/media/libcubeb/tests/test_sanity.cpp +@@ -7,7 +7,7 @@ + #ifdef NDEBUG + #undef NDEBUG + #endif +-#define _XOPEN_SOURCE 500 ++#define _XOPEN_SOURCE 600 + #include "cubeb/cubeb.h" + #include + #include +diff --git a/test/test_tone.cpp b/test/test_tone.cpp +index 023c46f..a0bb287 100644 +--- mozilla/media/libcubeb/tests/test_tone.cpp ++++ mozilla/media/libcubeb/tests/test_tone.cpp +@@ -9,7 +9,7 @@ + #ifdef NDEBUG + #undef NDEBUG + #endif +-#define _XOPEN_SOURCE 500 ++#define _XOPEN_SOURCE 600 + #include + #include + #include Property changes on: head/www/seamonkey/files/patch-bug1228255 ___________________________________________________________________ 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/seamonkey/files/patch-bug1228742 =================================================================== --- head/www/seamonkey/files/patch-bug1228742 (nonexistent) +++ head/www/seamonkey/files/patch-bug1228742 (revision 423123) @@ -0,0 +1,13 @@ +--- mozilla/toolkit/crashreporter/test/moz.build.orig 2015-12-16 16:15:25.278076000 +0100 ++++ mozilla/toolkit/crashreporter/test/moz.build 2015-12-16 16:15:35.254959000 +0100 +@@ -19,10 +19,6 @@ + + GeckoSharedLibrary('testcrasher') + +-EXTRA_JS_MODULES += [ +- 'CrashTestUtils.jsm', +-] +- + DEFINES['SHARED_LIBRARY'] = '%s%s%s' % ( + CONFIG['DLL_PREFIX'], + LIBRARY_NAME, Property changes on: head/www/seamonkey/files/patch-bug1228742 ___________________________________________________________________ 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/seamonkey/files/patch-bug1268816 =================================================================== --- head/www/seamonkey/files/patch-bug1268816 (revision 423122) +++ head/www/seamonkey/files/patch-bug1268816 (revision 423123) @@ -1,50 +1,50 @@ # HG changeset patch # User Lee Salzman # Date 1461978185 14400 # Node ID b622cbd9ba13d01abcb1d04684dcb39c22a08590 # Parent f3a5c8b5e17073a1e68f079da93f8dbe10e454a9 Bug 1268816 - allow Skia to use C++11 features on platforms that have them. r=froydnj diff --git config/stl-headers config/stl-headers --- mozilla/config/stl-headers +++ mozilla/config/stl-headers @@ -27,16 +27,17 @@ iterator limits list map memory ostream set stack string +type_traits utility vector cassert climits + cmath cstdarg cstdio cstdlib - cstring diff --git config/system-headers config/system-headers --- mozilla/config/system-headers +++ mozilla/config/system-headers @@ -1109,16 +1109,17 @@ ThreadManagerTests.h Threads.h time.h Timer.h tlhelp32.h ToolUtils.h tr1/functional trace.h Traps.h +type_traits typeinfo types.h Types.h UAppleEventsMgr.h UAttachments.h ucontext.h uconv.h UCursor.h Index: head/www/seamonkey/files/patch-bug1269171 =================================================================== --- head/www/seamonkey/files/patch-bug1269171 (revision 423122) +++ head/www/seamonkey/files/patch-bug1269171 (revision 423123) @@ -1,229 +1,258 @@ # HG changeset patch # User Mike Hommey # Date 1463557039 -32400 # Node ID 68da139d0866977c0ada86319fa94388f2255446 # Parent a640e6fa8ab9977fb6c5bcf63dc4daca6699477b Bug 1269171 - Change how mozalloc.h is hooked in STL wrappers. r=froydnj Since the introduction of the STL wrappers, they have included mozalloc.h, and multiple times, we've hit header reentrancy problems, and worked around them as best as we could. Taking a step back, all mozalloc.h does is: - declare moz_* allocator functions. - define inline implementations of various operator new/delete variants. The first only requires the functions to be declared before they are used, so mozalloc.h only needs to be included before anything that would use those functions. The second doesn't actually require a specific order, as long as the declaration for those functions comes before their use, and they are either declared in or implicitly by the C++ compiler. So all in all, it doesn't matter that mozalloc.h is included before the wrapped STL headers. What matters is that it's included when STL headers are included. So arrange things such that mozalloc.h is included after the first wrapped STL header is fully preprocessed (and all its includes have been included). diff --git config/gcc-stl-wrapper.template.h config/gcc-stl-wrapper.template.h --- mozilla/config/gcc-stl-wrapper.template.h +++ mozilla/config/gcc-stl-wrapper.template.h @@ -12,56 +12,54 @@ // compiling ObjC. #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS) # error "STL code can only be used with -fno-exceptions" #endif // Silence "warning: #include_next is a GCC extension" #pragma GCC system_header -// Don't include mozalloc for cstdlib. See bug 1245076. -#ifndef moz_dont_include_mozalloc_for_cstdlib -# define moz_dont_include_mozalloc_for_cstdlib -#endif -#ifndef moz_dont_include_mozalloc_for_${HEADER} -// mozalloc.h wants ; break the cycle by always explicitly -// including here. NB: this is a tad sneaky. Sez the gcc docs: -// -// `#include_next' does not distinguish between and "file" -// inclusion, nor does it check that the file you specify has the -// same name as the current file. It simply looks for the file -// named, starting with the directory in the search path after the -// one where the current file was found. -# include_next - -// See if we're in code that can use mozalloc. NB: this duplicates -// code in nscore.h because nscore.h pulls in prtypes.h, and chromium -// can't build with that being included before base/basictypes.h. -# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -# include "mozilla/mozalloc.h" -# else -# error "STL code can only be used with infallible ::operator new()" -# endif - -#endif - #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) // Enable checked iterators and other goodies // // FIXME/bug 551254: gcc's debug STL implementation requires -frtti. // Figure out how to resolve this with -fno-rtti. Maybe build with // -frtti in DEBUG builds? // // # define _GLIBCXX_DEBUG 1 #endif +// Don't include mozalloc for cstdlib. See bug 1245076. +#ifndef moz_dont_include_mozalloc_for_cstdlib +# define moz_dont_include_mozalloc_for_cstdlib +#endif + +// Include mozalloc after the STL header and all other headers it includes +// have been preprocessed. +#if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ + !defined(moz_dont_include_mozalloc_for_${HEADER}) +# define MOZ_INCLUDE_MOZALLOC_H +# define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} +#endif + #pragma GCC visibility push(default) #include_next <${HEADER}> #pragma GCC visibility pop +#ifdef MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} +// See if we're in code that can use mozalloc. NB: this duplicates +// code in nscore.h because nscore.h pulls in prtypes.h, and chromium +// can't build with that being included before base/basictypes.h. +# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +# include "mozilla/mozalloc.h" +# else +# error "STL code can only be used with infallible ::operator new()" +# endif +#endif + // gcc calls a __throw_*() function from bits/functexcept.h when it // wants to "throw an exception". functexcept exists nominally to // support -fno-exceptions, but since we'll always use the system // libstdc++, and it's compiled with exceptions, then in practice // these __throw_*() functions will always throw exceptions (shades of // -fshort-wchar). We don't want that and so define our own inlined // __throw_*(). #ifndef mozilla_throw_gcc_h diff --git config/make-stl-wrappers.py config/make-stl-wrappers.py --- mozilla/config/make-stl-wrappers.py +++ mozilla/config/make-stl-wrappers.py @@ -25,28 +25,26 @@ def header_path(header, compiler): def is_comment(line): return re.match(r'\s*#.*', line) def main(outdir, compiler, template_file, header_list_file): if not os.path.isdir(outdir): os.mkdir(outdir) template = open(template_file, 'r').read() - path_to_new = header_path('new', compiler) for header in open(header_list_file, 'r'): header = header.rstrip() if 0 == len(header) or is_comment(header): continue path = header_path(header, compiler) with FileAvoidWrite(os.path.join(outdir, header)) as f: f.write(string.Template(template).substitute(HEADER=header, - HEADER_PATH=path, - NEW_HEADER_PATH=path_to_new)) + HEADER_PATH=path)) if __name__ == '__main__': if 5 != len(sys.argv): print("""Usage: python {0} OUT_DIR ('msvc'|'gcc') TEMPLATE_FILE HEADER_LIST_FILE """.format(sys.argv[0]), file=sys.stderr) sys.exit(1) diff --git config/msvc-stl-wrapper.template.h config/msvc-stl-wrapper.template.h --- mozilla/config/msvc-stl-wrapper.template.h +++ mozilla/config/msvc-stl-wrapper.template.h -@@ -7,16 +7,23 @@ +@@ -3,45 +3,33 @@ + */ + /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef mozilla_${HEADER}_h #define mozilla_${HEADER}_h +-#ifndef MOZ_HAVE_INCLUDED_ALLOC +-#define MOZ_HAVE_INCLUDED_ALLOC +- #if _HAS_EXCEPTIONS # error "STL code can only be used with -fno-exceptions" #endif +// Include mozalloc after the STL header and all other headers it includes +// have been preprocessed. +#if !defined(MOZ_INCLUDE_MOZALLOC_H) +# define MOZ_INCLUDE_MOZALLOC_H +# define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} +#endif + // Code built with !_HAS_EXCEPTIONS calls std::_Throw(), but the win2k // CRT doesn't export std::_Throw(). So we define it. #ifndef mozilla_Throw_h # include "mozilla/throw_msvc.h" #endif - // Code might include before other wrapped headers, but - // includes and so we want to wrap it. But mozalloc.h -@@ -66,9 +73,20 @@ +-// Code might include before other wrapped headers, but +-// includes and so we want to wrap it. But mozalloc.h +-// wants also, so we break the cycle by always explicitly +-// including here. +-#include <${NEW_HEADER_PATH}> +- +-// See if we're in code that can use mozalloc. NB: this duplicates +-// code in nscore.h because nscore.h pulls in prtypes.h, and chromium +-// can't build with that being included before base/basictypes.h. +-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +-# include "mozilla/mozalloc.h" +-#else +-# error "STL code can only be used with infallible ::operator new()" +-#endif +-#endif /* MOZ_HAVE_INCLUDED_ALLOC */ +- + #ifdef _DEBUG + // From + // http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx + // and + // http://msdn.microsoft.com/en-us/library/aa985965%28VS.80%29.aspx + // there appear to be two types of STL container checking. The + // former is enabled by -D_DEBUG (which is implied by -MDd or -MTd), and + // looks to be full generation/mutation checked iterators as done by +@@ -70,9 +58,20 @@ // but that's OK because we're not throwing them. #pragma warning( push ) #pragma warning( disable : 4275 4530 ) #include <${HEADER_PATH}> #pragma warning( pop ) +#ifdef MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} +// See if we're in code that can use mozalloc. NB: this duplicates +// code in nscore.h because nscore.h pulls in prtypes.h, and chromium +// can't build with that being included before base/basictypes.h. +# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +# include "mozilla/mozalloc.h" +# else +# error "STL code can only be used with infallible ::operator new()" +# endif +#endif + #endif // if mozilla_${HEADER}_h diff --git memory/mozalloc/mozalloc.h memory/mozalloc/mozalloc.h --- mozilla/memory/mozalloc/mozalloc.h +++ mozilla/memory/mozalloc/mozalloc.h @@ -7,20 +7,27 @@ #ifndef mozilla_mozalloc_h #define mozilla_mozalloc_h /* * https://bugzilla.mozilla.org/show_bug.cgi?id=427099 */ -#include -#include #if defined(__cplusplus) # include +// Since libstdc++ 6, including the C headers (e.g. stdlib.h) instead of the +// corresponding C++ header (e.g. cstdlib) can cause confusion in C++ code +// using things defined there. Specifically, with stdlib.h, the use of abs() +// in gfx/graphite2/src/inc/UtfCodec.h somehow ends up picking the wrong abs() +# include +# include +#else +# include +# include #endif #if defined(__cplusplus) #include "mozilla/fallible.h" #include "mozilla/TemplateLib.h" #endif #include "mozilla/Attributes.h" #include "mozilla/Types.h" Index: head/www/seamonkey/files/patch-bug702179 =================================================================== --- head/www/seamonkey/files/patch-bug702179 (revision 423122) +++ head/www/seamonkey/files/patch-bug702179 (revision 423123) @@ -1,10 +1,10 @@ --- mozilla/js/src/moz.build.orig 2015-10-29 22:17:54 UTC +++ mozilla/js/src/moz.build -@@ -613,7 +613,3 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] +@@ -637,7 +637,3 @@ - if CONFIG['GNU_CXX']: - FAIL_ON_WARNINGS = True + if not CONFIG['GNU_CXX']: + ALLOW_COMPILER_WARNINGS = True - -NO_EXPAND_LIBS = True - -DIST_INSTALL = True Index: head/www/seamonkey/files/patch-bug847568 =================================================================== --- head/www/seamonkey/files/patch-bug847568 (revision 423122) +++ head/www/seamonkey/files/patch-bug847568 (revision 423123) @@ -1,249 +1,244 @@ # Allow building against system-wide graphite2/harfbuzz. diff --git config/Makefile.in config/Makefile.in index 14bfc0d..5383399 100644 --- mozilla/config/Makefile.in +++ mozilla/config/Makefile.in @@ -75,6 +75,8 @@ export:: $(export-preqs) -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ + -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \ + -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers $(INSTALL) system_wrappers $(DIST) diff --git config/system-headers config/system-headers index 18e8703..bdc5f82 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers @@ -1350,3 +1350,11 @@ unicode/utypes.h #endif libutil.h unwind.h +#if MOZ_NATIVE_GRAPHITE2==1 +graphite2/Font.h +graphite2/Segment.h +#endif +#if MOZ_NATIVE_HARFBUZZ==1 +harfbuzz/hb-ot.h +harfbuzz/hb.h +#endif diff --git configure.in configure.in index ac38f40..87536b7 100644 --- mozilla/configure.in +++ mozilla/configure.in @@ -7986,6 +7986,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== +dnl Check for harfbuzz +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-harfbuzz, +[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)], +MOZ_NATIVE_HARFBUZZ=1, +MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then + PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.42) +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) + +dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-graphite2, +[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)], +MOZ_NATIVE_GRAPHITE2=1, +MOZ_NATIVE_GRAPHITE2=) + +if test -n "$MOZ_NATIVE_GRAPHITE2"; then + PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2) + + dnl graphite2.pc has bogus version, check manually + AC_TRY_COMPILE([ #include + #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ + ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ + #if !GR2_VERSION_REQUIRE(1,2,4) + #error "Insufficient graphite2 version." + #endif + ], [], + [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) +fi + +AC_SUBST(MOZ_NATIVE_GRAPHITE2) + +dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== diff --git dom/base/moz.build dom/base/moz.build index a660ba4..6b2f602 100644 --- mozilla/dom/base/moz.build +++ mozilla/dom/base/moz.build @@ -375,6 +375,9 @@ if CONFIG['INTEL_ARCHITECTURE']: SOURCES += ['nsTextFragmentSSE2.cpp'] SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + EXTRA_COMPONENTS += [ 'ConsoleAPI.manifest', 'ConsoleAPIStorage.js', diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh index f3d76ea..a9e7fb6 100644 --- mozilla/gfx/graphite2/moz-gr-update.sh +++ mozilla/gfx/graphite2/moz-gr-update.sh -@@ -23,8 +23,14 @@ echo "\nSee" $0 "for update procedure.\n" >> gfx/graphite2/README.mozilla - find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; +@@ -37,6 +37,12 @@ + #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; +# closest tag/release to require for system version +TAG=$(cd ../graphitedev/ && hg parents --template {latesttag}) + +perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$TAG/ and tr/./,/ \ + if /GR2_VERSION_REQUIRE/" configure.in + # summarize what's been touched --echo Updated to $CHANGESET. -+echo Updated to $CHANGESET \($TAG for --with-system-graphite2\) + echo Updated to $RELEASE. echo Here is what changed in the gfx/graphite2 directory: - echo - diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla index ca57d16..1ce21fe 100644 --- mozilla/gfx/harfbuzz/README-mozilla +++ mozilla/gfx/harfbuzz/README-mozilla @@ -18,3 +18,8 @@ the mozilla tree. In addition, the src/Makefile.in file here is NOT from upstream, nor is it generated from src/Makefile.am (the original harfbuzz version); it is a mozilla- specific makefile that is maintained by hand. + +The in-tree copy may be omitted during build by --with-system-harfbuzz. +Make sure to keep pkg-config version check within configure.in in sync +with checkout version or increment latest tag by one if it's not based +on upstream release. diff --git gfx/moz.build gfx/moz.build index 519aa46..6929751 100644 --- mozilla/gfx/moz.build +++ mozilla/gfx/moz.build @@ -7,6 +7,12 @@ if CONFIG['MOZ_TREE_CAIRO']: DIRS += ['cairo'] +if not CONFIG['MOZ_NATIVE_GRAPHITE2']: + DIRS += ['graphite2/src' ] + +if not CONFIG['MOZ_NATIVE_HARFBUZZ']: + DIRS += ['harfbuzz/src'] + DIRS += [ '2d', 'ycbcr', @@ -15,8 +21,6 @@ DIRS += [ 'qcms', 'gl', 'layers', - 'graphite2/src', - 'harfbuzz/src', 'ots/src', 'thebes', 'ipc', diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py index 28fa6b5..240dced 100755 --- mozilla/gfx/skia/generate_mozbuild.py +++ mozilla/gfx/skia/generate_mozbuild.py @@ -142,6 +142,9 @@ if CONFIG['GNU_CXX']: if CONFIG['CPU_ARCH'] == 'arm': SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer'] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git gfx/skia/moz.build gfx/skia/moz.build index 1d0c2f9..adb8941 100644 --- mozilla/gfx/skia/moz.build +++ mozilla/gfx/skia/moz.build @@ -970,6 +970,9 @@ if CONFIG['GNU_CXX']: if CONFIG['CPU_ARCH'] == 'arm': SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer'] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git gfx/thebes/moz.build gfx/thebes/moz.build index d5852fa..aeeab25 100644 --- mozilla/gfx/thebes/moz.build +++ mozilla/gfx/thebes/moz.build @@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'): CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] -DEFINES['GRAPHITE2_STATIC'] = True +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + +if CONFIG['MOZ_NATIVE_GRAPHITE2']: + CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] +else: + DEFINES['GRAPHITE2_STATIC'] = True if CONFIG['GKMEDIAS_SHARED_LIBRARY']: DEFINES['OTS_DLL'] = True diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build index d736943..41a931f 100644 --- mozilla/intl/unicharutil/util/moz.build +++ mozilla/intl/unicharutil/util/moz.build -@@ -42,6 +42,9 @@ if CONFIG['_MSC_VER']: - if CONFIG['ENABLE_INTL_API']: +@@ -43,4 +43,7 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] + USE_LIBS += ['icu'] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['GNU_CXX']: - FAIL_ON_WARNINGS = True - + DIST_INSTALL = True diff --git netwerk/dns/moz.build netwerk/dns/moz.build index 0b0717a..2e665c9 100644 --- mozilla/netwerk/dns/moz.build +++ mozilla/netwerk/dns/moz.build @@ -66,5 +66,8 @@ LOCAL_INCLUDES += [ '/netwerk/base', ] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19': CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']] diff --git toolkit/library/moz.build toolkit/library/moz.build index 67f0db9..d42137a 100644 --- mozilla/toolkit/library/moz.build +++ mozilla/toolkit/library/moz.build @@ -187,6 +187,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] +if CONFIG['MOZ_NATIVE_GRAPHITE2']: + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] + +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + if CONFIG['MOZ_OSS']: OS_LIBS += CONFIG['MOZ_OSS_LIBS'] Index: head/www/seamonkey/files/patch-bug991253 =================================================================== --- head/www/seamonkey/files/patch-bug991253 (revision 423122) +++ head/www/seamonkey/files/patch-bug991253 (revision 423123) @@ -1,17 +1,17 @@ ---- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ -+++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo +--- mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp +@@ -392,6 +392,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries + nsCOMPtr hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), + true, getter_AddRefs(hunDir)); + if (hunDir) { + LoadDictionariesFromDir(hunDir); + } + // find dictionaries from extensions requiring restart nsCOMPtr dictDirs; rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Index: head/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h =================================================================== --- head/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h (revision 423122) +++ head/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h (revision 423123) @@ -1,12 +1,11 @@ --- mozilla/dom/events/MessageEvent.h.orig 2015-11-04 02:56:28.000000000 +0100 +++ mozilla/dom/events/MessageEvent.h 2016-01-24 16:47:37.869781000 +0100 -@@ -16,9 +16,6 @@ namespace mozilla { +@@ -16,8 +16,6 @@ namespace dom { struct MessageEventInit; -class MessagePort; --class MessagePortBase; -class MessagePortList; class OwningWindowProxyOrMessagePortOrClient; namespace workers { Index: head/www/seamonkey/files/patch-z-bug517422 =================================================================== --- head/www/seamonkey/files/patch-z-bug517422 (revision 423122) +++ head/www/seamonkey/files/patch-z-bug517422 (revision 423123) @@ -1,657 +1,657 @@ # Allow more config/external/ libs built against system-wide version. diff --git config/Makefile.in config/Makefile.in index 5383399..0410004 100644 --- mozilla/config/Makefile.in +++ mozilla/config/Makefile.in @@ -77,6 +77,14 @@ export:: $(export-preqs) -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \ -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \ + -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \ + -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \ + -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \ + -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \ + -DMOZ_NATIVE_CELT=$(MOZ_NATIVE_CELT) \ + -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \ + -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \ + -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers $(INSTALL) system_wrappers $(DIST) diff --git config/external/moz.build config/external/moz.build index f67c5c7..eb909ce 100644 --- mozilla/config/external/moz.build +++ mozilla/config/external/moz.build @@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']: # There's no "native brotli" yet, but probably in the future... external_dirs += ['modules/brotli'] -if CONFIG['MOZ_VORBIS']: +if not CONFIG['MOZ_NATIVE_OGG']: + external_dirs += ['media/libogg'] + +if not CONFIG['MOZ_NATIVE_CELT'] or not CONFIG['MOZ_NATIVE_OPUS']: + external_dirs += ['media/libopus'] + +if not CONFIG['MOZ_NATIVE_THEORA']: + external_dirs += ['media/libtheora'] + +if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']: external_dirs += ['media/libvorbis'] -if CONFIG['MOZ_TREMOR']: +if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']: external_dirs += ['media/libtremor'] if CONFIG['MOZ_WEBM']: @@ -37,15 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ if not CONFIG['MOZ_NATIVE_PNG']: external_dirs += ['media/libpng'] +if not CONFIG['MOZ_NATIVE_SPEEX']: + external_dirs += ['media/libspeex_resampler'] + +if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']: + external_dirs += ['media/libsoundtouch'] + external_dirs += [ 'media/kiss_fft', 'media/libcubeb', - 'media/libogg', - 'media/libopus', - 'media/libtheora', - 'media/libspeex_resampler', 'media/libstagefright', - 'media/libsoundtouch', ] DIRS += ['../../' + i for i in external_dirs] diff --git config/system-headers config/system-headers index bef567c..9807c29 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers @@ -1257,8 +1257,10 @@ X11/Xlocale.h X11/Xos.h X11/Xutil.h zmouse.h +#if MOZ_NATIVE_SOUNDTOUCH==1 soundtouch/SoundTouch.h soundtouch/SoundTouchFactory.h +#endif #if MOZ_LIBAV_FFT==1 libavcodec/avfft.h #endif @@ -1313,6 +1315,8 @@ vpx/vp8dx.h vpx_mem/vpx_mem.h #endif #ifdef GKMEDIAS_SHARED_LIBRARY +soundtouch/SoundTouch.h +soundtouch/SoundTouchFactory.h vpx/vpx_codec.h vpx/vpx_decoder.h vpx/vpx_encoder.h @@ -1364,3 +1363,32 @@ graphite2/Segment.h harfbuzz/hb-ot.h harfbuzz/hb.h #endif +#if MOZ_NATIVE_OGG==1 +ogg/ogg.h +ogg/os_types.h +#endif +#if MOZ_NATIVE_THEORA==1 +theora/theoradec.h +#endif +#if MOZ_NATIVE_VORBIS==1 +vorbis/codec.h +vorbis/vorbisenc.h +#endif +#if MOZ_NATIVE_TREMOR==1 +tremor/ivorbiscodec.h +#endif +#if MOZ_NATIVE_CELT==1 +celt.h +celt_header.h +celt/celt.h +celt/celt_header.h +#endif +#if MOZ_NATIVE_OPUS==1 +opus.h +opus_multistream.h +opus/opus.h +opus/opus_multistream.h +#endif +#if MOZ_NATIVE_SPEEX==1 +speex/speex_resampler.h +#endif diff --git configure.in configure.in index 87db361..7947626 100644 --- mozilla/configure.in +++ mozilla/configure.in @@ -5223,6 +5223,160 @@ if test "${ac_cv_c_attribute_aligned}" ! fi dnl ======================================================== +dnl Check for libogg +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-ogg, +[ --with-system-ogg Use system libogg (located with pkgconfig)], +MOZ_NATIVE_OGG=1, +MOZ_NATIVE_OGG=) + +if test -n "$MOZ_NATIVE_OGG"; then + PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1) + + _SAVE_LIBS=$LIBS + LIBS="$LIBS $MOZ_OGG_LIBS" + AC_CHECK_FUNC(ogg_set_mem_functions, [], + [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) + LIBS=$_SAVE_LIBS +fi + +AC_SUBST(MOZ_NATIVE_OGG) + +dnl ======================================================== +dnl Check for libvorbis +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-vorbis, +[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], +MOZ_NATIVE_VORBIS=1, +MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then + PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) +fi + +AC_SUBST(MOZ_NATIVE_VORBIS) + +dnl ======================================================== +dnl Check for integer-only libvorbis aka tremor +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-tremor, +[ --with-system-tremor Use system libtremor (located with pkgconfig)], +MOZ_NATIVE_TREMOR=1, +MOZ_NATIVE_TREMOR=) + +if test -n "$MOZ_NATIVE_TREMOR"; then + PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) +fi + +AC_SUBST(MOZ_NATIVE_TREMOR) + +dnl ======================================================== +dnl Check for libcelt +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-celt, +[ --with-system-celt Use system libcelt (located with pkgconfig)], +MOZ_NATIVE_CELT=1, +MOZ_NATIVE_CELT=) + +if test -n "$MOZ_NATIVE_CELT"; then + PKG_CHECK_MODULES(MOZ_CELT, celt) +else + MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus' +fi + +AC_SUBST(MOZ_NATIVE_CELT) + +dnl ======================================================== +dnl Check for libopus +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-opus, +[ --with-system-opus Use system libopus (located with pkgconfig)], +MOZ_NATIVE_OPUS=1, +MOZ_NATIVE_OPUS=) + +if test -n "$MOZ_NATIVE_OPUS"; then + PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1) +else + MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include' +fi + +AC_SUBST(MOZ_NATIVE_OPUS) + +dnl ======================================================== +dnl Check for libtheora +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-theora, +[ --with-system-theora Use system libtheora (located with pkgconfig)], +MOZ_NATIVE_THEORA=1, +MOZ_NATIVE_THEORA=) + +if test -n "$MOZ_NATIVE_THEORA"; then + PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) +fi + +AC_SUBST(MOZ_NATIVE_THEORA) + +dnl ======================================================== +dnl Check for libspeex resampler +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-speex, +[ --with-system-speex Use system libspeex (located with pkgconfig)], +MOZ_NATIVE_SPEEX=1, +MOZ_NATIVE_SPEEX=) + +if test -n "$MOZ_NATIVE_SPEEX"; then + PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2) +fi + +AC_SUBST(MOZ_NATIVE_SPEEX) + +dnl ======================================================== +dnl Check for libSoundTouch +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-soundtouch, +[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], +MOZ_NATIVE_SOUNDTOUCH=1, +MOZ_NATIVE_SOUNDTOUCH=) + +if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then + PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0) + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" + AC_CACHE_CHECK(for soundtouch sample type, + ac_cv_soundtouch_sample_type, + [AC_TRY_COMPILE([#include + #ifndef SOUNDTOUCH_INTEGER_SAMPLES + #error soundtouch expects float samples + #endif], + [], + [ac_cv_soundtouch_sample_type=short], + [ac_cv_soundtouch_sample_type=float])]) + CXXFLAGS=$_SAVE_CXXFLAGS + AC_LANG_RESTORE + + if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ + -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then + AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) + fi +fi + +if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then + AC_DEFINE(MOZ_NATIVE_SOUNDTOUCH) +fi +AC_SUBST(MOZ_NATIVE_SOUNDTOUCH) + +dnl ======================================================== dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp index 2127256..1ec09fe 100644 --- mozilla/dom/media/AudioStream.cpp +++ mozilla/dom/media/AudioStream.cpp @@ -129,7 +129,9 @@ AudioStream::AudioStream() , mOutChannels(0) , mWritten(0) , mAudioClock(this) +#ifndef MOZ_NATIVE_SOUNDTOUCH , mTimeStretcher(nullptr) +#endif - , mLatencyRequest(HighLatency) - , mReadPoint(0) , mDumpFile(nullptr) + , mBytesPerFrame(0) + , mState(INITIALIZED) @@ -152,9 +154,11 @@ AudioStream::~AudioStream() if (mDumpFile) { fclose(mDumpFile); } +#ifndef MOZ_NATIVE_SOUNDTOUCH if (mTimeStretcher) { soundtouch::destroySoundTouchObj(mTimeStretcher); } +#endif } size_t @@ -177,7 +181,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() { mMonitor.AssertCurrentThreadOwns(); if (!mTimeStretcher) { +#ifdef MOZ_NATIVE_SOUNDTOUCH + mTimeStretcher = new soundtouch::SoundTouch(); +#else mTimeStretcher = soundtouch::createSoundTouchObj(); +#endif mTimeStretcher->setSampleRate(mInRate); mTimeStretcher->setChannels(mOutChannels); mTimeStretcher->setPitch(1.0); diff --git dom/media/AudioStream.h dom/media/AudioStream.h index a552e3e..02b80b1 100644 --- mozilla/dom/media/AudioStream.h +++ mozilla/dom/media/AudioStream.h @@ -15,7 +15,11 @@ #include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" #include "CubebUtils.h" +#ifdef MOZ_NATIVE_SOUNDTOUCH +#include "soundtouch/SoundTouch.h" +#else #include "soundtouch/SoundTouchFactory.h" +#endif namespace mozilla { -@@ -329,7 +333,11 @@ private: +@@ -277,7 +277,11 @@ private: // Number of frames written to the buffers. int64_t mWritten; AudioClock mAudioClock; +#ifdef MOZ_NATIVE_SOUNDTOUCH + nsAutoPtr mTimeStretcher; +#else soundtouch::SoundTouch* mTimeStretcher; +#endif - nsRefPtr mLatencyLog; - // copy of Latency logger's starting time for offset calculations + // Stream start time for stream open delay telemetry. + TimeStamp mStartTime; diff --git dom/media/moz.build dom/media/moz.build index 7526cff..e0a0ca0 100644 --- mozilla/dom/media/moz.build +++ mozilla/dom/media/moz.build @@ -212,3 +212,24 @@ if CONFIG['ANDROID_VERSION'] > '15': CFLAGS += CONFIG['GSTREAMER_CFLAGS'] CXXFLAGS += CONFIG['GSTREAMER_CFLAGS'] + +if CONFIG['MOZ_NATIVE_OGG']: + CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] + +if CONFIG['MOZ_NATIVE_THEORA']: + CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] + +if CONFIG['MOZ_NATIVE_VORBIS']: + CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] + +if CONFIG['MOZ_NATIVE_TREMOR']: + CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] + +if CONFIG['MOZ_NATIVE_OPUS']: + CXXFLAGS += CONFIG['MOZ_OPUS_CFLAGS'] + +if CONFIG['MOZ_NATIVE_SPEEX']: + CXXFLAGS += CONFIG['MOZ_SPEEX_CFLAGS'] + +if CONFIG['MOZ_NATIVE_SOUNDTOUCH']: + CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build index 944744d..9a7c8c0 100644 --- mozilla/media/libcubeb/src/moz.build +++ mozilla/media/libcubeb/src/moz.build @@ -65,6 +65,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']: FINAL_LIBRARY = 'gkmedias' +if CONFIG['MOZ_NATIVE_SPEEX']: + SOURCES['cubeb_resampler.cpp'].flags += CONFIG['MOZ_SPEEX_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': CFLAGS += [ '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA index 0833e4d..7ece97b 100644 --- mozilla/media/libogg/README_MOZILLA +++ mozilla/media/libogg/README_MOZILLA @@ -6,3 +6,6 @@ The svn revision number used was r17287. The int-types.patch address a bug that config_types.h generated from Linux platform can't be used on OpenSolaris directly see Mozilla bug 449754 + +The in-tree copy may be omitted during build by --with-system-ogg. +Keep version in configure.in in sync on updates. diff --git media/libopus/README_MOZILLA media/libopus/README_MOZILLA index 2d85c9f..d3fb9f8 100644 --- mozilla/media/libopus/README_MOZILLA +++ mozilla/media/libopus/README_MOZILLA @@ -9,3 +9,6 @@ files after the copy step. The upstream repository is https://git.xiph.org/opus.git The git tag/revision used was v1.1. + +The in-tree copy may be omitted during build by --with-system-opus. +So, keep its pkg-config version check within configure.in in sync on updates. diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA index bfd4b1a..15b158d 100644 --- mozilla/media/libsoundtouch/README_MOZILLA +++ mozilla/media/libsoundtouch/README_MOZILLA @@ -6,3 +6,5 @@ The whole library is not used, only the relevant files are imported in the tree, using the script `update.sh`. Some changes have been made to the files, using the patch `moz-libsoundtouch.patch`. We also use a custom soundtouch_config.h. +The in-tree copy may be omitted during build by --with-system-soundtouch. +Keep version in configure.in in sync on updates. diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h index 0af2fe6..d80c145 100644 --- mozilla/media/libsoundtouch/src/soundtouch_perms.h +++ mozilla/media/libsoundtouch/src/soundtouch_perms.h @@ -12,7 +12,9 @@ #pragma GCC visibility push(default) #include "SoundTouch.h" +#ifndef MOZ_NATIVE_SOUNDTOUCH #include "SoundTouchFactory.h" +#endif #pragma GCC visibility pop #endif // MOZILLA_SOUNDTOUCH_PERMS_H diff --git media/libspeex_resampler/README_MOZILLA media/libspeex_resampler/README_MOZILLA index 7f6b1bb..e830300 100644 --- mozilla/media/libspeex_resampler/README_MOZILLA +++ mozilla/media/libspeex_resampler/README_MOZILLA @@ -3,3 +3,6 @@ This source is from the Speex DSP library It consists in the audio resampling code (resampler.c) and its header files dependancies, imported into the tree using the update.sh script. + +The in-tree copy may be omitted during build by --with-system-speex. +Keep version in configure.in in sync on updates. diff --git media/libtheora/README_MOZILLA media/libtheora/README_MOZILLA index d48dbfa..f08a2ed 100644 --- mozilla/media/libtheora/README_MOZILLA +++ mozilla/media/libtheora/README_MOZILLA @@ -3,3 +3,6 @@ using the update.sh script. The changes made were those applied by update.sh, the addition/update of Makefile.in files for the Mozilla build system. The subversion revision used was r17578. + +The in-tree copy may be omitted during build by --with-system-theora. +Keep version in configure.in in sync on updates. diff --git media/libtheora/moz.build media/libtheora/moz.build index 14265b1..3069e99 100644 --- mozilla/media/libtheora/moz.build +++ mozilla/media/libtheora/moz.build @@ -21,6 +21,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']: # The encoder is currently not included. DEFINES['THEORA_DISABLE_ENCODE'] = True +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] + # Suppress warnings in third-party code. if CONFIG['GNU_CC']: CFLAGS += ['-Wno-type-limits'] diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA index ee67b53..3f34a09 100644 --- mozilla/media/libtremor/README_MOZILLA +++ mozilla/media/libtremor/README_MOZILLA @@ -5,3 +5,6 @@ Makefile.in files for the Mozilla build system. The upstream release used was http://svn.xiph.org/trunk/Tremor/ The subversion revision used was r17547. + +The in-tree copy may be omitted during build by --with-system-tremor. +Keep version in configure.in in sync on updates. diff --git media/libtremor/moz.build media/libtremor/moz.build index 31831ba..a03d576 100644 --- mozilla/media/libtremor/moz.build +++ mozilla/media/libtremor/moz.build @@ -6,3 +6,5 @@ DIRS += ['include/tremor', 'lib'] +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA index 7c7454c..55baedd 100644 --- mozilla/media/libvorbis/README_MOZILLA +++ mozilla/media/libvorbis/README_MOZILLA @@ -8,3 +8,6 @@ https://svn.xiph.org/tags/vorbis/libvorbis-1.3.4@19059 Some files are renamed during the copy to prevent clashes with object file names with other Mozilla libraries. + +The in-tree copy may be omitted during build by --with-system-vorbis. +Keep version in configure.in in sync on updates. diff --git media/libvorbis/moz.build media/libvorbis/moz.build index 919b99e..cc776f7 100644 --- mozilla/media/libvorbis/moz.build +++ mozilla/media/libvorbis/moz.build @@ -55,3 +55,6 @@ FINAL_LIBRARY = 'gkmedias' # Suppress warnings in third-party code. if CONFIG['GNU_CC']: CFLAGS += ['-Wno-uninitialized'] + +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build index bbc971c..6ed7e41 100644 --- mozilla/media/webrtc/signaling/test/common.build +++ mozilla/media/webrtc/signaling/test/common.build @@ -108,6 +109,9 @@ if CONFIG['MOZ_OSS']: if CONFIG['MOZ_NATIVE_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] +if CONFIG['MOZ_NATIVE_OPUS']: + OS_LIBS += CONFIG['MOZ_OPUS_LIBS'] + if CONFIG['MOZ_NATIVE_LIBVPX']: OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] diff --git media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi index 00e77e7..55f48ab 100644 --- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi +++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi @@ -17,18 +17,11 @@ 'conditions': [ ['build_with_mozilla==1', { # Mozilla provides its own build of the opus library. - 'include_dirs': [ - '/media/libopus/include', - '/media/libopus/src', - '/media/libopus/celt', + 'cflags_mozilla': [ + '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt', + '$(MOZ_OPUS_CFLAGS)', + '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src', ], - 'direct_dependent_settings': { - 'include_dirs': [ - '/media/libopus/include', - '/media/libopus/src', - '/media/libopus/celt', - ], - }, }, { 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' diff --git media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi index 00e77e7..55f48ab 100644 --- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi +++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -84,19 +84,11 @@ ], }], ['build_with_mozilla==1', { - 'include_dirs': [ - # Need Opus header files for the audio classifier. - '<(DEPTH)/../../../media/opus/celt', -# '<(DEPTH)/third_party/opus/src/src', + 'cflags_mozilla': [ + '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt', + '$(MOZ_OPUS_CFLAGS)', + '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src', ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../../../../../../media/opus/celt', - # Need Opus header files for the audio classifier. - '<(DEPTH)/../../../media/opus/celt', -# '<(DEPTH)/third_party/opus/src/src', - ], - }, }], ], 'sources': [ diff --git toolkit/library/moz.build toolkit/library/moz.build index d42137a..695e75a8 100644 --- mozilla/toolkit/library/moz.build +++ mozilla/toolkit/library/moz.build @@ -178,6 +178,30 @@ if CONFIG['MOZ_NATIVE_PNG']: if CONFIG['MOZ_NATIVE_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] +if CONFIG['MOZ_NATIVE_OGG']: + OS_LIBS += CONFIG['MOZ_OGG_LIBS'] + +if CONFIG['MOZ_NATIVE_THEORA']: + OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] + +if CONFIG['MOZ_NATIVE_VORBIS']: + OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] + +if CONFIG['MOZ_NATIVE_TREMOR']: + OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] + +if CONFIG['MOZ_NATIVE_CELT']: + OS_LIBS += CONFIG['MOZ_CELT_LIBS'] + +if CONFIG['MOZ_NATIVE_OPUS']: + OS_LIBS += CONFIG['MOZ_OPUS_LIBS'] + +if CONFIG['MOZ_NATIVE_SPEEX']: + OS_LIBS += CONFIG['MOZ_SPEEX_LIBS'] + +if CONFIG['MOZ_NATIVE_SOUNDTOUCH']: + OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] + if CONFIG['MOZ_NATIVE_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp index 2cf281e..6d7af0e 100644 --- mozilla/xpcom/build/XPCOMInit.cpp +++ mozilla/xpcom/build/XPCOMInit.cpp @@ -138,7 +138,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); #include "mozilla/VisualEventTracer.h" #endif +#ifndef MOZ_OGG_NO_MEM_REPORTING #include "ogg/ogg.h" +#endif #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) #include "vpx_mem/vpx_mem.h" #endif @@ -651,11 +653,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, // this oddness. mozilla::SetICUMemoryFunctions(); +#ifndef MOZ_OGG_NO_MEM_REPORTING // Do the same for libogg. ogg_set_mem_functions(OggReporter::CountingMalloc, OggReporter::CountingCalloc, OggReporter::CountingRealloc, OggReporter::CountingFree); +#endif #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) // And for VPX. Index: head/www/seamonkey-i18n/Makefile =================================================================== --- head/www/seamonkey-i18n/Makefile (revision 423122) +++ head/www/seamonkey-i18n/Makefile (revision 423123) @@ -1,85 +1,84 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.39 -PORTREVISION= 1 +PORTVERSION= 2.40 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack 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} -f $$_dir/${WDIR} ; }' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/ Index: head/www/seamonkey-i18n/Makefile.lang =================================================================== --- head/www/seamonkey-i18n/Makefile.lang (revision 423122) +++ head/www/seamonkey-i18n/Makefile.lang (revision 423123) @@ -1,92 +1,89 @@ # Created by: Koji Yokota # $FreeBSD$ SEAMONKEY_I18N_ALL_= be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it \ - ja-JP-mac ja lt nb-NO nl pl pt-PT ru sk sv-SE tr uk \ + ja lt nb-NO nl pl pt-PT ru sk sv-SE tr uk \ zh-CN zh-TW .if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONS_FILE})) || make(makesum) SEAMONKEY_I18N= ${SEAMONKEY_I18N_ALL_} .else .if ${PORT_OPTIONS:MLANG_BE} SEAMONKEY_I18N+= be .endif .if ${PORT_OPTIONS:MLANG_CA} SEAMONKEY_I18N+= ca .endif .if ${PORT_OPTIONS:MLANG_CS} SEAMONKEY_I18N+= cs .endif .if ${PORT_OPTIONS:MLANG_DE} SEAMONKEY_I18N+= de .endif .if ${PORT_OPTIONS:MLANG_GB} SEAMONKEY_I18N+= en-GB .endif .if ${PORT_OPTIONS:MLANG_US} SEAMONKEY_I18N+= en-US .endif .if ${PORT_OPTIONS:MLANG_SA} SEAMONKEY_I18N+= es-AR .endif .if ${PORT_OPTIONS:MLANG_ES} SEAMONKEY_I18N+= es-ES .endif .if ${PORT_OPTIONS:MLANG_FI} SEAMONKEY_I18N+= fi .endif .if ${PORT_OPTIONS:MLANG_FR} SEAMONKEY_I18N+= fr .endif .if ${PORT_OPTIONS:MLANG_GL} SEAMONKEY_I18N+= gl .endif .if ${PORT_OPTIONS:MLANG_HU} SEAMONKEY_I18N+= hu .endif .if ${PORT_OPTIONS:MLANG_IT} SEAMONKEY_I18N+= it -.endif -.if ${PORT_OPTIONS:MLANG_JP} -SEAMONKEY_I18N+= ja-JP-mac .endif .if ${PORT_OPTIONS:MLANG_JA} SEAMONKEY_I18N+= ja .endif .if ${PORT_OPTIONS:MLANG_LT} SEAMONKEY_I18N+= lt .endif .if ${PORT_OPTIONS:MLANG_NB} SEAMONKEY_I18N+= nb-NO .endif .if ${PORT_OPTIONS:MLANG_NL} SEAMONKEY_I18N+= nl .endif .if ${PORT_OPTIONS:MLANG_PL} SEAMONKEY_I18N+= pl .endif .if ${PORT_OPTIONS:MLANG_PT} SEAMONKEY_I18N+= pt-PT .endif .if ${PORT_OPTIONS:MLANG_RU} SEAMONKEY_I18N+= ru .endif .if ${PORT_OPTIONS:MLANG_SK} SEAMONKEY_I18N+= sk .endif .if ${PORT_OPTIONS:MLANG_SE} SEAMONKEY_I18N+= sv-SE .endif .if ${PORT_OPTIONS:MLANG_TR} SEAMONKEY_I18N+= tr .endif .if ${PORT_OPTIONS:MLANG_UA} SEAMONKEY_I18N+= uk .endif .if ${PORT_OPTIONS:MLANG_CN} SEAMONKEY_I18N+= zh-CN .endif .if ${PORT_OPTIONS:MLANG_TW} SEAMONKEY_I18N+= zh-TW .endif .endif Index: head/www/seamonkey-i18n/Makefile.option =================================================================== --- head/www/seamonkey-i18n/Makefile.option (revision 423122) +++ head/www/seamonkey-i18n/Makefile.option (revision 423123) @@ -1,32 +1,31 @@ # Created by: Koji Yokota # $FreeBSD$ OPTIONS_DEFINE= LANG_BE \ LANG_CA \ LANG_CN \ LANG_CS \ LANG_NL \ LANG_DE \ LANG_GB \ LANG_US \ LANG_FI \ LANG_FR \ LANG_GL \ LANG_HU \ LANG_IT \ LANG_JA \ - LANG_JP \ LANG_LT \ LANG_NB \ LANG_PL \ LANG_PT \ LANG_RU \ LANG_ES \ LANG_SA \ LANG_SE \ LANG_SK \ LANG_TR \ LANG_TW \ LANG_UA OPTIONS_DEFAULT=LANG_CN LANG_DE LANG_FR LANG_HU LANG_IT LANG_RU LANG_ES Index: head/www/seamonkey-i18n/distinfo =================================================================== --- head/www/seamonkey-i18n/distinfo (revision 423122) +++ head/www/seamonkey-i18n/distinfo (revision 423123) @@ -1,54 +1,53 @@ -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.be.langpack.xpi) = 289803bc8d1669aa8dc116e55ffbef60a611002c39dbe9e461ad3546d82043d5 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.be.langpack.xpi) = 845960 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ca.langpack.xpi) = 7cd996abf7027189f6c3fd09501331b1bcf06a61f596cd7042d2a2a66b58e0e2 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ca.langpack.xpi) = 837800 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.cs.langpack.xpi) = 6204072196d5ef65cfd5a380d7a985f225f17b8bf5c945e7828ca33cdb09b2da -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.cs.langpack.xpi) = 830007 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.de.langpack.xpi) = a12a02029fef8caa33a99c7bd254bcacf3825b1edbbbc7a2775a8f5a1756425f -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.de.langpack.xpi) = 838258 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-GB.langpack.xpi) = 6b7d78e35df5609cdbc944cc4a36fade59d9d29ba761d31969b20be13eebff0e -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-GB.langpack.xpi) = 800622 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-US.langpack.xpi) = 96c81e0e331f9691d151fb32748e48dea57c0a2c5e7d2bfb69e619c931e7446b -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-US.langpack.xpi) = 800201 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-AR.langpack.xpi) = f9c92da4f70391413c4be4255332add2fa60a54d8e42c3205badffc4579717da -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-AR.langpack.xpi) = 849345 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-ES.langpack.xpi) = fe0d89ba946aff3ff90e6751491a64acf381d2fb176ed10270d113bc572e22f2 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-ES.langpack.xpi) = 817622 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fi.langpack.xpi) = c1732389c3d532ca50152fda28495387e66c6ab9cfcda0b607936e9601549310 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fi.langpack.xpi) = 804879 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fr.langpack.xpi) = fa90086e2d3cc968010c222e58d5e4b465c2c374e07223191483b574db772999 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fr.langpack.xpi) = 810559 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.gl.langpack.xpi) = 20b888b8f9c2c2115e8a3a2157d6f8da353c484d573da0d347ffffd41f99bc76 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.gl.langpack.xpi) = 816387 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.hu.langpack.xpi) = a13b872cf8ecc3cfaf1d8fc5e9a136ba4abd8ae07f4fff15e6dbe9fdd9e5ad7c -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.hu.langpack.xpi) = 848211 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.it.langpack.xpi) = 65fd240cdad3bc4808f0eb35ccf7cfeb9c5c69ba28d446fce91f225b0161ce97 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.it.langpack.xpi) = 728624 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja-JP-mac.langpack.xpi) = 843e6de0158c52fb3eda6e2dd02b92b45e2dbf7a7b10f7b43aff5672a0ffd295 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja-JP-mac.langpack.xpi) = 902319 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja.langpack.xpi) = 859ee3e4733f944af91d06051cd99fb78f1bb7d60f012e8cf433cf65fb0d17a3 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja.langpack.xpi) = 886715 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.lt.langpack.xpi) = bcd3b61379bbd1c28974f4609aefa25ece6b5f64715c4cb52b6eafffb60f23e6 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.lt.langpack.xpi) = 857561 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nb-NO.langpack.xpi) = 9a7280be0ae9bdf0f21ad89749cbd050dcac588989c33b016bf79496ad3660df -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nb-NO.langpack.xpi) = 827941 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nl.langpack.xpi) = 6e880ed775dbf46eb62e3ac9b8a55091790a451f86776aa5ba0de1945d8a23aa -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nl.langpack.xpi) = 795152 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pl.langpack.xpi) = 00cc6c894fc6dab4a22e9d38fb6037850f8e57a13f8150d64e8faf3878f204c8 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pl.langpack.xpi) = 860260 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pt-PT.langpack.xpi) = 7be70081c211aed53e98228ed9f9d20741f227bbafb696acf44a5eae20a286f1 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pt-PT.langpack.xpi) = 830427 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ru.langpack.xpi) = 9ad1066cb6cc07a49bbd0b2e8295db65e490a07af7c36485ae607d788817ec5e -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ru.langpack.xpi) = 889891 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sk.langpack.xpi) = f70af092108244bc70d3daa53fd41bd3a47c1af518afeca2b6f431952643c6e7 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sk.langpack.xpi) = 856745 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sv-SE.langpack.xpi) = 4ee82e2d89fd9846b4fc9465797c2f04facea76b10bf00d82ade5a581b6c5c59 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sv-SE.langpack.xpi) = 823333 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.tr.langpack.xpi) = 9d5e12b135b8157ab0febe7d2253466cc90ee410322234ebe23a3b4de83461b3 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.tr.langpack.xpi) = 813628 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.uk.langpack.xpi) = 6b4bed5fd385b1666579cf69cf094f7f81e4533be62915b02a9154ed9bbed6fe -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.uk.langpack.xpi) = 875396 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-CN.langpack.xpi) = 7cdb2dc31da908a506fca78c93008cf1b6ce9ef3dddb0fcb38b383bf9e5be556 -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-CN.langpack.xpi) = 838756 -SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-TW.langpack.xpi) = a3ae379666ff757e0424918491ae1aa710d08aa586d0fd4526bf4dd838c1461c -SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-TW.langpack.xpi) = 860307 +TIMESTAMP = 1475123784 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) = 257bd56c3db3d62600e8fcb4e621df1cb3cede2e73354a0f588516152598e9b8 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) = 846940 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) = 06d423fc182c0d6b674572a94c0628febbe314883dc0be7f481583ae21ce9485 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) = 838972 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) = b2485aaed83ad46edb565fd6d35b785fc350ae96a7c32df91eb028807d8f442e +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) = 831462 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) = 8d72d02bcec01e63a6b4630bcfd092fa1dcdf21b8424f4de878d4460e6ba1865 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) = 839670 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) = b19890d7c446ffd98a9c94f95986cbbed9842f4149ce549d3463128957f1ed9f +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) = 801900 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) = 45c6f3aee27022a7523268d21f38924dbfa3553f2dfca25e8e11ef41c1119392 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) = 801237 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) = 096bfcbd124463398d1776955587036f7d8d969582053d8980dde18e34e21738 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) = 850745 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) = 8d95036953298f880de663961a4b686bed9b233dfdc247a5107465d97d671b68 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) = 819863 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) = fbbca3abdc2fca3a7d18500e606ef75e3ee4ecbaefce3fc6bec211422521ac0e +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) = 806026 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) = faed1301c6f7eebf6999521feb7a8161f4ec5c6dab01ae717f9bb7df360a6382 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) = 812115 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) = 36d8a69aa1a526dd8ecc6a2fe2da55b5b4d3e4bcbbd2d13af0f76fa79ae21fc4 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) = 817071 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) = b259e45414ea7247c586605797064743efd203ad22ef4a6ca734d9d39ea0ddcd +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) = 849367 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) = 6818ac8634aa959c049791bd96e228ee68fb4af214d73b2ded67cdf9e8fba159 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) = 730855 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) = 73c868aad2fdcc3ddf3cbb84bdca2ec7e43c7fcf0ac1d5ec243717123dcaf353 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) = 888099 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) = eb99109e0b25415e460c31fe6be35d41ada6040ca91bb90fb29af951f0b21b6a +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) = 858221 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) = 2762bcddb6b4d36b2d14bb961e6b3604420e099216d5efc60b8835bc2709251d +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) = 829131 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) = fa6f780f2fec5b43c75bc46778ddcfa983c989fe16a0c1995c0bc65a375188f9 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) = 796595 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) = 96d1eaf1bafce2a4b11abfc7b3cccc3409b073e7353416ec7eaec48f61d0ed83 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) = 861834 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) = 1ef665be4063a864564ac13d6cf87892bc5c3c57a9e4115efd03403382e14b8b +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) = 831873 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) = 68f6ca318be2cd1f78245db311ac9c0e0ae877697c0e310284615b352338a61e +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) = 892052 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) = af8c126fe02cb3a8b9783c4a1f8d4bdec8b684195a2a8b5be537df88e2ec2861 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) = 858148 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) = fc970bfc8b52119c147d564076904df9b3722fb922bc9703709ceb5be2bd6144 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) = 824804 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) = c5dce74507307008127e3402e0c9a877f333f2b1085b1c912c77969f4a433632 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) = 814264 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) = 9932ca0ac00312a9fd9bab3199f7e55564beb6f5f339647c7a6c0cdd4cd82241 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) = 875815 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) = 28f634be2ed10526dbf6bf310b28f4da921d5809bce8216418c34ad07ac75443 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) = 839892 +SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) = eaec998d922789be13cfc42660ab96abd0b1ec47cb4394b8a9f725969141ba89 +SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) = 861767