Index: branches/2015Q4/Mk/Uses/gecko.mk =================================================================== --- branches/2015Q4/Mk/Uses/gecko.mk (revision 404094) +++ branches/2015Q4/Mk/Uses/gecko.mk (revision 404095) @@ -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>=38:${PORTSDIR}/www/libxul RUN_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 38 -_GECKO_VERSIONS= 38 42 +_GECKO_VERSIONS= 38 43 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -42_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +43_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/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_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:${PORTSDIR}/www/seamonkey .elif ${gecko_ARGS:Mthunderbird} _GECKO_DEFAULT_VERSION= 38 _GECKO_VERSIONS= 38 _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 38_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/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: branches/2015Q4/Mk/bsd.gecko.mk =================================================================== --- branches/2015Q4/Mk/bsd.gecko.mk (revision 404094) +++ branches/2015Q4/Mk/bsd.gecko.mk (revision 404095) @@ -1,627 +1,627 @@ #-*- tab-width: 4; -*- # ex:ts=4 # # Date created: 12 Nov 2005 # Whom: Michael Johnson # # $FreeBSD$ # # 4 column tabs prevent hair loss and tooth decay! # bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users # and porters to support any available gecko backend without needing to build # many conditional tests. ${USE_GECKO} is the list of backends that your port # can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend. # Users set ${WITH_GECKO} to the list of gecko backends they want on their # system. .if defined(USE_GECKO) .if !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) Gecko_Pre_Include= bsd.gecko.mk # This file contains some reusable components for mozilla ports. It's of # use primarily to apps from the mozilla project itself (such as Firefox, # Thunderbird, etc.), and probably won't be of use for gecko-based ports # like epiphany, galeon, etc. # # You need to make sure to add USE_GECKO=gecko to for your port can uses # one of these options below. # # Ports can use the following: # # USE_MOZILLA By default, it enables every system dependency # listed in '_ALL_DEPENDS'. If your port doesn't # need one of those then you can use '-' like # 'USE_MOZILLA= -png -vpx' to subtract the # dependencies. Experimental deps use '+' like # 'USE_MOZILLA= +speex +theora'. # # MOZILLA_PLIST_DIRS List of directories to descend into when installing # and creating the plist # # MOZ_PIS_SCRIPTS List of scripts residing in ${FILESDIR} to be # filtered through MOZCONFIG_SED and installed along # with our Pluggable Init Scripts (PIS) # # MOZ_SED_ARGS sed(1) commands through which MOZ_PIS_SCRIPTS are # filtered. There is a default set defined here, so # you probably want to add to MOZ_SED_ARGS rather # than clobber it # # MOZ_OPTIONS configure arguments (added to .mozconfig). If # NOMOZCONFIG is defined, you probably want to set # CONFIGURE_ARGS+=${MOZ_OPTIONS} # # MOZ_MK_OPTIONS The make(1) arguments (added to .mozconfig). If # NOMOZCONFIG is defined, you probably want to set # MAKE_ARGS+=${MOZ_MK_OPTIONS} # # MOZ_EXPORT Environment variables for the build process (added # to .mozconfig). If NOMOZCONFIG is defined, you # probably want to set MAKE_ENV+=${MOZ_EXPORT} # # MOZ_CHROME A variable for the --enable-chrome-format= in # CONFIGURE_ARGS. The default is omni. # # MOZ_TOOLKIT A variable for the --enable-default-toolkit= in # CONFIGURE_ARGS. The default is cairo-gtk2. # # MOZ_EXTENSIONS A list of extensions to build # # MOZ_PROTOCOLS A list of protocols to build (http, ftp, etc.) # # PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can be # set to a generic mozconfig included with the port # # NOMOZCONFIG Don't drop a customized .mozconfig into the build # directory. Options will have to be specified in # CONFIGURE_ARGS instead # MAINTAINER?= gecko@FreeBSD.org MOZILLA?= ${PORTNAME} MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} USES+= cpe compiler:c++11-lang gmake iconv perl5 pkgconfig \ python:2.7,build desktop-file-utils CPE_VENDOR?=mozilla USE_PERL5= build USE_XORG= xext xrender xt .if ${MOZILLA} != "libxul" BUNDLE_LIBS= yes .endif MOZILLA_SUFX?= none MOZSRC?= ${WRKSRC} WRKSRC?= ${WRKDIR}/mozilla PLISTF?= ${WRKDIR}/plist_files MOZ_OBJDIR?= ${WRKSRC}/obj-${CONFIGURE_TARGET} MOZ_PIS_DIR?= lib/${MOZILLA}/init.d PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig # XXX Not ?= because fmake uses MAKEFILE internally MAKEFILE= ${WRKSRC}/client.mk MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin ALL_TARGET?= build CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL} MOZ_EXPORT+= ${CONFIGURE_ENV} \ PERL="${PERL}" MOZ_OPTIONS+= ${CONFIGURE_TARGET} --prefix="${PREFIX}" MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA} .if ${OPSYS} != DragonFly # XXX xpcshell crash during install -# use jemalloc 3.0.0 API for stats/tuning -MOZ_EXPORT+= MOZ_JEMALLOC3=1 +# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning +MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100079 . if ${MOZILLA_VER:R:R} < 43 # system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bug1125514 . endif .elif ${OPSYS} != FreeBSD || ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37 MOZ_OPTIONS+= --enable-jemalloc .endif .endif # !DragonFly # Standard depends _ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss opus png pixman soundtouch sqlite vpx .if ${PORT_OPTIONS:MINTEGER_SAMPLES} MOZ_EXPORT+= MOZ_INTEGER_SAMPLES=1 _ALL_DEPENDS+= tremor .else _ALL_DEPENDS+= vorbis .endif .if ! ${PORT_OPTIONS:MBUNDLED_CAIRO} cairo_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo .endif event_LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 event_MOZ_OPTIONS= --with-system-libevent ffi_LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi ffi_MOZ_OPTIONS= --enable-system-ffi .if exists(${FILESDIR}/patch-bug847568) graphite_LIB_DEPENDS= libgraphite2.so:${PORTSDIR}/graphics/graphite2 graphite_MOZ_OPTIONS= --with-system-graphite2 harfbuzz_LIB_DEPENDS= libharfbuzz.so:${PORTSDIR}/print/harfbuzz harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz .endif hunspell_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell icu_LIB_DEPENDS= libicui18n.so:${PORTSDIR}/devel/icu icu_MOZ_OPTIONS= --with-system-icu --with-intl-api -jpeg_BUILD_DEPENDS=yasm:${PORTSDIR}/devel/yasm # XXX JCS_EXTENSIONS API is currently disabled by r371283 # XXX Remove files/patch-ijg-libjpeg once -turbo is default jpeg_USES= jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} nspr_LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr nspr_MOZ_OPTIONS= --with-system-nspr nss_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss nss_MOZ_OPTIONS= --with-system-nss .if exists(${FILESDIR}/patch-z-bug517422) opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus opus_MOZ_OPTIONS= --with-system-opus .endif pixman_LIB_DEPENDS= libpixman-1.so:${PORTSDIR}/x11/pixman pixman_MOZ_OPTIONS= --enable-system-pixman png_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} .if exists(${FILESDIR}/patch-z-bug517422) soundtouch_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch soundtouch_MOZ_OPTIONS= --with-system-soundtouch # XXX disabled: bug 913854 not yet upstreamed speex_LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speex speex_MOZ_OPTIONS= --with-system-speex .endif sqlite_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 sqlite_MOZ_OPTIONS= --enable-system-sqlite .if exists(${FILESDIR}/patch-z-bug517422) # XXX disabled: update to 1.2.x or review backported fixes theora_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora theora_MOZ_OPTIONS= --with-system-theora tremor_LIB_DEPENDS= libvorbisidec.so:${PORTSDIR}/audio/libtremor tremor_MOZ_OPTIONS= --with-system-tremor --with-system-ogg vorbis_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis vorbis_MOZ_OPTIONS= --with-system-vorbis --with-system-ogg .endif -vpx_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm vpx_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx vpx_MOZ_OPTIONS= --with-system-libvpx .for use in ${USE_MOZILLA} ${use:S/-/_WITHOUT_/}= ${TRUE} .endfor .for dep in ${_ALL_DEPENDS} ${USE_MOZILLA:M+*:S/+//} .if !defined(_WITHOUT_${dep}) BUILD_DEPENDS+= ${${dep}_BUILD_DEPENDS} LIB_DEPENDS+= ${${dep}_LIB_DEPENDS} RUN_DEPENDS+= ${${dep}_RUN_DEPENDS} USES+= ${${dep}_USES} MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} .else BUILD_DEPENDS+= ${-${dep}_BUILD_DEPENDS} .endif .endfor # Standard options MOZ_CHROME?= omni MOZ_TOOLKIT?= cairo-gtk2 MOZ_OPTIONS+= \ --enable-chrome-format=${MOZ_CHROME} \ --enable-default-toolkit=${MOZ_TOOLKIT} \ --with-pthreads # Configure options for install .if !defined(MOZ_EXTENSIONS) MOZ_OPTIONS+= --enable-extensions=default .else MOZ_OPTIONS+= --enable-extensions=${MOZ_EXTENSIONS} .endif .if !defined(MOZ_PROTOCOLS) MOZ_OPTIONS+= --enable-necko-protocols=default .else MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} .endif # others MOZ_OPTIONS+= --with-system-zlib \ --with-system-bz2 \ --enable-unified-compilation \ --disable-debug-symbols \ --disable-glibtest \ --disable-gtktest \ --disable-freetypetest \ --disable-installer \ --disable-updater \ --disable-pedantic # API keys from www/chromium # http://www.chromium.org/developers/how-tos/api-keys # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. MOZ_EXPORT+= MOZ_GOOGLE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 \ MOZ_GOOGLE_OAUTH_API_CLIENTID=996322985003.apps.googleusercontent.com \ MOZ_GOOGLE_OAUTH_API_KEY=IR1za9-1VK0zZ0f_O8MVFicn .if ${PORT_OPTIONS:MGTK3} MOZ_TOOLKIT= cairo-gtk3 .endif .if ${MOZ_TOOLKIT:Mcairo-qt} # don't use - transparent backgrounds (bug 521582), USE_MOZILLA+= -cairo # ports/169343 USE_DISPLAY=yes # install USE_GNOME+= pango USE_QT5+= qmake_build buildtools_build gui network quick printsupport MOZ_EXPORT+= HOST_QMAKE="${QMAKE}" HOST_MOC="${MOC}" HOST_RCC="${RCC}" .elif ${MOZ_TOOLKIT:Mcairo-gtk3} USE_GNOME+= gtk30 . if ${MOZILLA_VER:R:R} >= 32 USE_GNOME+= gtk20 # bug 624422 . endif .else # gtk2, cairo-gtk2 USE_GNOME+= gtk20 .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 MOZ_EXPORT+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" MOZ_OPTIONS+= --enable-optimize .else MOZ_OPTIONS+= --disable-optimize .endif .if ${PORT_OPTIONS:MCANBERRA} RUN_DEPENDS+= libcanberra>0:${PORTSDIR}/audio/libcanberra .endif .if ${PORT_OPTIONS:MDBUS} BUILD_DEPENDS+= libnotify>0:${PORTSDIR}/devel/libnotify LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification MOZ_OPTIONS+= --enable-startup-notification .else MOZ_OPTIONS+= --disable-dbus --disable-libnotify .endif .if ${PORT_OPTIONS:MGSTREAMER} USE_GSTREAMER1?=good libav MOZ_OPTIONS+= --enable-gstreamer=1.0 .else MOZ_OPTIONS+= --disable-gstreamer .endif .if ${PORT_OPTIONS:MGCONF} BUILD_DEPENDS+= ${gconf2_DETECT}:${gconf2_LIB_DEPENDS:C/.*://} USE_GNOME+= gconf2:build MOZ_OPTIONS+= --enable-gconf .else MOZ_OPTIONS+= --disable-gconf .endif .if ${PORT_OPTIONS:MGIO} && ! ${MOZ_TOOLKIT:Mcairo-qt} MOZ_OPTIONS+= --enable-gio .else MOZ_OPTIONS+= --disable-gio .endif .if ${PORT_OPTIONS:MGNOMEUI} BUILD_DEPENDS+= ${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://} USE_GNOME+= libgnomeui:build MOZ_OPTIONS+= --enable-gnomeui .else MOZ_OPTIONS+= --disable-gnomeui .endif .if ${PORT_OPTIONS:MLIBPROXY} LIB_DEPENDS+= libproxy.so:${PORTSDIR}/net/libproxy MOZ_OPTIONS+= --enable-libproxy .else MOZ_OPTIONS+= --disable-libproxy .endif .if ${PORT_OPTIONS:MPGO} USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*} USE_DISPLAY=yes ALL_TARGET= profiledbuild MOZ_EXPORT+=MOZ_OPTIMIZE_FLAGS="-Os" MOZ_PGO_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" .endif .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins MOZ_OPTIONS+= --enable-alsa .endif .if ${PORT_OPTIONS:MPULSEAUDIO} . if ${PORT_OPTIONS:MALSA} BUILD_DEPENDS+= pulseaudio>0:${PORTSDIR}/audio/pulseaudio . else # pull pulse package if we cannot fallback to another backend LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio . endif MOZ_OPTIONS+= --enable-pulseaudio .else MOZ_OPTIONS+= --disable-pulseaudio .endif .if ${PORT_OPTIONS:MDEBUG} MOZ_OPTIONS+= --enable-debug --disable-release STRIP= # ports/184285 .else MOZ_OPTIONS+= --disable-debug --enable-release .endif .if ${PORT_OPTIONS:MDTRACE} MOZ_OPTIONS+= --enable-dtrace . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100061 LIBS+= -lelf . endif STRIP= .else MOZ_OPTIONS+= --disable-dtrace .endif .if ${MOZILLA_VER:R:R} < 40 . if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG} MOZ_OPTIONS+= --enable-logging . else MOZ_OPTIONS+= --disable-logging . endif .endif .if ${PORT_OPTIONS:MPROFILE} MOZ_OPTIONS+= --enable-profiling STRIP= .else MOZ_OPTIONS+= --disable-profiling .endif .if ${PORT_OPTIONS:MTEST} USE_XORG+= xscrnsaver MOZ_OPTIONS+= --enable-tests .else MOZ_OPTIONS+= --disable-tests .endif .if !defined(STRIP) || ${STRIP} == "" MOZ_OPTIONS+= --disable-strip --disable-install-strip .else MOZ_OPTIONS+= --enable-strip --enable-install-strip .endif # _MAKE_JOBS is only available after bsd.port.post.mk, thus cannot be # used in .mozconfig. And client.mk automatically uses -jN where N # is what multiprocessing.cpu_count() returns. .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE) MAKE_JOBS_NUMBER= 1 .endif .if defined(MAKE_JOBS_NUMBER) MOZ_MAKE_FLAGS+=-j${MAKE_JOBS_NUMBER} .endif .if defined(MOZ_MAKE_FLAGS) MOZ_MK_OPTIONS+=MOZ_MAKE_FLAGS="${MOZ_MAKE_FLAGS}" .endif MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ -e 's|@CFLAGS@|${CFLAGS}|g' \ -e 's|@LDFLAGS@|${LDFLAGS}|g' \ -e 's|@LIBS@|${LIBS}|g' \ -e 's|@LOCALBASE@|${LOCALBASE}|g' \ -e 's|@PERL@|${PERL5}|g' \ -e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g' \ -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%CFLAGS%%|${CFLAGS}|g' \ -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ -e 's|%%LIBS%%|${LIBS}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%PERL%%|${PERL5}|g' \ -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g' \ -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} .if ${ARCH} == amd64 . if ${USE_MOZILLA:M-nss} USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin LDFLAGS+= -B${LOCALBASE}/bin . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000041 && \ exists(/usr/lib/libcxxrt.so) && ${CXXFLAGS:M-stdlib=libc++} LIBS+= -lcxxrt . endif . endif .elif ${ARCH:Mpowerpc*} USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*} . if ${ARCH} == "powerpc64" MOZ_EXPORT+= UNAME_m="${ARCH}" CFLAGS+= -mminimal-toc . endif .elif ${ARCH} == "sparc64" # Work around miscompilation/mislinkage of the sCanonicalVTable hacks. MOZ_OPTIONS+= --disable-v1-string-abi .endif .else # bsd.port.post.mk pre-extract: gecko-pre-extract gecko-pre-extract: .if ${PORT_OPTIONS:MPGO} @${ECHO} "*****************************************************************" @${ECHO} "**************************** attention **************************" @${ECHO} "*****************************************************************" @${ECHO} "To build ${MOZILLA} with PGO support you need a running X server and" @${ECHO} " build this port with an user who could access the X server! " @${ECHO} "" @${ECHO} "During the build a ${MOZILLA} instance will start and run some test." @${ECHO} " Do not interrupt or close ${MOZILLA} during this tests! " @${ECHO} "*****************************************************************" @sleep 10 .endif post-patch: gecko-post-patch gecko-moz-pis-patch gecko-post-patch: .if exists(${PKGINSTALL_INC}) @${MOZCONFIG_SED} < ${PKGINSTALL_INC} > ${PKGINSTALL} .endif .if exists(${PKGDEINSTALL_INC}) @${MOZCONFIG_SED} < ${PKGDEINSTALL_INC} > ${PKGDEINSTALL} .endif @${RM} -f ${MOZCONFIG} .if !defined(NOMOZCONFIG) @if [ -e ${PORT_MOZCONFIG} ] ; then \ ${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \ fi .for arg in ${MOZ_OPTIONS} @${ECHO_CMD} ac_add_options ${arg:Q} >> ${MOZCONFIG} .endfor .for arg in ${MOZ_MK_OPTIONS} @${ECHO_CMD} mk_add_options ${arg:Q} >> ${MOZCONFIG} .endfor .for var in ${MOZ_EXPORT} @${ECHO_CMD} export ${var:Q} >> ${MOZCONFIG} .endfor .endif # .if !defined(NOMOZCONFIG) .if exists(${MOZSRC}/build/unix/mozilla-config.in) @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \ s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \ s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \ ${MOZSRC}/build/unix/mozilla-config.in .endif .if ${USE_MOZILLA:M-nspr} @${ECHO_MSG} "===> Applying NSPR patches" @for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \ ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub/build < $$i; \ done .endif .if ${USE_MOZILLA:M-nss} @${ECHO_MSG} "===> Applying NSS patches" @for i in ${.CURDIR}/../../security/nss/files/patch-*; do \ ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \ done .endif @for f in \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/configure \ ${MOZSRC}/security/coreconf/FreeBSD.mk \ ${MOZSRC}/js/src/Makefile.in \ ${MOZSRC}/js/src/configure \ ${MOZSRC}/configure \ ${WRKSRC}/configure; do \ if [ -f $$f ] ; then \ ${REINPLACE_CMD} -Ee 's|-lc_r|-pthread|g ; \ s|-l?pthread|-pthread|g ; \ s|echo aout|echo elf|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ $$f; \ fi; \ done @if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \ ${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ ${WRKSRC}/config/baseconfig.mk; \ fi @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ ${MOZSRC}/config/baseconfig.mk @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${MOZSRC}/xpcom/io/SpecialSystemDirectory.cpp @${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \ ${MOZSRC}/xpcom/build/nsXPCOMPrivate.h @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|mozilla/plugins|browser_plugins|g' \ -e 's|share/mozilla/extensions|lib/xpi|g' \ ${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp + ${MOZSRC}/extensions/spellcheck/hunspell/*/mozHunspell.cpp # handles mozilla pis scripts. gecko-moz-pis-patch: .for moz in ${MOZ_PIS_SCRIPTS} @${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz} .endfor do-configure: gecko-do-configure gecko-do-configure: @(if ! ${CONFIGURE_ENV} ${DO_MAKE_BUILD} configure; then \ ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ ${FALSE}; \ fi) pre-install: gecko-moz-pis-pre-install post-install-script: gecko-create-plist gecko-create-plist: port-post-install .if !target(port-post-install) port-post-install: @${DO_NADA} .endif gecko-create-plist: # Create the plist ${RM} -f ${PLISTF} .for dir in ${MOZILLA_PLIST_DIRS} @cd ${STAGEDIR}${PREFIX}/${dir} && ${FIND} -H -s * ! -type d | \ ${SED} -e 's|^|${dir}/|' >> ${PLISTF} .endfor ${CAT} ${PLISTF} | ${SORT} >> ${TMPPLIST} gecko-moz-pis-pre-install: .if defined(MOZ_PIS_SCRIPTS) ${MKDIR} ${STAGEDIR}${PREFIX}/${MOZ_PIS_DIR} .for moz in ${MOZ_PIS_SCRIPTS} ${INSTALL_SCRIPT} ${WRKDIR}/${moz} ${STAGEDIR}${PREFIX}/${MOZ_PIS_DIR} .endfor .endif .endif .endif # HERE THERE BE TACOS -- adamw Index: branches/2015Q4/www/firefox/Makefile =================================================================== --- branches/2015Q4/www/firefox/Makefile (revision 404094) +++ branches/2015Q4/www/firefox/Makefile (revision 404095) @@ -1,99 +1,99 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 42.0 +DISTVERSION= 43.0.1 DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \ nss>=3.19.4:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.42:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ yasm:${PORTSDIR}/devel/yasm \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip # opus>=1.1:${PORTSDIR}/audio/opus \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -opus MOZILLA_NAME= Firefox USE_QT5= # empty QT_NONSTANDARD= yes USE_GL= gl USES= dos2unix tar:xz DOS2UNIX_FILES= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --enable-application=browser \ --enable-official-branding OPTIONS_EXCLUDE= LOGGING OPTIONS_DEFAULT= GTK2 OPTIONS_SINGLE+= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 .include "${.CURDIR}/../../www/firefox/Makefile.options" .include WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} .if ${PORT_OPTIONS:MALSA} RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib .endif .if ! ${PORT_OPTIONS:MBUNDLED_CAIRO} BUILD_DEPENDS+= cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo .endif .if ${PORT_OPTIONS:MGSTREAMER} RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav .endif .if ${PORT_OPTIONS:MGTK3} BUILD_DEPENDS+= gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30 .endif post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ ${WRKSRC}/configure.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2015Q4/www/firefox/distinfo =================================================================== --- branches/2015Q4/www/firefox/distinfo (revision 404094) +++ branches/2015Q4/www/firefox/distinfo (revision 404095) @@ -1,2 +1,2 @@ -SHA256 (firefox-42.0.source.tar.xz) = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae -SIZE (firefox-42.0.source.tar.xz) = 165766832 +SHA256 (firefox-43.0.1.source.tar.xz) = b1f9173c6ddbd2bf868d94a815fde364bc37aa46a00981903fd1fe86a8f873d8 +SIZE (firefox-43.0.1.source.tar.xz) = 175453060 Index: branches/2015Q4/www/firefox/files/patch-media_libav_config__unix.h =================================================================== --- branches/2015Q4/www/firefox/files/patch-media_libav_config__unix.h (revision 404094) +++ branches/2015Q4/www/firefox/files/patch-media_libav_config__unix.h (nonexistent) @@ -1,11 +0,0 @@ ---- media/libav/config_unix.h.orig 2015-10-29 22:17:49 UTC -+++ 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: branches/2015Q4/www/firefox/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: branches/2015Q4/www/firefox/files/patch-bug1026499 =================================================================== --- branches/2015Q4/www/firefox/files/patch-bug1026499 (revision 404094) +++ branches/2015Q4/www/firefox/files/patch-bug1026499 (revision 404095) @@ -1,68 +1,55 @@ 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 --- ipc/ipdl/ipdl/cxx/ast.py +++ 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 --- ipc/ipdl/ipdl/cxx/cgen.py +++ 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 ---- ipc/ipdl/ipdl/lower.py -+++ 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| Index: branches/2015Q4/www/firefox/files/patch-bug1228742 =================================================================== --- branches/2015Q4/www/firefox/files/patch-bug1228742 (nonexistent) +++ branches/2015Q4/www/firefox/files/patch-bug1228742 (revision 404095) @@ -0,0 +1,13 @@ +--- toolkit/crashreporter/test/moz.build.orig 2015-12-16 16:15:25.278076000 +0100 ++++ 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: branches/2015Q4/www/firefox/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: branches/2015Q4/www/firefox/files/patch-bug702179 =================================================================== --- branches/2015Q4/www/firefox/files/patch-bug702179 (revision 404094) +++ branches/2015Q4/www/firefox/files/patch-bug702179 (revision 404095) @@ -1,10 +1,10 @@ ---- js/src/moz.build.orig 2015-10-29 22:17:54 UTC -+++ js/src/moz.build -@@ -613,7 +613,3 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] +--- js/src/moz.build.orig 2015-12-16 12:32:04.574425000 +0100 ++++ js/src/moz.build 2015-12-16 12:32:09.032032000 +0100 +@@ -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: branches/2015Q4/www/firefox/files/patch-bug847568 =================================================================== --- branches/2015Q4/www/firefox/files/patch-bug847568 (revision 404094) +++ branches/2015Q4/www/firefox/files/patch-bug847568 (revision 404095) @@ -1,249 +1,244 @@ # Allow building against system-wide graphite2/harfbuzz. diff --git config/Makefile.in config/Makefile.in index 14bfc0d..5383399 100644 --- config/Makefile.in +++ 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 --- config/system-headers +++ 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 --- configure.in +++ 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 --- dom/base/moz.build +++ 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 --- gfx/graphite2/moz-gr-update.sh +++ 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 --- gfx/harfbuzz/README-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 --- gfx/moz.build +++ 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 --- gfx/skia/generate_mozbuild.py +++ 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 --- gfx/skia/moz.build +++ 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 --- gfx/thebes/moz.build +++ 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 --- intl/unicharutil/util/moz.build +++ 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 --- netwerk/dns/moz.build +++ 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 --- toolkit/library/moz.build +++ 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: branches/2015Q4/www/firefox/files/patch-bug991253 =================================================================== --- branches/2015Q4/www/firefox/files/patch-bug991253 (revision 404094) +++ branches/2015Q4/www/firefox/files/patch-bug991253 (revision 404095) @@ -1,17 +1,17 @@ ---- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ -+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo +--- extensions/spellcheck/hunspell/glue/mozHunspell.cpp~ ++++ 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: branches/2015Q4/www/firefox/files/patch-soundtouch-no-factory =================================================================== --- branches/2015Q4/www/firefox/files/patch-soundtouch-no-factory (revision 404094) +++ branches/2015Q4/www/firefox/files/patch-soundtouch-no-factory (revision 404095) @@ -1,84 +1,84 @@ # Partially revert bug 1176300 to unbreak build with system libsoundtouch diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp --- dom/media/AudioStream.cpp +++ dom/media/AudioStream.cpp @@ -129,7 +129,6 @@ , mOutChannels(0) , mWritten(0) , mAudioClock(this) - , mTimeStretcher(nullptr) - , mLatencyRequest(HighLatency) - , mReadPoint(0) , mDumpFile(nullptr) + , mBytesPerFrame(0) + , mState(INITIALIZED) @@ -152,9 +151,6 @@ if (mDumpFile) { fclose(mDumpFile); } - if (mTimeStretcher) { - soundtouch::destroySoundTouchObj(mTimeStretcher); - } } size_t @@ -177,7 +173,7 @@ { mMonitor.AssertCurrentThreadOwns(); if (!mTimeStretcher) { - mTimeStretcher = soundtouch::createSoundTouchObj(); + mTimeStretcher = new soundtouch::SoundTouch(); mTimeStretcher->setSampleRate(mInRate); mTimeStretcher->setChannels(mOutChannels); mTimeStretcher->setPitch(1.0); diff --git dom/media/AudioStream.h dom/media/AudioStream.h --- dom/media/AudioStream.h +++ dom/media/AudioStream.h @@ -15,7 +15,7 @@ #include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" #include "CubebUtils.h" -#include "soundtouch/SoundTouchFactory.h" +#include "soundtouch/SoundTouch.h" namespace mozilla { @@ -329,7 +329,7 @@ // Number of frames written to the buffers. int64_t mWritten; AudioClock mAudioClock; - soundtouch::SoundTouch* mTimeStretcher; + nsAutoPtr mTimeStretcher; - nsRefPtr mLatencyLog; - // copy of Latency logger's starting time for offset calculations + // Stream start time for stream open delay telemetry. + TimeStamp mStartTime; diff --git media/libsoundtouch/src/moz.build media/libsoundtouch/src/moz.build --- media/libsoundtouch/src/moz.build +++ media/libsoundtouch/src/moz.build @@ -8,7 +8,6 @@ 'FIFOSamplePipe.h', 'SoundTouch.h', 'soundtouch_config.h', - 'SoundTouchFactory.h', 'STTypes.h', ] @@ -22,7 +21,6 @@ 'InterpolateShannon.cpp', 'RateTransposer.cpp', 'SoundTouch.cpp', - 'SoundTouchFactory.cpp', 'TDStretch.cpp', ] diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h --- media/libsoundtouch/src/soundtouch_perms.h +++ media/libsoundtouch/src/soundtouch_perms.h @@ -12,7 +12,6 @@ #pragma GCC visibility push(default) #include "SoundTouch.h" -#include "SoundTouchFactory.h" #pragma GCC visibility pop #endif // MOZILLA_SOUNDTOUCH_PERMS_H Index: branches/2015Q4/www/firefox-i18n/Makefile =================================================================== --- branches/2015Q4/www/firefox-i18n/Makefile (revision 404094) +++ branches/2015Q4/www/firefox-i18n/Makefile (revision 404095) @@ -1,89 +1,89 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 42.0 +PORTVERSION= 43.0.1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} MAINTAINER= gecko@FreeBSD.org COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:firefox,42,build +USES= zip:infozip gecko:firefox,43,build USE_XPI= firefox linux-firefox NO_ARCH= yes USE_SUBMAKE= yes WDIR= langpack-*@firefox.mozilla.org XPI_DISTNAMES= ${FIREFOX_I18N_} PLIST?= ${WRKDIR}/plist PLISTF?= ${WRKDIR}/plist_files .include "${.CURDIR}/Makefile.option" .include .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif .include "${.CURDIR}/Makefile.lang" FIREFOX_I18N_?= ${FIREFOX_I18N} .for dist in ${XPI_DISTNAMES} XPI_ID_${dist}= langpack-${dist}@firefox.mozilla.org .endfor pre-everything:: @${ECHO_CMD} @${ECHO_CMD} "Please define FIREFOX_I18N_ALL to install all languages." @${ECHO_CMD} do-extract: @${MKDIR} ${WRKSRC} @for lang in ${FIREFOX_I18N_}; do \ if ! (${UNZIP_CMD} -qo ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@firefox.mozilla.org);\ then \ exit 1; \ fi; \ cd ${WRKSRC}/langpack-$$lang@firefox.mozilla.org/; \ ${FIND} -H -s * ! -type d | \ ${SED} -e "s|^|lib/xpi/langpack-$$lang@firefox.mozilla.org/|" >> ${PLISTF}; \ done ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL} cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${XPI_LIBDIR} ${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${WDIR}/ @for e in ${STAGEDIR}${XPI_LIBDIR}/${WDIR}; do \ for _dir in ${XPI_LINKFARMS} ; do \ ${LN} -sf $${_e##*/} ${STAGEDIR}$$_dir/ ${_Q} ; \ done \ done @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/ Index: branches/2015Q4/www/firefox-i18n/distinfo =================================================================== --- branches/2015Q4/www/firefox-i18n/distinfo (revision 404094) +++ branches/2015Q4/www/firefox-i18n/distinfo (revision 404095) @@ -1,178 +1,178 @@ -SHA256 (xpi/firefox-i18n-42.0/ach.xpi) = 80b7f285d462ea72b49e482519c8d6265ad4767e89b1bfdc2e2d82eabff45be8 -SIZE (xpi/firefox-i18n-42.0/ach.xpi) = 484101 -SHA256 (xpi/firefox-i18n-42.0/af.xpi) = 087fc72613b98336eefc5db701b361188d7e3950365650651c2b53ced362eea6 -SIZE (xpi/firefox-i18n-42.0/af.xpi) = 491004 -SHA256 (xpi/firefox-i18n-42.0/an.xpi) = 7b99498a270e20066f9791e92841ee61a1da88b883c36e611cfe79a4abeb7285 -SIZE (xpi/firefox-i18n-42.0/an.xpi) = 469526 -SHA256 (xpi/firefox-i18n-42.0/ar.xpi) = c4bd2e007fffa25743e8f20f70baf3abcef6aee59b82fc1360a9a2ebf120da69 -SIZE (xpi/firefox-i18n-42.0/ar.xpi) = 527045 -SHA256 (xpi/firefox-i18n-42.0/as.xpi) = 397f51b49a9a5c754079561e5245e2e61508e61b1f1386e80fb9aaa91b4424c8 -SIZE (xpi/firefox-i18n-42.0/as.xpi) = 516804 -SHA256 (xpi/firefox-i18n-42.0/ast.xpi) = a6dd8e3b2439f047c8aa929050df202b1128f54a01c7d55e86a0d582c4372096 -SIZE (xpi/firefox-i18n-42.0/ast.xpi) = 409860 -SHA256 (xpi/firefox-i18n-42.0/az.xpi) = fe56a7bd0694dd42946cfc1723c4c7d2075f2588baff2ca742afd2761df434d0 -SIZE (xpi/firefox-i18n-42.0/az.xpi) = 498264 -SHA256 (xpi/firefox-i18n-42.0/be.xpi) = 0fb8d84bbe69b6402847fe9be3392e50f867a8949b3597947287d1cb5723e40d -SIZE (xpi/firefox-i18n-42.0/be.xpi) = 458684 -SHA256 (xpi/firefox-i18n-42.0/bg.xpi) = 68f2334cbd91976b12de4d489d46f0a1a02720a02b848d0f1ead2d1475f94b35 -SIZE (xpi/firefox-i18n-42.0/bg.xpi) = 497770 -SHA256 (xpi/firefox-i18n-42.0/bn-BD.xpi) = c49c4df26fa1396efec68ddecde3947204baf7f5040c4380e4ab0742592db27e -SIZE (xpi/firefox-i18n-42.0/bn-BD.xpi) = 545583 -SHA256 (xpi/firefox-i18n-42.0/bn-IN.xpi) = 5b91351ccdcf064eb22f8d3077573d94ed2005e434885535a6018532ca67dfba -SIZE (xpi/firefox-i18n-42.0/bn-IN.xpi) = 537276 -SHA256 (xpi/firefox-i18n-42.0/br.xpi) = 5372bf36dbad0f368c6e1926c8c9d6ca40136f25c7dd818d933ca5568f3a1e9f -SIZE (xpi/firefox-i18n-42.0/br.xpi) = 449190 -SHA256 (xpi/firefox-i18n-42.0/bs.xpi) = 78784ccf40c531ebecf58bedf96db046a9eed42062ca05c80c5ecc5d5dbb6f48 -SIZE (xpi/firefox-i18n-42.0/bs.xpi) = 488131 -SHA256 (xpi/firefox-i18n-42.0/ca.xpi) = f60be77d1edc340303d0580d6da07812e5b536223859226cb26adc4b837fa5e9 -SIZE (xpi/firefox-i18n-42.0/ca.xpi) = 465823 -SHA256 (xpi/firefox-i18n-42.0/cs.xpi) = ff4f81fbc34e17b6c742a20927a8dee0dc7cdf8743d6c5219f898ffd0d750ba6 -SIZE (xpi/firefox-i18n-42.0/cs.xpi) = 455106 -SHA256 (xpi/firefox-i18n-42.0/cy.xpi) = 3d01d9210c7bd2708f99add6299c089654030a8b47e87e9a6debb9d58ab2eeeb -SIZE (xpi/firefox-i18n-42.0/cy.xpi) = 451680 -SHA256 (xpi/firefox-i18n-42.0/da.xpi) = af056943a836fb36b8433e64e9b3003452280787ae155518559b1525d3566368 -SIZE (xpi/firefox-i18n-42.0/da.xpi) = 458413 -SHA256 (xpi/firefox-i18n-42.0/de.xpi) = 0301696932c69da60274dc19de58d50cc6a8beabb0387ad4d4526bdba1557790 -SIZE (xpi/firefox-i18n-42.0/de.xpi) = 460744 -SHA256 (xpi/firefox-i18n-42.0/dsb.xpi) = b6a5a998fad95e082b4c94b69c36680de7c5908efb85e222c4f9448f233458ee -SIZE (xpi/firefox-i18n-42.0/dsb.xpi) = 479637 -SHA256 (xpi/firefox-i18n-42.0/el.xpi) = 93479275cc21ce09597de19b841642120100ab00916f23ed9bfd71bb67cfd9b6 -SIZE (xpi/firefox-i18n-42.0/el.xpi) = 505735 -SHA256 (xpi/firefox-i18n-42.0/en-GB.xpi) = e282b2425bbbb60a3eebfa3e16cb6d747a72da505ee2a48378ee2d08dba6ab57 -SIZE (xpi/firefox-i18n-42.0/en-GB.xpi) = 443856 -SHA256 (xpi/firefox-i18n-42.0/en-US.xpi) = 9bf74eaccbe740c513be7e406f582907c578838b6d0f14e4c346689490517167 -SIZE (xpi/firefox-i18n-42.0/en-US.xpi) = 475844 -SHA256 (xpi/firefox-i18n-42.0/en-ZA.xpi) = 0ea29117a55aca8acab2df176790c1024510ac5db23b61ccccb14223fbd12b3d -SIZE (xpi/firefox-i18n-42.0/en-ZA.xpi) = 449903 -SHA256 (xpi/firefox-i18n-42.0/eo.xpi) = f4c24c83b2dd4ece852d4bba0ce902233408eaf45aed5185b9f462d737d6d527 -SIZE (xpi/firefox-i18n-42.0/eo.xpi) = 491605 -SHA256 (xpi/firefox-i18n-42.0/es-AR.xpi) = 92fc906a1957ca00d8bdfde61fcc59feb367338857b3f2740ac15ae6931c2127 -SIZE (xpi/firefox-i18n-42.0/es-AR.xpi) = 459408 -SHA256 (xpi/firefox-i18n-42.0/es-CL.xpi) = 776b59c03dbabda037e65902b1a87c6634beca0449cd9c35f300db64d88d5fc9 -SIZE (xpi/firefox-i18n-42.0/es-CL.xpi) = 386944 -SHA256 (xpi/firefox-i18n-42.0/es-ES.xpi) = 1abbe63ebcd37cf44ad6d60759916d81f272910b9edcda0e36ab16090ba2e629 -SIZE (xpi/firefox-i18n-42.0/es-ES.xpi) = 373753 -SHA256 (xpi/firefox-i18n-42.0/es-MX.xpi) = 041dcad0d1840f79ae1f4769796aa080c9834261ede4e55f55300411808b940b -SIZE (xpi/firefox-i18n-42.0/es-MX.xpi) = 465414 -SHA256 (xpi/firefox-i18n-42.0/et.xpi) = af4b17647e9e88652b352aa40b3aae87c254d025e8fd488c08b0f96d82176e07 -SIZE (xpi/firefox-i18n-42.0/et.xpi) = 450258 -SHA256 (xpi/firefox-i18n-42.0/eu.xpi) = cfe32d285ffe379aa7307d4de3fb639ffb961b1ebba857406f12cc15e7f61b64 -SIZE (xpi/firefox-i18n-42.0/eu.xpi) = 474713 -SHA256 (xpi/firefox-i18n-42.0/fa.xpi) = 5c0dbc5f709145ca93e89e0ad67c688821a3080476f5202c987d9d2b035800ce -SIZE (xpi/firefox-i18n-42.0/fa.xpi) = 526702 -SHA256 (xpi/firefox-i18n-42.0/ff.xpi) = d43f31eae539b6616f88e7dc0023eef4e4e64940ca4f625ab983fc52e7135321 -SIZE (xpi/firefox-i18n-42.0/ff.xpi) = 461016 -SHA256 (xpi/firefox-i18n-42.0/fi.xpi) = 6db03ffb84a02132ad852a9e6a223834ba00182ce34fab5e19b7c16dad6d2269 -SIZE (xpi/firefox-i18n-42.0/fi.xpi) = 452032 -SHA256 (xpi/firefox-i18n-42.0/fr.xpi) = 8eeec5d50b169f4102921941dfd43c8bb02f82e82c8f6a38a291c322914f17ce -SIZE (xpi/firefox-i18n-42.0/fr.xpi) = 470271 -SHA256 (xpi/firefox-i18n-42.0/fy-NL.xpi) = 2471d52f5bfeb516e7569b8fd0167109d46ec4c2fc774f8c93bca2809f3dc47f -SIZE (xpi/firefox-i18n-42.0/fy-NL.xpi) = 463484 -SHA256 (xpi/firefox-i18n-42.0/ga-IE.xpi) = fa5cda49e9284d9dae817132cdbfee504078e2140b4bfe18ead9089dce790f37 -SIZE (xpi/firefox-i18n-42.0/ga-IE.xpi) = 476090 -SHA256 (xpi/firefox-i18n-42.0/gd.xpi) = a41b6b5a51cd8dfab903a74086c26c8b6c2c05705d256b801f40530575e5d5a0 -SIZE (xpi/firefox-i18n-42.0/gd.xpi) = 462140 -SHA256 (xpi/firefox-i18n-42.0/gl.xpi) = fc16ccf790b551df573b9de347eeb36719fdb98af44f9afa4ebd2c67853e1587 -SIZE (xpi/firefox-i18n-42.0/gl.xpi) = 451687 -SHA256 (xpi/firefox-i18n-42.0/gu-IN.xpi) = 28e86b4cdbb7c1af4a00b7968a1c79005f594af9f44c4ff940686cecea8ea9cb -SIZE (xpi/firefox-i18n-42.0/gu-IN.xpi) = 492282 -SHA256 (xpi/firefox-i18n-42.0/he.xpi) = c86ff630372f014409b8ff97ba10eed5b267cb90f74fca5958c3d988c00f96ff -SIZE (xpi/firefox-i18n-42.0/he.xpi) = 481468 -SHA256 (xpi/firefox-i18n-42.0/hi-IN.xpi) = 4bf1ebfd071d5393b9cc8503732bbf5e6afd7534f7bf5b1e67a105cf8882a602 -SIZE (xpi/firefox-i18n-42.0/hi-IN.xpi) = 515516 -SHA256 (xpi/firefox-i18n-42.0/hr.xpi) = f60a9effb51f85d798528ef947c37dd40e9e11f4c7081371ef1a2c184d51fbd7 -SIZE (xpi/firefox-i18n-42.0/hr.xpi) = 486308 -SHA256 (xpi/firefox-i18n-42.0/hsb.xpi) = ba43533196c1de882708e3f2c5f33508bdbedbf3987a060e51891b3cbdfdb5df -SIZE (xpi/firefox-i18n-42.0/hsb.xpi) = 477291 -SHA256 (xpi/firefox-i18n-42.0/hu.xpi) = d6e158f3b5c4fe9745feed9be76276898c4d06a34c6af41e9d6f7d9574c1cb02 -SIZE (xpi/firefox-i18n-42.0/hu.xpi) = 461934 -SHA256 (xpi/firefox-i18n-42.0/hy-AM.xpi) = 20d38d82634a0f7fac0aba10cd33def9bd07860343f50b51b977e9ba9d4298e0 -SIZE (xpi/firefox-i18n-42.0/hy-AM.xpi) = 544379 -SHA256 (xpi/firefox-i18n-42.0/id.xpi) = a9b186a33c58dc26eacfd23b77eb3fb07a4169a65043ae6454f53a3076c8f361 -SIZE (xpi/firefox-i18n-42.0/id.xpi) = 438845 -SHA256 (xpi/firefox-i18n-42.0/is.xpi) = 36d483f995a23672548076cf493bb5d74067194e45357fcdaa8ccf89f081e54e -SIZE (xpi/firefox-i18n-42.0/is.xpi) = 493033 -SHA256 (xpi/firefox-i18n-42.0/it.xpi) = 12f52bcd404059126fd5291e185e152b65a22cc80562c736cf441088ea7e8659 -SIZE (xpi/firefox-i18n-42.0/it.xpi) = 367659 -SHA256 (xpi/firefox-i18n-42.0/ja.xpi) = 836403f5c69d4ce9304d123de794acfb297870b5dea084c8c5dc1f2d2fa88ba8 -SIZE (xpi/firefox-i18n-42.0/ja.xpi) = 488656 -SHA256 (xpi/firefox-i18n-42.0/kk.xpi) = c956039afb31cdbc87177e9da7604dea5f396971cc005ba2b2f39bcccd07f0c9 -SIZE (xpi/firefox-i18n-42.0/kk.xpi) = 513387 -SHA256 (xpi/firefox-i18n-42.0/km.xpi) = 831517e7a4526a8fe66bed319f07f3043a2b59d8f335e087468be241ee73d055 -SIZE (xpi/firefox-i18n-42.0/km.xpi) = 578547 -SHA256 (xpi/firefox-i18n-42.0/kn.xpi) = 85f1b02e7dad0eff2df2d42f0f48ac7c87ee4ae3074304a07dbf72826de3fff5 -SIZE (xpi/firefox-i18n-42.0/kn.xpi) = 544136 -SHA256 (xpi/firefox-i18n-42.0/ko.xpi) = 5ba6764e73adbd14eea69b6fdef7bed1302ae79a3fbefc84a99846f6c8424277 -SIZE (xpi/firefox-i18n-42.0/ko.xpi) = 474547 -SHA256 (xpi/firefox-i18n-42.0/lij.xpi) = 7b926543d7ba6e3ba3bcd62846715f88ba2b08ccb069174e1c93817c4ed30270 -SIZE (xpi/firefox-i18n-42.0/lij.xpi) = 456396 -SHA256 (xpi/firefox-i18n-42.0/lt.xpi) = 9cea89aec036c26dbb25ac560045ea31014bfdc799735894439ef081c84e724d -SIZE (xpi/firefox-i18n-42.0/lt.xpi) = 495227 -SHA256 (xpi/firefox-i18n-42.0/lv.xpi) = dead267a4f72a36ce73119f9d37cd62ee8c9aca800886c744ce3a7b871d232b5 -SIZE (xpi/firefox-i18n-42.0/lv.xpi) = 475294 -SHA256 (xpi/firefox-i18n-42.0/mai.xpi) = 8fc086207679c75f6d4165d4a12333871078e60aa0476249409fcf3ac05ed284 -SIZE (xpi/firefox-i18n-42.0/mai.xpi) = 523801 -SHA256 (xpi/firefox-i18n-42.0/mk.xpi) = 5dabd571b25070ba83b7bc539a150714001339e7a986df8b364424b1312109d1 -SIZE (xpi/firefox-i18n-42.0/mk.xpi) = 535199 -SHA256 (xpi/firefox-i18n-42.0/ml.xpi) = 7345b33597ecad8e9306f5f483b872d4d62c86561b3bfd7eb514853f67f9a86a -SIZE (xpi/firefox-i18n-42.0/ml.xpi) = 533776 -SHA256 (xpi/firefox-i18n-42.0/mr.xpi) = 734a252d6a87a468568ac8ebdf9cf2e2ddb692997b67890ba846001cbacfe1f8 -SIZE (xpi/firefox-i18n-42.0/mr.xpi) = 522304 -SHA256 (xpi/firefox-i18n-42.0/ms.xpi) = cf16f7c807915297a132ad8d71fe20012c54eb82f8153f66b954b71a143cccc7 -SIZE (xpi/firefox-i18n-42.0/ms.xpi) = 497644 -SHA256 (xpi/firefox-i18n-42.0/nb-NO.xpi) = f18376647b559b56b94dd54a92c4589dd4313e18870f7c5ccde520ab5baaaac2 -SIZE (xpi/firefox-i18n-42.0/nb-NO.xpi) = 453245 -SHA256 (xpi/firefox-i18n-42.0/nl.xpi) = a2470132d8b8a80b71471527a4c2468e7cd9e2440e1666950c591e09f78138bd -SIZE (xpi/firefox-i18n-42.0/nl.xpi) = 451272 -SHA256 (xpi/firefox-i18n-42.0/nn-NO.xpi) = 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27 -SIZE (xpi/firefox-i18n-42.0/nn-NO.xpi) = 447406 -SHA256 (xpi/firefox-i18n-42.0/or.xpi) = c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329 -SIZE (xpi/firefox-i18n-42.0/or.xpi) = 533314 -SHA256 (xpi/firefox-i18n-42.0/pa-IN.xpi) = af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a -SIZE (xpi/firefox-i18n-42.0/pa-IN.xpi) = 507205 -SHA256 (xpi/firefox-i18n-42.0/pl.xpi) = 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2 -SIZE (xpi/firefox-i18n-42.0/pl.xpi) = 403227 -SHA256 (xpi/firefox-i18n-42.0/pt-BR.xpi) = b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf -SIZE (xpi/firefox-i18n-42.0/pt-BR.xpi) = 468096 -SHA256 (xpi/firefox-i18n-42.0/pt-PT.xpi) = 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687 -SIZE (xpi/firefox-i18n-42.0/pt-PT.xpi) = 448920 -SHA256 (xpi/firefox-i18n-42.0/rm.xpi) = d5ab15132c13db755ec05efbf255a53ae4411d2724ecc5ecc5bda08c4eef5681 -SIZE (xpi/firefox-i18n-42.0/rm.xpi) = 454529 -SHA256 (xpi/firefox-i18n-42.0/ro.xpi) = d62cff13bc6ae437f1a224ad2e11e8d4de338f8b6b3e405baa1d8c0764b7edef -SIZE (xpi/firefox-i18n-42.0/ro.xpi) = 502634 -SHA256 (xpi/firefox-i18n-42.0/ru.xpi) = ac454a85ea58c5a3297550fe7a10eef8487f37bb0310df4a5a9fb533d7c1c712 -SIZE (xpi/firefox-i18n-42.0/ru.xpi) = 416137 -SHA256 (xpi/firefox-i18n-42.0/si.xpi) = 763543a1f7433309be01d89e30436b7bff4fcd2b50e8f496f54be26f0c730688 -SIZE (xpi/firefox-i18n-42.0/si.xpi) = 543889 -SHA256 (xpi/firefox-i18n-42.0/sk.xpi) = beb7004124240fd83f64841ff415cb692aab327b5ac925e6db27e4b9ba7f01ca -SIZE (xpi/firefox-i18n-42.0/sk.xpi) = 477255 -SHA256 (xpi/firefox-i18n-42.0/sl.xpi) = 0079e2ca640efe4d2c7dd29a570634cc5072f632bf064149bf9b9d8f3aa518d8 -SIZE (xpi/firefox-i18n-42.0/sl.xpi) = 450532 -SHA256 (xpi/firefox-i18n-42.0/son.xpi) = 811356dfb2552f5c2d2832b7a208233e27eeab1e064d694cf36532ddcbfc458d -SIZE (xpi/firefox-i18n-42.0/son.xpi) = 457298 -SHA256 (xpi/firefox-i18n-42.0/sq.xpi) = fabeef51543439772b6ef5643d0ac57ec196d64c6ef83e75ddcd275dc6624a81 -SIZE (xpi/firefox-i18n-42.0/sq.xpi) = 494612 -SHA256 (xpi/firefox-i18n-42.0/sr.xpi) = 692019f3542e0da8ff64589b488eab0d7e6d16906655d5a86ebcc53c00731edc -SIZE (xpi/firefox-i18n-42.0/sr.xpi) = 486210 -SHA256 (xpi/firefox-i18n-42.0/sv-SE.xpi) = 6e7e0eff3c480a302fa0ed1a4ed720ac432f0819c55549afc6bda028ea1b23a5 -SIZE (xpi/firefox-i18n-42.0/sv-SE.xpi) = 460188 -SHA256 (xpi/firefox-i18n-42.0/ta.xpi) = 542761640fbe8dd6cf3e60be45a12735bbfe6c38c96b0073833544c85c5cf10a -SIZE (xpi/firefox-i18n-42.0/ta.xpi) = 515601 -SHA256 (xpi/firefox-i18n-42.0/te.xpi) = 7287fc6577b0892df46ea1fc2f185fc73ad94c4d8050cdd3a4be47150f1f7a2e -SIZE (xpi/firefox-i18n-42.0/te.xpi) = 532920 -SHA256 (xpi/firefox-i18n-42.0/th.xpi) = f254f7c40a194ae3c082d9b77f155fc290b0e6abe969d7c06788ea7abe4039ad -SIZE (xpi/firefox-i18n-42.0/th.xpi) = 542239 -SHA256 (xpi/firefox-i18n-42.0/tr.xpi) = f343c4f3b2cb5541fc9f98d5953101f5e5d1ee1d5c30968d6564828c5701119b -SIZE (xpi/firefox-i18n-42.0/tr.xpi) = 489512 -SHA256 (xpi/firefox-i18n-42.0/uk.xpi) = 88c881749bae293d9614a77ed9458345399573a6ab5583626ef98041ae78da32 -SIZE (xpi/firefox-i18n-42.0/uk.xpi) = 505718 -SHA256 (xpi/firefox-i18n-42.0/uz.xpi) = faeacd2ec9af20cde5032415f0bbeba487ed4d276f778672ae6a340615099725 -SIZE (xpi/firefox-i18n-42.0/uz.xpi) = 505180 -SHA256 (xpi/firefox-i18n-42.0/vi.xpi) = 1481521a62561266ea14389cdb579b1757e791a5473c981e399aa9bff14ddcdd -SIZE (xpi/firefox-i18n-42.0/vi.xpi) = 472290 -SHA256 (xpi/firefox-i18n-42.0/xh.xpi) = 1a1776e5770dd361d0adc85ed80bb1e81dd5436a0727009b91cb89e92e4d381e -SIZE (xpi/firefox-i18n-42.0/xh.xpi) = 455527 -SHA256 (xpi/firefox-i18n-42.0/zh-CN.xpi) = 46bb4b1b67494004441135dbf3051501e0580fb8da29548de73f2e0fe12f7834 -SIZE (xpi/firefox-i18n-42.0/zh-CN.xpi) = 491278 -SHA256 (xpi/firefox-i18n-42.0/zh-TW.xpi) = ef4e9b5e01b85564b935a5f9bc663ffac61ce0f3ca166c316b1aee648832d458 -SIZE (xpi/firefox-i18n-42.0/zh-TW.xpi) = 482387 +SHA256 (xpi/firefox-i18n-43.0.1/ach.xpi) = 0bc91ee7b43096b5464be7433602ee56c4eda1792531a28dd071c378a71892fb +SIZE (xpi/firefox-i18n-43.0.1/ach.xpi) = 486758 +SHA256 (xpi/firefox-i18n-43.0.1/af.xpi) = 2201ef901b678e787e0ba8c911975e9d54af613ef3a9f2b3ce51475b68f362af +SIZE (xpi/firefox-i18n-43.0.1/af.xpi) = 493735 +SHA256 (xpi/firefox-i18n-43.0.1/an.xpi) = 8d1a70ac9ef5fb29e6904b5931602e5a91c1496b1842dcf0a4f27db1582c9e89 +SIZE (xpi/firefox-i18n-43.0.1/an.xpi) = 472422 +SHA256 (xpi/firefox-i18n-43.0.1/ar.xpi) = c19d31e37d0b5c934a58bff60c70074ad98d5efab43cf3682ba7c20137cf7c9f +SIZE (xpi/firefox-i18n-43.0.1/ar.xpi) = 531445 +SHA256 (xpi/firefox-i18n-43.0.1/as.xpi) = 0665629107ba40ef2e038cef1c2178a371edbff7fe5bd23ad573591f00920f6e +SIZE (xpi/firefox-i18n-43.0.1/as.xpi) = 520380 +SHA256 (xpi/firefox-i18n-43.0.1/ast.xpi) = e034f807e6be2ad88a7185f0810482b70b9bfe847985525201578b0266ea22ca +SIZE (xpi/firefox-i18n-43.0.1/ast.xpi) = 414848 +SHA256 (xpi/firefox-i18n-43.0.1/az.xpi) = 76a247cd2bdfbadcf8842b300c1a72b52ac6b0a32d1f6448608c0305892f067a +SIZE (xpi/firefox-i18n-43.0.1/az.xpi) = 501044 +SHA256 (xpi/firefox-i18n-43.0.1/be.xpi) = 933720d18b0284c6502cc46b9b9a2d745d52554ec8dd6f56b1f736ff960ee719 +SIZE (xpi/firefox-i18n-43.0.1/be.xpi) = 462186 +SHA256 (xpi/firefox-i18n-43.0.1/bg.xpi) = 287e00cf6a2e9f31c52c3a2b45fb9b7fec78778c6578cbadc0863df129b2d41a +SIZE (xpi/firefox-i18n-43.0.1/bg.xpi) = 503615 +SHA256 (xpi/firefox-i18n-43.0.1/bn-BD.xpi) = 7da5c54c4a5c9836d5fc2b667f26b7010875772ebfb45c271ab601d1fd056d61 +SIZE (xpi/firefox-i18n-43.0.1/bn-BD.xpi) = 550339 +SHA256 (xpi/firefox-i18n-43.0.1/bn-IN.xpi) = 97b5e214358950cbe2fa84730a0d20803d8be0a5b50ebcd2375f620e5ae94739 +SIZE (xpi/firefox-i18n-43.0.1/bn-IN.xpi) = 541700 +SHA256 (xpi/firefox-i18n-43.0.1/br.xpi) = 79f0b81f27e1185f0b2d7c3f05919bad39a680e8f5c036235f95e8a253a7ff11 +SIZE (xpi/firefox-i18n-43.0.1/br.xpi) = 452046 +SHA256 (xpi/firefox-i18n-43.0.1/bs.xpi) = 5ef0354b7a2eacef71720ff18821bcf2a4551aac4041dc58e438393f3fd84e75 +SIZE (xpi/firefox-i18n-43.0.1/bs.xpi) = 491002 +SHA256 (xpi/firefox-i18n-43.0.1/ca.xpi) = 06d63af42adff1b885d1e00fa199fbdeeb5b9a7e8625202b46ca109583fe53f9 +SIZE (xpi/firefox-i18n-43.0.1/ca.xpi) = 469149 +SHA256 (xpi/firefox-i18n-43.0.1/cs.xpi) = 8ef921e6fee1a164f09408791eb80ad5f617b47a80c91f6013443d883bbf256c +SIZE (xpi/firefox-i18n-43.0.1/cs.xpi) = 458384 +SHA256 (xpi/firefox-i18n-43.0.1/cy.xpi) = 834ccdbb97e69f6abe1bf449ae2addb33adc4c1d9bdda3aa26d1827e29c82831 +SIZE (xpi/firefox-i18n-43.0.1/cy.xpi) = 454625 +SHA256 (xpi/firefox-i18n-43.0.1/da.xpi) = 0f684c6e38075111a620096739fa9c67e27d6b7a0e3ab2939f2923683e309e04 +SIZE (xpi/firefox-i18n-43.0.1/da.xpi) = 462528 +SHA256 (xpi/firefox-i18n-43.0.1/de.xpi) = 6167c119b0274ae3ce837cabe7c29d75e30f99caf9cf028fbe223db8714b8e3c +SIZE (xpi/firefox-i18n-43.0.1/de.xpi) = 463840 +SHA256 (xpi/firefox-i18n-43.0.1/dsb.xpi) = 757471503d2c88b823846126308af511ee324a404a70f17a1165a50ca697660e +SIZE (xpi/firefox-i18n-43.0.1/dsb.xpi) = 482634 +SHA256 (xpi/firefox-i18n-43.0.1/el.xpi) = 2399e6114e7d8c6510af6628b2a323c46b9d1f88e3275e48a1b71b2b08a915f0 +SIZE (xpi/firefox-i18n-43.0.1/el.xpi) = 508364 +SHA256 (xpi/firefox-i18n-43.0.1/en-GB.xpi) = 37da8df3d067018386237c3fd6a9fdc898efadf804d6b971d62b88e169a1c0ef +SIZE (xpi/firefox-i18n-43.0.1/en-GB.xpi) = 448389 +SHA256 (xpi/firefox-i18n-43.0.1/en-US.xpi) = 65e194d30544cec4871e82080755afa7dbb41cb2603672e6a76cb1fef8abdff7 +SIZE (xpi/firefox-i18n-43.0.1/en-US.xpi) = 500719 +SHA256 (xpi/firefox-i18n-43.0.1/en-ZA.xpi) = 2adf4eaef132bfa6c3ee868cac1ef5733a90cc2f3d810293a6f4ecec51f369d6 +SIZE (xpi/firefox-i18n-43.0.1/en-ZA.xpi) = 453306 +SHA256 (xpi/firefox-i18n-43.0.1/eo.xpi) = 70eab0eba9a878aa30b77a43d76a2a39fbd81a49c54957353f903e8e7a530454 +SIZE (xpi/firefox-i18n-43.0.1/eo.xpi) = 494360 +SHA256 (xpi/firefox-i18n-43.0.1/es-AR.xpi) = 087bde7d635fe0b34a80343daeaf3560e0eabc84e0e151cd3e1ad5238d0a31b3 +SIZE (xpi/firefox-i18n-43.0.1/es-AR.xpi) = 462418 +SHA256 (xpi/firefox-i18n-43.0.1/es-CL.xpi) = 50ca3669cf24ef0a130d2cca348b8e50adea3981ed84f2d5a29f3a839aab957a +SIZE (xpi/firefox-i18n-43.0.1/es-CL.xpi) = 388434 +SHA256 (xpi/firefox-i18n-43.0.1/es-ES.xpi) = 1e19eaa893bdd1c3f2b2b826ef5b7b3b437efd6f35a6878467d029c16cb3a022 +SIZE (xpi/firefox-i18n-43.0.1/es-ES.xpi) = 375333 +SHA256 (xpi/firefox-i18n-43.0.1/es-MX.xpi) = 062136d7651fa993f1183b80310e474cc17c7f65fa085a2358db787e819e9cad +SIZE (xpi/firefox-i18n-43.0.1/es-MX.xpi) = 468294 +SHA256 (xpi/firefox-i18n-43.0.1/et.xpi) = 00c2c023bccd5f6af7fd4563282789990714b45a66e28f4a576f70c448e9c9f3 +SIZE (xpi/firefox-i18n-43.0.1/et.xpi) = 455409 +SHA256 (xpi/firefox-i18n-43.0.1/eu.xpi) = 7136556411350f14b9b842b30912beae55997a43f8a693f2709d0a7ce4bbf249 +SIZE (xpi/firefox-i18n-43.0.1/eu.xpi) = 477496 +SHA256 (xpi/firefox-i18n-43.0.1/fa.xpi) = 47b586b814ec2a7bf757f90483b2c058f3898fd32d5e23dc63e77ba7e95f8bf1 +SIZE (xpi/firefox-i18n-43.0.1/fa.xpi) = 529698 +SHA256 (xpi/firefox-i18n-43.0.1/ff.xpi) = 5063b9ed95e285d7f7c0443125e276a9ab37b225f3f18b360fb20fd632ebe5ee +SIZE (xpi/firefox-i18n-43.0.1/ff.xpi) = 465024 +SHA256 (xpi/firefox-i18n-43.0.1/fi.xpi) = 95662d7f686a3fcd0ee33354f2164dd980cb77145825a82c3373e0a5c136add9 +SIZE (xpi/firefox-i18n-43.0.1/fi.xpi) = 454718 +SHA256 (xpi/firefox-i18n-43.0.1/fr.xpi) = a6bc8f2b8089661871feea30eca73a52d26e70a8e3420c3a6e51a9ba8b44e59c +SIZE (xpi/firefox-i18n-43.0.1/fr.xpi) = 473568 +SHA256 (xpi/firefox-i18n-43.0.1/fy-NL.xpi) = e51e397bedee90d1baad9c1a00d8c402becf09f1472d106bf6f550421acbb673 +SIZE (xpi/firefox-i18n-43.0.1/fy-NL.xpi) = 466648 +SHA256 (xpi/firefox-i18n-43.0.1/ga-IE.xpi) = 45147b40e2df9e0681a792f29a458ffdced48a1aac0ff509fcd9c9f7d2337ccb +SIZE (xpi/firefox-i18n-43.0.1/ga-IE.xpi) = 478966 +SHA256 (xpi/firefox-i18n-43.0.1/gd.xpi) = 728e66d24f28df817ac6fcdec287910ccc1bd3e782860585a4b9f01809823628 +SIZE (xpi/firefox-i18n-43.0.1/gd.xpi) = 464868 +SHA256 (xpi/firefox-i18n-43.0.1/gl.xpi) = bd57e80913a03c3fc00cba9a4a43b2ef6b45a74e92fe487cde4e5aaeb5966f12 +SIZE (xpi/firefox-i18n-43.0.1/gl.xpi) = 454573 +SHA256 (xpi/firefox-i18n-43.0.1/gu-IN.xpi) = 239f5415f8a98b1690f4fa625da5f254ec13741b93d0d271f63a536ee85fe988 +SIZE (xpi/firefox-i18n-43.0.1/gu-IN.xpi) = 495781 +SHA256 (xpi/firefox-i18n-43.0.1/he.xpi) = 1d2e30088e2a7dc39cef292e406f01f64cd0d5fb962fadb1dbcd76fb880d86f8 +SIZE (xpi/firefox-i18n-43.0.1/he.xpi) = 484111 +SHA256 (xpi/firefox-i18n-43.0.1/hi-IN.xpi) = 3f078cfdd0c4cd546b5c131a8c3e3dca2c791dad673b1636b7388921a8121eb4 +SIZE (xpi/firefox-i18n-43.0.1/hi-IN.xpi) = 519473 +SHA256 (xpi/firefox-i18n-43.0.1/hr.xpi) = 71ed3c23ed4fc0406bb3e6a35bf40419612a9c92a84e5da89ea19209d63c928d +SIZE (xpi/firefox-i18n-43.0.1/hr.xpi) = 489139 +SHA256 (xpi/firefox-i18n-43.0.1/hsb.xpi) = 2848deb917fb68739f343516898d92da318cedcf55f67ee79f7ee55d3952238e +SIZE (xpi/firefox-i18n-43.0.1/hsb.xpi) = 480278 +SHA256 (xpi/firefox-i18n-43.0.1/hu.xpi) = 801e37925ea212681f2c936487bf5e9a47116ec66d2e5b181b04abaa632fc984 +SIZE (xpi/firefox-i18n-43.0.1/hu.xpi) = 464706 +SHA256 (xpi/firefox-i18n-43.0.1/hy-AM.xpi) = 8f8c5e2b1cf96f8161d636f396fa3bd8f26be40a465ff3cf8982b11c56d11238 +SIZE (xpi/firefox-i18n-43.0.1/hy-AM.xpi) = 548747 +SHA256 (xpi/firefox-i18n-43.0.1/id.xpi) = 639a94028c05ec4a98a79ca40d37ddef23604b9f5bb1ef4db0790b42caf35632 +SIZE (xpi/firefox-i18n-43.0.1/id.xpi) = 443809 +SHA256 (xpi/firefox-i18n-43.0.1/is.xpi) = 513b9a3f1102f6fda79e56c60c654a74bd5279497ccb0322fcfe441c1a0e01c1 +SIZE (xpi/firefox-i18n-43.0.1/is.xpi) = 495909 +SHA256 (xpi/firefox-i18n-43.0.1/it.xpi) = e6c9dbb3d033b60ce8b59caf7789a0731ab2a0474e4719fa97c4667c4c713b22 +SIZE (xpi/firefox-i18n-43.0.1/it.xpi) = 369329 +SHA256 (xpi/firefox-i18n-43.0.1/ja.xpi) = ce2057dacd531266aa67e9cce52ac596485f8b8877aa67e6665c9af6d8f6a7ee +SIZE (xpi/firefox-i18n-43.0.1/ja.xpi) = 491472 +SHA256 (xpi/firefox-i18n-43.0.1/kk.xpi) = cb3b96f10de74db89c9226a5fac0c3f98c1a793adaca778adacf6e38b86ee15e +SIZE (xpi/firefox-i18n-43.0.1/kk.xpi) = 516825 +SHA256 (xpi/firefox-i18n-43.0.1/km.xpi) = 94da44d6aae5f7e59a203f0f2a26c46048d8914eb23141e0955601f2bf30ddb7 +SIZE (xpi/firefox-i18n-43.0.1/km.xpi) = 581657 +SHA256 (xpi/firefox-i18n-43.0.1/kn.xpi) = 102bb7743a7754dcd52a34f060dab4c7e56b943bea0080887a4c752f31a4cbef +SIZE (xpi/firefox-i18n-43.0.1/kn.xpi) = 548586 +SHA256 (xpi/firefox-i18n-43.0.1/ko.xpi) = 2d5cb122f2e880628b741cea86c0c549708d0c33c4539b1007ee83574f97d3cc +SIZE (xpi/firefox-i18n-43.0.1/ko.xpi) = 477482 +SHA256 (xpi/firefox-i18n-43.0.1/lij.xpi) = 7d4eb50ef0086a5b7ccb4654a581b4c29a55448f05778a0af10afcddd88f520d +SIZE (xpi/firefox-i18n-43.0.1/lij.xpi) = 403511 +SHA256 (xpi/firefox-i18n-43.0.1/lt.xpi) = 44306a6e3d72c48bfc7e325afb00d001acaf2cfdadcbfdad2d3de24ae1f1f4d3 +SIZE (xpi/firefox-i18n-43.0.1/lt.xpi) = 498173 +SHA256 (xpi/firefox-i18n-43.0.1/lv.xpi) = eb77909a47839fb8572bc535330aa3753613bc7c80a8db08bf305debd4a1883b +SIZE (xpi/firefox-i18n-43.0.1/lv.xpi) = 478097 +SHA256 (xpi/firefox-i18n-43.0.1/mai.xpi) = 7d8421d82cc58988827b65d252cf0131cf6b56ddd558a6e0dd15175832114764 +SIZE (xpi/firefox-i18n-43.0.1/mai.xpi) = 527786 +SHA256 (xpi/firefox-i18n-43.0.1/mk.xpi) = 8b02aa5f64157a3fe05bcfd54047067aedba336f7bbf7971167526a00da94cc2 +SIZE (xpi/firefox-i18n-43.0.1/mk.xpi) = 537952 +SHA256 (xpi/firefox-i18n-43.0.1/ml.xpi) = 9af1f75ce059da56c98a0b1553c158fbecf765bcba31c9102017f7622d9052a8 +SIZE (xpi/firefox-i18n-43.0.1/ml.xpi) = 537548 +SHA256 (xpi/firefox-i18n-43.0.1/mr.xpi) = 110128c1c545b430424cdad5861ab6e68be754b48b604dd2865652fa325732d8 +SIZE (xpi/firefox-i18n-43.0.1/mr.xpi) = 527027 +SHA256 (xpi/firefox-i18n-43.0.1/ms.xpi) = 11a6721bc259d31221e503234b9e11688849a83bb0df0359e4960c30c73e451c +SIZE (xpi/firefox-i18n-43.0.1/ms.xpi) = 502123 +SHA256 (xpi/firefox-i18n-43.0.1/nb-NO.xpi) = 403de48e800f4d41231dc47e47a425d8068f8d66aac082aa4707d794cf8b2f21 +SIZE (xpi/firefox-i18n-43.0.1/nb-NO.xpi) = 456065 +SHA256 (xpi/firefox-i18n-43.0.1/nl.xpi) = 05244c64999026a6d1fc66978553835f85e21e0ebf7f88bb7f9726fab080be87 +SIZE (xpi/firefox-i18n-43.0.1/nl.xpi) = 454468 +SHA256 (xpi/firefox-i18n-43.0.1/nn-NO.xpi) = e720918d8c65bca8f89131ce4236f94f2b135e785940a449891d0ee91d726237 +SIZE (xpi/firefox-i18n-43.0.1/nn-NO.xpi) = 450234 +SHA256 (xpi/firefox-i18n-43.0.1/or.xpi) = f2eeb085741f36d4ca81f552de4adc76a3e4d61e4e728f955b59ffa83114ba60 +SIZE (xpi/firefox-i18n-43.0.1/or.xpi) = 536915 +SHA256 (xpi/firefox-i18n-43.0.1/pa-IN.xpi) = 6dac3af3fde5a299402d92cb307fabc6f231dbbc55adc6b18d42642a98142749 +SIZE (xpi/firefox-i18n-43.0.1/pa-IN.xpi) = 511160 +SHA256 (xpi/firefox-i18n-43.0.1/pl.xpi) = 0b37430cc49c8e2fc1cb155c865ba58ddf36da8fe795b13ffc6ba3f69f9c41ab +SIZE (xpi/firefox-i18n-43.0.1/pl.xpi) = 404460 +SHA256 (xpi/firefox-i18n-43.0.1/pt-BR.xpi) = 5ce088a6e2d47baee81d82fe35d6bd70220c6db3369823688da197f88476def5 +SIZE (xpi/firefox-i18n-43.0.1/pt-BR.xpi) = 473005 +SHA256 (xpi/firefox-i18n-43.0.1/pt-PT.xpi) = 5d814b2b74eee74aacea4762198b023d68d053b970f6915e63ff3e9e5c21ed92 +SIZE (xpi/firefox-i18n-43.0.1/pt-PT.xpi) = 451858 +SHA256 (xpi/firefox-i18n-43.0.1/rm.xpi) = c15a606cbed0665a39b139d9fbf898ae14c6122d5cabede166596d702df0943d +SIZE (xpi/firefox-i18n-43.0.1/rm.xpi) = 457315 +SHA256 (xpi/firefox-i18n-43.0.1/ro.xpi) = 5122609b34eeee2bf3c7319874a0dece164eb7c6c010d70ebfaa30dc63823633 +SIZE (xpi/firefox-i18n-43.0.1/ro.xpi) = 505833 +SHA256 (xpi/firefox-i18n-43.0.1/ru.xpi) = 99de1c972f3018896421c171c0dbc266d04f923b8a5510ef52145f4464fbd276 +SIZE (xpi/firefox-i18n-43.0.1/ru.xpi) = 417904 +SHA256 (xpi/firefox-i18n-43.0.1/si.xpi) = 0e20ef5b83bd71ff4ea954266d2815def7018c15f827eb67faa004bc3cbaf646 +SIZE (xpi/firefox-i18n-43.0.1/si.xpi) = 548393 +SHA256 (xpi/firefox-i18n-43.0.1/sk.xpi) = aa553f5359d74ca650f2df84e0e6fef6eaff37a6486a12e04c71ad84a455e2d6 +SIZE (xpi/firefox-i18n-43.0.1/sk.xpi) = 480519 +SHA256 (xpi/firefox-i18n-43.0.1/sl.xpi) = dd784a712282453889e36442dca10b5d5b96b36ed9774e4914fce5e87ebc14e9 +SIZE (xpi/firefox-i18n-43.0.1/sl.xpi) = 453338 +SHA256 (xpi/firefox-i18n-43.0.1/son.xpi) = bbf9fba2bba5cfb022cac1697dfbc287eeebc23e222991c29268138e051c2625 +SIZE (xpi/firefox-i18n-43.0.1/son.xpi) = 462151 +SHA256 (xpi/firefox-i18n-43.0.1/sq.xpi) = 97fd1266c586533de47dc18218b67668713cf0a4651f1d2760de86a0316688fc +SIZE (xpi/firefox-i18n-43.0.1/sq.xpi) = 497506 +SHA256 (xpi/firefox-i18n-43.0.1/sr.xpi) = f15c54379fdbe92201184323d23b874e8f6ebc809fcaff6777d480a80eaa18b1 +SIZE (xpi/firefox-i18n-43.0.1/sr.xpi) = 489348 +SHA256 (xpi/firefox-i18n-43.0.1/sv-SE.xpi) = 73021ec80fdaf07f4a69d0d7763013e9eef8be24cc42b4b028bf05a2f16fa3eb +SIZE (xpi/firefox-i18n-43.0.1/sv-SE.xpi) = 463026 +SHA256 (xpi/firefox-i18n-43.0.1/ta.xpi) = adafa9645f4f9142eb9de9d5979779f449916d6e4a7f66f69dda90a17ec8966d +SIZE (xpi/firefox-i18n-43.0.1/ta.xpi) = 519590 +SHA256 (xpi/firefox-i18n-43.0.1/te.xpi) = e1b5e68282f0473794df03a7c7db5c75ffcbd3d8eece1d177a8416d0654982a2 +SIZE (xpi/firefox-i18n-43.0.1/te.xpi) = 537274 +SHA256 (xpi/firefox-i18n-43.0.1/th.xpi) = 5844e3090137a832ddfab289450cab560211322a0af96dd8f7d9343e7154eeb1 +SIZE (xpi/firefox-i18n-43.0.1/th.xpi) = 546510 +SHA256 (xpi/firefox-i18n-43.0.1/tr.xpi) = 306aafaec0cb1a35c86696504a249a4a8609013b98709293d42a775850178de2 +SIZE (xpi/firefox-i18n-43.0.1/tr.xpi) = 492360 +SHA256 (xpi/firefox-i18n-43.0.1/uk.xpi) = c7dbe7a5a4c574e0a75791e2764b26271fc16d12db5f70eb12d30a1d74c56e98 +SIZE (xpi/firefox-i18n-43.0.1/uk.xpi) = 508886 +SHA256 (xpi/firefox-i18n-43.0.1/uz.xpi) = fb248e58ef958f6224deefcc45781f0cda971f3e8d7ddb120da76bc9ef8e9cf4 +SIZE (xpi/firefox-i18n-43.0.1/uz.xpi) = 510089 +SHA256 (xpi/firefox-i18n-43.0.1/vi.xpi) = 2c0db4ad703316e57be639c4011d2ec7dcdcf03e2a2819e69077a8a020f70171 +SIZE (xpi/firefox-i18n-43.0.1/vi.xpi) = 476613 +SHA256 (xpi/firefox-i18n-43.0.1/xh.xpi) = 46c4116c97abf9efd29022b3881eddad4768c084905b559637e24c2ba26c8b93 +SIZE (xpi/firefox-i18n-43.0.1/xh.xpi) = 458721 +SHA256 (xpi/firefox-i18n-43.0.1/zh-CN.xpi) = ddc7b79f99742fd8ea23b9aa5bbd47e3f7e82a41ad141e4a34e3fe784912a934 +SIZE (xpi/firefox-i18n-43.0.1/zh-CN.xpi) = 493641 +SHA256 (xpi/firefox-i18n-43.0.1/zh-TW.xpi) = 4a35399a932e05e0f8469c8f25732b37ec7f56319d2d0169acd6f47809590af2 +SIZE (xpi/firefox-i18n-43.0.1/zh-TW.xpi) = 485318 Index: branches/2015Q4/www/linux-firefox/Makefile =================================================================== --- branches/2015Q4/www/linux-firefox/Makefile (revision 404094) +++ branches/2015Q4/www/linux-firefox/Makefile (revision 404095) @@ -1,22 +1,22 @@ # Created by: voisine # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 42.0 +DISTVERSION= 43.0.1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/linux-i686/en-US + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla USES= tar:bzip2 WANT_GTK218= yes PREFS_FILE= ${WRKSRC}/${APP_SUBDIR}defaults/preferences/browser-prefs.js APP_SUBDIR= browser/ # plugins, extensions .include "${.CURDIR}/../linux-seamonkey/Makefile.common" .include Index: branches/2015Q4/www/linux-firefox/distinfo =================================================================== --- branches/2015Q4/www/linux-firefox/distinfo (revision 404094) +++ branches/2015Q4/www/linux-firefox/distinfo (revision 404095) @@ -1,6 +1,6 @@ -SHA256 (firefox-42.0.tar.bz2) = 2c44f8ef07896f3e4c4ee555e35ebe5658f2721fdbdee4c70b153387472b781e -SIZE (firefox-42.0.tar.bz2) = 50938529 +SHA256 (firefox-43.0.1.tar.bz2) = a8530e2b5d5c16c1afef6759a9015e83767271046537a050442fd6c457986746 +SIZE (firefox-43.0.1.tar.bz2) = 53521330 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: branches/2015Q4/www/linux-firefox/pkg-plist =================================================================== --- branches/2015Q4/www/linux-firefox/pkg-plist (revision 404094) +++ branches/2015Q4/www/linux-firefox/pkg-plist (revision 404095) @@ -1,69 +1,68 @@ bin/%%APP_NAME%% share/applications/%%APP_NAME%%.desktop lib/%%APP_NAME%%/Throbber-small.gif lib/%%APP_NAME%%/application.ini lib/%%APP_NAME%%/browser/blocklist.xml lib/%%APP_NAME%%/browser/chrome.manifest lib/%%APP_NAME%%/browser/chrome/icons/default/default16.png lib/%%APP_NAME%%/browser/chrome/icons/default/default32.png lib/%%APP_NAME%%/browser/chrome/icons/default/default48.png lib/%%APP_NAME%%/browser/components/components.manifest lib/%%APP_NAME%%/browser/components/libbrowsercomps.so lib/%%APP_NAME%%/browser/crashreporter-override.ini lib/%%APP_NAME%%/browser/defaults/preferences/browser-prefs.js lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf lib/%%APP_NAME%%/browser/icons/mozicon128.png lib/%%APP_NAME%%/browser/omni.ja lib/%%APP_NAME%%/browser/plugins lib/%%APP_NAME%%/chrome.manifest lib/%%APP_NAME%%/components/components.manifest -lib/%%APP_NAME%%/components/libdbusservice.so lib/%%APP_NAME%%/components/libmozgnome.so lib/%%APP_NAME%%/crashreporter lib/%%APP_NAME%%/crashreporter.ini lib/%%APP_NAME%%/defaults/pref/channel-prefs.js lib/%%APP_NAME%%/dependentlibs.list lib/%%APP_NAME%%/dictionaries/en-US.aff lib/%%APP_NAME%%/dictionaries/en-US.dic lib/%%APP_NAME%%/firefox lib/%%APP_NAME%%/firefox-bin lib/%%APP_NAME%%/gmp-clearkey/0.1/clearkey.info lib/%%APP_NAME%%/gmp-clearkey/0.1/libclearkey.so lib/%%APP_NAME%%/icons/updater.png lib/%%APP_NAME%%/libfreebl3.chk lib/%%APP_NAME%%/libfreebl3.so %%GTK218%%lib/%%APP_NAME%%/libgdk-x11-2.0.so.0 %%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0 %%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0 %%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0 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%%/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%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container lib/%%APP_NAME%%/precomplete lib/%%APP_NAME%%/removed-files lib/%%APP_NAME%%/run-mozilla.sh lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini lib/%%APP_NAME%%/webapprt-stub lib/%%APP_NAME%%/webapprt/omni.ja lib/%%APP_NAME%%/webapprt/webapprt.ini @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/ -depth 1 -type l -delete 2>/dev/null || true Index: branches/2015Q4 =================================================================== --- branches/2015Q4 (revision 404094) +++ branches/2015Q4 (revision 404095) Property changes on: branches/2015Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r404010