Index: branches/2015Q1/Mk/Uses/gecko.mk =================================================================== --- branches/2015Q1/Mk/Uses/gecko.mk (revision 377079) +++ branches/2015Q1/Mk/Uses/gecko.mk (revision 377080) @@ -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>=31:${PORTSDIR}/www/libxul RUN_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 31 _GECKO_VERSIONS= 31 35 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 31_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr 35_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= 31 -_GECKO_VERSIONS= 31 +_GECKO_DEFAULT_VERSION= 32 +_GECKO_VERSIONS= 32 _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 -31_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +32_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey .elif ${gecko_ARGS:Mthunderbird} _GECKO_DEFAULT_VERSION= 31 _GECKO_VERSIONS= 31 _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 31_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/2015Q1/www/linux-seamonkey/Makefile =================================================================== --- branches/2015Q1/www/linux-seamonkey/Makefile (revision 377079) +++ branches/2015Q1/www/linux-seamonkey/Makefile (revision 377080) @@ -1,17 +1,17 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.31 +DISTVERSION= 2.32 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser USES= tar:bzip2 WANT_GTK218= yes .include "${.CURDIR}/Makefile.common" .include Index: branches/2015Q1/www/linux-seamonkey/distinfo =================================================================== --- branches/2015Q1/www/linux-seamonkey/distinfo (revision 377079) +++ branches/2015Q1/www/linux-seamonkey/distinfo (revision 377080) @@ -1,6 +1,6 @@ -SHA256 (seamonkey-2.31.tar.bz2) = d6f3fe75bf9605c06bcb47be2d1ef004525e27e8326b05ab88d5fe4a6eaaf4c4 -SIZE (seamonkey-2.31.tar.bz2) = 40638305 +SHA256 (seamonkey-2.32.tar.bz2) = 571829702f8dc5f869181ec31911797471e63ebac5b0b2bfb9f5ae1986478f47 +SIZE (seamonkey-2.32.tar.bz2) = 40849036 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/2015Q1/www/seamonkey/Makefile =================================================================== --- branches/2015Q1/www/seamonkey/Makefile (revision 377079) +++ branches/2015Q1/www/seamonkey/Makefile (revision 377080) @@ -1,196 +1,193 @@ # Created by: eivind/dima/jseger # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.31 -PORTREVISION= 1 +DISTVERSION= 2.32 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${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.6:${PORTSDIR}/devel/nspr \ nss>=3.17.2:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.7.2 -L_VERSION= 3.6 +L_VERSION= 3.7 SSP_UNSAFE= yes USE_GECKO= gecko USE_QT5= # empty QT_NONSTANDARD= yes USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite USE_MOZILLA= # empty MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LIGHTNING MAILNEWS +OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL 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}/comm-release MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi .if ${PORT_OPTIONS:MALSA} RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib .endif .if ${PORT_OPTIONS:MGSTREAMER} RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav .endif .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 -BROKEN= XPCOMGlueLoad error for file ${LOCALBASE}/lib/${MOZILLA}/libxul.so: \ - Cannot open "../../ldap/sdks/c-sdk/ldap/libraries/libldap/libldap60.so" 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+= gpg:${PORTSDIR}/security/gnupg EM_DISTNAME= enigmail-${EM_VERSION} EM_DISTFILE= ${EM_DISTNAME}.tar.gz EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.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/enigmailCommon.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: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: branches/2015Q1/www/seamonkey/distinfo =================================================================== --- branches/2015Q1/www/seamonkey/distinfo (revision 377079) +++ branches/2015Q1/www/seamonkey/distinfo (revision 377080) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.31.source.tar.bz2) = 9c4dd82f776780b99b70be0b6b944ada218e4356ec8dd059a63d4c260a04ee28 -SIZE (seamonkey-2.31.source.tar.bz2) = 187731254 +SHA256 (seamonkey-2.32.source.tar.bz2) = e174dc5093e49078c33f91b4e8658327957d59bd53ac59e304441d8d5f17ba9b +SIZE (seamonkey-2.32.source.tar.bz2) = 199700383 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SIZE (enigmail-1.7.2.tar.gz) = 1420346 Index: branches/2015Q1/www/seamonkey/files/patch-bug1073709 =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-bug1073709 (revision 377079) +++ branches/2015Q1/www/seamonkey/files/patch-bug1073709 (nonexistent) @@ -1,18 +0,0 @@ -diff --git mfbt/Atomics.h mfbt/Atomics.h -index 495a9d3..c7f7601 100644 ---- mozilla/mfbt/Atomics.h -+++ mozilla/mfbt/Atomics.h -@@ -34,10 +34,12 @@ - * loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline - * definitions for unspecialized std::atomic and causes linking errors. - * Therefore, we require at least 4.7.0 for using libstdc++. -+ * -+ * libc++ is only functional with clang. - */ - # if MOZ_USING_LIBSTDCXX && MOZ_LIBSTDCXX_VERSION_AT_LEAST(4, 7, 0) - # define MOZ_HAVE_CXX11_ATOMICS --# elif MOZ_USING_LIBCXX -+# elif MOZ_USING_LIBCXX && defined(__clang__) - # define MOZ_HAVE_CXX11_ATOMICS - # endif - /* Property changes on: branches/2015Q1/www/seamonkey/files/patch-bug1073709 ___________________________________________________________________ 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/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in (revision 377079) +++ branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in (nonexistent) @@ -1,13 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 -@@ -254,6 +254,10 @@ - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - ifeq ($(OS_ARCH), NetBSD) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) - endif Property changes on: branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in ___________________________________________________________________ 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/2015Q1/www/seamonkey/files/patch-config-baseconfig.mk =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-config-baseconfig.mk (revision 377079) +++ branches/2015Q1/www/seamonkey/files/patch-config-baseconfig.mk (nonexistent) @@ -1,14 +0,0 @@ ---- config/baseconfig.mk~ -+++ config/baseconfig.mk -@@ -1,7 +1,7 @@ --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/%%MOZILLA%% -+idldir = $(datadir)/idl/%%MOZILLA%% -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist Property changes on: branches/2015Q1/www/seamonkey/files/patch-config-baseconfig.mk ___________________________________________________________________ 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/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in (revision 377079) +++ branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in (nonexistent) @@ -1,15 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-01 10:18:43.000000000 +0100 -@@ -147,6 +147,12 @@ - CUSTOM_LIBS=1 - endif - -+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH))) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK}) -+CUSTOM_LIBS=1 -+endif -+ - # no extra libs on HP-UX - ifeq ($(OS_ARCH), HP-UX) - CUSTOM_LIBS=1 Property changes on: branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in ___________________________________________________________________ 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/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in (revision 377079) +++ branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in (nonexistent) @@ -1,13 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 -+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 -@@ -180,6 +180,10 @@ - CUSTOM_LIBS=1 - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+CUSTOM_LIBS=1 -+endif -+ - ifndef CUSTOM_LIBS - EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME) - EXTRA_LIBS += $(NSSLINK) Property changes on: branches/2015Q1/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ___________________________________________________________________ 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/2015Q1/www/seamonkey/files/patch-bug1112904 =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-bug1112904 (nonexistent) +++ branches/2015Q1/www/seamonkey/files/patch-bug1112904 (revision 377080) @@ -0,0 +1,161 @@ +diff --git a/c-sdk/config/FreeBSD.mk b/c-sdk/config/FreeBSD.mk +--- ldap/sdks/c-sdk/config/FreeBSD.mk ++++ ldap/sdks/c-sdk/config/FreeBSD.mk +@@ -79,8 +79,8 @@ DLL_SUFFIX = so.1.0 + endif + + DSO_CFLAGS = -fPIC +-DSO_LDOPTS = -Bshareable ++DSO_LDOPTS = -shared -Wl,-soname,$(notdir $@) + +-MKSHLIB = $(LD) $(DSO_LDOPTS) ++MKSHLIB = $(CC) $(DSO_LDOPTS) + + G++INCLUDES = -I/usr/include/g++ +diff --git a/c-sdk/configure b/c-sdk/configure +--- ldap/sdks/c-sdk/configure ++++ ldap/sdks/c-sdk/configure +@@ -4241,8 +4241,10 @@ EOF + #define DRAGONFLY 1 + EOF + ++ LD='$(CC)' ++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-shared' ++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)' + ;; + + *-freebsd*) +@@ -4261,6 +4263,7 @@ EOF + #define HAVE_BSD_FLOCK 1 + EOF + ++ LD='$(CC)' + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" + MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + if test "$MOZ_OBJFORMAT" = "elf"; then +@@ -4268,8 +4271,9 @@ EOF + else + DLL_SUFFIX=so.1.0 + fi ++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS=-Bshareable ++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)' + ;; + + *-hpux*) +@@ -6512,8 +6516,15 @@ echo "configure:6510: checking whether $ + if test $? -eq 0; then + if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then + ac_cv_have_dash_pthread=yes +- CFLAGS="$CFLAGS -pthread" +- CXXFLAGS="$CXXFLAGS -pthread" ++ case "$target_os" in ++ dragonfly*|freebsd*) ++# Freebsd doesn't use -pthread for compiles, it uses them for linking ++ ;; ++ *) ++ CFLAGS="$CFLAGS -pthread" ++ CXXFLAGS="$CXXFLAGS -pthread" ++ ;; ++ esac + fi + fi + rm -f conftest* +@@ -6542,7 +6553,22 @@ echo "configure:6526: checking whether $ + _PTHREAD_LDFLAGS= + fi + ;; +- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*) ++ *-dragonfly*|*-freebsd*) ++ cat >> confdefs.h <<\EOF ++#define _REENTRANT 1 ++EOF ++ ++ cat >> confdefs.h <<\EOF ++#define _THREAD_SAFE 1 ++EOF ++ ++ if test "$ac_cv_have_dash_pthread" = "yes"; then ++ _PTHREAD_LDFLAGS="-pthread" ++ else ++ _PTHREAD_LDFLAGS="-lc_r" ++ fi ++ ;; ++ *-openbsd*|*-bsdi*|*-netbsd*) + cat >> confdefs.h <<\EOF + #define _THREAD_SAFE 1 + EOF +diff --git a/c-sdk/configure.in b/c-sdk/configure.in +--- ldap/sdks/c-sdk/configure.in ++++ ldap/sdks/c-sdk/configure.in +@@ -1225,8 +1225,10 @@ tools are selected during the Xcode/Deve + fi + AC_DEFINE(XP_UNIX) + AC_DEFINE(DRAGONFLY) ++ LD='$(CC)' ++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-shared' ++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)' + ;; + + *-freebsd*) +@@ -1236,6 +1238,7 @@ tools are selected during the Xcode/Deve + AC_DEFINE(XP_UNIX) + AC_DEFINE(FREEBSD) + AC_DEFINE(HAVE_BSD_FLOCK) ++ LD='$(CC)' + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" + MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + if test "$MOZ_OBJFORMAT" = "elf"; then +@@ -1243,8 +1246,9 @@ tools are selected during the Xcode/Deve + else + DLL_SUFFIX=so.1.0 + fi ++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS=-Bshareable ++ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)' + ;; + + *-hpux*) +@@ -2329,8 +2333,15 @@ if test -n "$USE_PTHREADS"; then + if test $? -eq 0; then + if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then + ac_cv_have_dash_pthread=yes +- CFLAGS="$CFLAGS -pthread" +- CXXFLAGS="$CXXFLAGS -pthread" ++ case "$target_os" in ++ dragonfly*|freebsd*) ++# Freebsd doesn't use -pthread for compiles, it uses them for linking ++ ;; ++ *) ++ CFLAGS="$CFLAGS -pthread" ++ CXXFLAGS="$CXXFLAGS -pthread" ++ ;; ++ esac + fi + fi + rm -f conftest* +@@ -2361,7 +2372,17 @@ if test -n "$USE_PTHREADS"; then + _PTHREAD_LDFLAGS= + fi + ;; +- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*) ++ *-dragonfly*|*-freebsd*) ++ AC_DEFINE(_REENTRANT) ++ AC_DEFINE(_THREAD_SAFE) ++ dnl -pthread links in -lc_r, so don't specify it explicitly. ++ if test "$ac_cv_have_dash_pthread" = "yes"; then ++ _PTHREAD_LDFLAGS="-pthread" ++ else ++ _PTHREAD_LDFLAGS="-lc_r" ++ fi ++ ;; ++ *-openbsd*|*-bsdi*|*-netbsd*) + AC_DEFINE(_THREAD_SAFE) + dnl -pthread links in -lc_r, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then Property changes on: branches/2015Q1/www/seamonkey/files/patch-bug1112904 ___________________________________________________________________ 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/2015Q1/www/seamonkey/files/patch-mozilla-config-baseconfig.mk =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-mozilla-config-baseconfig.mk (nonexistent) +++ branches/2015Q1/www/seamonkey/files/patch-mozilla-config-baseconfig.mk (revision 377080) @@ -0,0 +1,14 @@ +--- mozilla/config/baseconfig.mk~ ++++ mozilla/config/baseconfig.mk +@@ -1,7 +1,7 @@ +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/%%MOZILLA%% ++idldir = $(datadir)/idl/%%MOZILLA%% ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + ifndef TOP_DIST + TOP_DIST = dist + endif Property changes on: branches/2015Q1/www/seamonkey/files/patch-mozilla-config-baseconfig.mk ___________________________________________________________________ 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/2015Q1/www/seamonkey/files/patch-system-openh264 =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-system-openh264 (revision 377079) +++ branches/2015Q1/www/seamonkey/files/patch-system-openh264 (revision 377080) @@ -1,218 +1,221 @@ # Revert bug 1045209 to allow using absolute path diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp -index 4165a75..81914d5 100644 +index 1dde3ac..12c88cf 100644 --- mozilla/content/media/gmp/GMPChild.cpp +++ mozilla/content/media/gmp/GMPChild.cpp -@@ -66,19 +66,11 @@ +@@ -76,21 +76,14 @@ GetFileBase(const std::string& aPluginPa } #endif - nsCOMPtr parent; -- rv = aLibFile->GetParent(getter_AddRefs(parent)); +- rv = aFileBase->GetParent(getter_AddRefs(parent)); - if (NS_FAILED(rv)) { - return false; - } - - nsAutoString parentLeafName; - rv = parent->GetLeafName(parentLeafName); - if (NS_FAILED(rv)) { + nsAutoString leafName; -+ if (NS_FAILED(aLibFile->GetLeafName(leafName))) { ++ if (NS_FAILED(aFileBase->GetLeafName(leafName))) { return false; } -- -- nsAutoString baseName(Substring(parentLeafName, 4, parentLeafName.Length() - 1)); -+ nsAutoString baseName(Substring(leafName, 4, leafName.Length() - 1)); - #if defined(XP_MACOSX) - nsAutoString binaryName = NS_LITERAL_STRING("lib") + baseName + NS_LITERAL_STRING(".dylib"); +- aBaseName = Substring(parentLeafName, ++ aBaseName = Substring(leafName, + 4, +- parentLeafName.Length() - 1); ++ leafName.Length() - 1); + return true; + } + diff --git content/media/gmp/GMPParent.cpp content/media/gmp/GMPParent.cpp index aa60acf..90878ca 100644 --- mozilla/content/media/gmp/GMPParent.cpp +++ mozilla/content/media/gmp/GMPParent.cpp @@ -90,23 +90,16 @@ mService = aService; mDirectory = aPluginDir; - // aPluginDir is // - // where should be gmp-gmpopenh264 - nsCOMPtr parent; - nsresult rv = aPluginDir->GetParent(getter_AddRefs(parent)); - if (NS_FAILED(rv)) { - return rv; - } - nsAutoString parentLeafName; - rv = parent->GetLeafName(parentLeafName); + nsAutoString leafname; + nsresult rv = aPluginDir->GetLeafName(leafname); if (NS_FAILED(rv)) { return rv; } LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this, - NS_LossyConvertUTF16toASCII(parentLeafName).get())); + NS_LossyConvertUTF16toASCII(leafname).get())); - MOZ_ASSERT(parentLeafName.Length() > 4); - mName = Substring(parentLeafName, 4); + MOZ_ASSERT(leafname.Length() > 4); + mName = Substring(leafname, 4); return ReadGMPMetaData(); } diff --git toolkit/modules/GMPInstallManager.jsm toolkit/modules/GMPInstallManager.jsm index 9593492..470384b 100644 --- mozilla/toolkit/modules/GMPInstallManager.jsm +++ mozilla/toolkit/modules/GMPInstallManager.jsm @@ -107,6 +107,7 @@ */ KEY_LOG_ENABLED: "media.gmp-manager.log", KEY_ADDON_LAST_UPDATE: "media.{0}.lastUpdate", + KEY_ADDON_PATH: "media.{0}.path", KEY_ADDON_VERSION: "media.{0}.version", KEY_ADDON_AUTOUPDATE: "media.{0}.autoupdate", KEY_URL: "media.gmp-manager.url", @@ -888,9 +889,7 @@ let gmpAddon = this._gmpAddon; let installToDirPath = Cc["@mozilla.org/file/local;1"]. createInstance(Ci.nsIFile); - let path = OS.Path.join(OS.Constants.Path.profileDir, - gmpAddon.id, - gmpAddon.version); + let path = OS.Path.join(OS.Constants.Path.profileDir, gmpAddon.id); installToDirPath.initWithPath(path); log.info("install to directory path: " + installToDirPath.path); let gmpInstaller = new GMPExtractor(zipPath, installToDirPath.path); @@ -899,10 +898,12 @@ // Success, set the prefs let now = Math.round(Date.now() / 1000); GMPPrefs.set(GMPPrefs.KEY_ADDON_LAST_UPDATE, now, gmpAddon.id); - // Setting the version pref signals installation completion to consumers, - // if you need to set other prefs etc. do it before this. + // Setting the path pref signals installation completion to consumers, + // so set the version and potential other information they use first. GMPPrefs.set(GMPPrefs.KEY_ADDON_VERSION, gmpAddon.version, gmpAddon.id); + GMPPrefs.set(GMPPrefs.KEY_ADDON_PATH, + installToDirPath.path, gmpAddon.id); this._deferred.resolve(extractedPaths); }, err => { this._deferred.reject(err); diff --git toolkit/mozapps/extensions/internal/OpenH264Provider.jsm toolkit/mozapps/extensions/internal/OpenH264Provider.jsm index 1f3a0b1..93517be 100644 --- mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm +++ mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm @@ -29,6 +29,7 @@ const OPENH264_PLUGIN_ID = "gmp-gmpopenh264"; const OPENH264_PREF_BRANCH = "media." + OPENH264_PLUGIN_ID + "."; const OPENH264_PREF_ENABLED = "enabled"; +const OPENH264_PREF_PATH = "path"; const OPENH264_PREF_VERSION = "version"; const OPENH264_PREF_LASTUPDATE = "lastUpdate"; const OPENH264_PREF_AUTOUPDATE = "autoupdate"; @@ -93,7 +94,12 @@ get description() { return pluginsBundle.GetStringFromName("openH264_description"); }, - get version() { return prefs.get(OPENH264_PREF_VERSION, ""); }, + get version() { + if (this.isInstalled) { + return prefs.get(OPENH264_PREF_VERSION, ""); + } + return ""; + }, get isActive() { return !this.userDisabled; }, get appDisabled() { return false; }, @@ -217,24 +223,17 @@ get pluginMimeTypes() { return []; }, get pluginLibraries() { - if (this.isInstalled) { - let path = this.version; - return [path]; - } - return []; + let path = prefs.get(OPENH264_PREF_PATH, null); + return path && path.length ? [OS.Path.basename(path)] : []; }, get pluginFullpath() { - if (this.isInstalled) { - let path = OS.Path.join(OS.Constants.Path.profileDir, - OPENH264_PLUGIN_ID, - this.version); - return [path]; - } - return []; + let path = prefs.get(OPENH264_PREF_PATH, null); + return path && path.length ? [path] : []; }, get isInstalled() { - return this.version.length > 0; + let path = prefs.get(OPENH264_PREF_PATH, ""); + return path.length > 0; }, }; @@ -245,19 +244,14 @@ "OpenH264Provider" + "::"); OpenH264Wrapper._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.OpenH264Provider", "OpenH264Wrapper" + "::"); - this.gmpPath = null; - if (OpenH264Wrapper.isInstalled) { - this.gmpPath = OS.Path.join(OS.Constants.Path.profileDir, - OPENH264_PLUGIN_ID, - prefs.get(OPENH264_PREF_VERSION, null)); - } + this.gmpPath = prefs.get(OPENH264_PREF_PATH, null); let enabled = prefs.get(OPENH264_PREF_ENABLED, true); this._log.trace("startup() - enabled=" + enabled + ", gmpPath="+this.gmpPath); Services.obs.addObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED, false); prefs.observe(OPENH264_PREF_ENABLED, this.onPrefEnabledChanged, this); - prefs.observe(OPENH264_PREF_VERSION, this.onPrefVersionChanged, this); + prefs.observe(OPENH264_PREF_PATH, this.onPrefPathChanged, this); prefs.observe(OPENH264_PREF_LOGGING, configureLogging); if (this.gmpPath && enabled) { @@ -270,7 +264,7 @@ this._log.trace("shutdown()"); Services.obs.removeObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED); prefs.ignore(OPENH264_PREF_ENABLED, this.onPrefEnabledChanged, this); - prefs.ignore(OPENH264_PREF_VERSION, this.onPrefVersionChanged, this); + prefs.ignore(OPENH264_PREF_PATH, this.onPrefPathChanged, this); prefs.ignore(OPENH264_PREF_LOGGING, configureLogging); return OpenH264Wrapper._updateTask; @@ -296,25 +290,20 @@ wrapper); }, - onPrefVersionChanged: function() { + onPrefPathChanged: function() { let wrapper = OpenH264Wrapper; AddonManagerPrivate.callAddonListeners("onUninstalling", wrapper, false); if (this.gmpPath) { - this._log.info("onPrefVersionChanged() - unregistering gmp directory " + this.gmpPath); + this._log.info("onPrefPathChanged() - removing gmp directory " + this.gmpPath); gmpService.removePluginDirectory(this.gmpPath); } AddonManagerPrivate.callAddonListeners("onUninstalled", wrapper); AddonManagerPrivate.callInstallListeners("onExternalInstall", null, wrapper, null, false); - this.gmpPath = null; - if (OpenH264Wrapper.isInstalled) { - this.gmpPath = OS.Path.join(OS.Constants.Path.profileDir, - OPENH264_PLUGIN_ID, - prefs.get(OPENH264_PREF_VERSION, null)); - } + this.gmpPath = prefs.get(OPENH264_PREF_PATH, null); if (this.gmpPath && wrapper.isActive) { - this._log.info("onPrefVersionChanged() - registering gmp directory " + this.gmpPath); + this._log.info("onPrefPathChanged() - adding gmp directory " + this.gmpPath); gmpService.addPluginDirectory(this.gmpPath); } AddonManagerPrivate.callAddonListeners("onInstalled", wrapper); Index: branches/2015Q1/www/seamonkey/files/patch-z-bug517422 =================================================================== --- branches/2015Q1/www/seamonkey/files/patch-z-bug517422 (revision 377079) +++ branches/2015Q1/www/seamonkey/files/patch-z-bug517422 (revision 377080) @@ -1,524 +1,524 @@ # 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,13 @@ 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_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 @@ -16,13 +16,19 @@ if CONFIG['MOZ_UPDATER']: if not CONFIG['MOZ_NATIVE_BZ2']: external_dirs += ['modules/libbz2'] -if CONFIG['MOZ_VORBIS']: +if not CONFIG['MOZ_NATIVE_OGG']: + external_dirs += ['media/libogg'] + +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_OPUS']: +if CONFIG['MOZ_OPUS'] and not CONFIG['MOZ_NATIVE_OPUS']: external_dirs += ['media/libopus'] if CONFIG['MOZ_WEBM']: @@ -37,14 +43,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']: 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/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 @@ -1263,7 +1263,6 @@ X11/Xlocale.h X11/Xos.h X11/Xutil.h zmouse.h -soundtouch/SoundTouch.h #if MOZ_NATIVE_PNG==1 png.h #endif @@ -1325,6 +1324,7 @@ vorbis/codec.h theora/theoradec.h tremor/ivorbiscodec.h speex/speex_resampler.h +soundtouch/SoundTouch.h ogg/ogg.h ogg/os_types.h nestegg/nestegg.h @@ -1365,3 +1365,29 @@ 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_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 +#if MOZ_NATIVE_SOUNDTOUCH==1 +soundtouch/SoundTouch.h +#endif diff --git configure.in configure.in index 87db361..7947626 100644 --- mozilla/configure.in +++ mozilla/configure.in @@ -5056,6 +5056,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then 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.4) +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 = Disable Opus audio codec support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(opus, @@ -5064,6 +5115,89 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) 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 + +AC_SUBST(MOZ_NATIVE_SOUNDTOUCH) + +dnl ======================================================== dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, diff --git content/media/AudioStream.h content/media/AudioStream.h index 085676d..00c54fb 100644 --- mozilla/content/media/AudioStream.h +++ mozilla/content/media/AudioStream.h @@ -17,7 +17,7 @@ #include "CubebUtils.h" namespace soundtouch { -class SoundTouch; +class MOZ_IMPORT_API SoundTouch; } namespace mozilla { diff --git content/media/moz.build content/media/moz.build index 7526cff..e0a0ca0 100644 --- mozilla/content/media/moz.build +++ mozilla/content/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/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 @@ -6,3 +6,5 @@ DIRS += ['include', 'lib'] +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] 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/moz.build media/webrtc/signaling/test/moz.build index bbc971c..6ed7e41 100644 --- mozilla/media/webrtc/signaling/test/moz.build +++ mozilla/media/webrtc/signaling/test/moz.build @@ -127,6 +127,9 @@ if CONFIG['MOZ_ALSA']: 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,9 +17,9 @@ 'conditions': [ ['build_with_mozilla==1', { # Mozilla provides its own build of the opus library. - 'include_dirs': [ - '/media/libopus/include', - ] + 'cflags_mozilla': [ + '$(MOZ_OPUS_CFLAGS)', + ], }, { 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' 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,27 @@ 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_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/nsXPComInit.cpp xpcom/build/nsXPComInit.cpp +diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp index 2cf281e..6d7af0e 100644 ---- mozilla/xpcom/build/nsXPComInit.cpp -+++ mozilla/xpcom/build/nsXPComInit.cpp +--- 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: branches/2015Q1/www/seamonkey-i18n/Makefile =================================================================== --- branches/2015Q1/www/seamonkey-i18n/Makefile (revision 377079) +++ branches/2015Q1/www/seamonkey-i18n/Makefile (revision 377080) @@ -1,88 +1,88 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.31 +PORTVERSION= 2.32 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} DIST_SUBDIR= xpi/${DISTNAME} MAINTAINER= gecko@FreeBSD.org COMMENT= Localized interface for SeaMonkey EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip USES= zip:infozip gecko:seamonkey,build 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:${PORTSDIR}/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 ! (${UNZIP_CMD} -qo ${_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} ${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/2015Q1/www/seamonkey-i18n/distinfo =================================================================== --- branches/2015Q1/www/seamonkey-i18n/distinfo (revision 377079) +++ branches/2015Q1/www/seamonkey-i18n/distinfo (revision 377080) @@ -1,54 +1,52 @@ -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.be.langpack.xpi) = c685778c26e42914713f248af13531746a893775b690c851276c5dbac6c42673 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.be.langpack.xpi) = 842987 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ca.langpack.xpi) = 64e11f5088be84b21c5fe22605b754c246ff86142a22b680599e8c138784f1c2 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ca.langpack.xpi) = 836129 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.cs.langpack.xpi) = 00a70a450997b8598970089c8d67f1d77da9cd94a31db297eefcd7fe42e76b71 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.cs.langpack.xpi) = 837401 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.de.langpack.xpi) = 1b9cb19e1618eb146ae52875f700def9c130b293f03e57ffd61abe7d262c8791 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.de.langpack.xpi) = 841321 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-GB.langpack.xpi) = fb5c13e0a92bcf94589dd68ac27d6d91d5eb3dd445b78eb77258956849650de0 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-GB.langpack.xpi) = 806393 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-US.langpack.xpi) = cd9916784e258990bee4a4b92353da0f7c015a99e29ce1b19d518e843bcb2f7a -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-US.langpack.xpi) = 806393 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-AR.langpack.xpi) = 789cb938c4473fe4f7c9661d8e0a3974b5f627460e0a3d66f43a2d4c02b3ba76 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-AR.langpack.xpi) = 855419 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-ES.langpack.xpi) = 93ca568a07923605613d2df703a712b95c5364c3e67487d64e05b1dd6c2124fe -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-ES.langpack.xpi) = 832275 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fi.langpack.xpi) = d904b42fef7cb6e7537e8ce0b97c1fae7902cecab24c44eaa0a24bbeecc34275 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fi.langpack.xpi) = 803753 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fr.langpack.xpi) = e58ad8812caa8ee5762cb80869d517c70a0ea6c22e780a5b9561ab06e4b30c35 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fr.langpack.xpi) = 813901 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.gl.langpack.xpi) = 7015eed1fc8f47ec11bfb22435682ed1053b4d3e0939a8442c27f1b23113b0ee -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.gl.langpack.xpi) = 815951 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.hu.langpack.xpi) = 88a8aded02ebfc926caff925cffbf3659d03c7923c25917a4d945047ec13a948 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.hu.langpack.xpi) = 847393 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.it.langpack.xpi) = 7b61f752a6981983d53155f09b14043bc1ae30335d58bc2cd2469b7b2205f85f -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.it.langpack.xpi) = 744925 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja-JP-mac.langpack.xpi) = e94c36f9e5c342b33f778be5880106b5d45f4f2b0aef36c604c3a6ffeeba24d7 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja-JP-mac.langpack.xpi) = 903849 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja.langpack.xpi) = 833a41fea45be480338a86a51163959886f1e4b443ee61cbf09ba68e61255874 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja.langpack.xpi) = 888311 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.lt.langpack.xpi) = 9e44994780eb3efe7dc46a4742cf24bcd6cf41d045d8fadbf9eccc28fe03bb50 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.lt.langpack.xpi) = 854172 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nb-NO.langpack.xpi) = eea41ed25941cc479c6f92b2ebdc668182bb5f42f4bbeacf96008c4469cbd834 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nb-NO.langpack.xpi) = 825996 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nl.langpack.xpi) = c399ab8412e7e44100c08df9a8362cf7e74c79a8277e8dba6a1856fc79df2b4d -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nl.langpack.xpi) = 799921 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pl.langpack.xpi) = f37cd7f58a28991b156efad2bf439df3d584c0724dae3050121893ef4624c1d8 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pl.langpack.xpi) = 871193 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pt-PT.langpack.xpi) = 59d671a4ebed43eaeedd84aa6dad3d92c5bde0fa60d2419df0d16f9b08312650 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pt-PT.langpack.xpi) = 840381 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ru.langpack.xpi) = 2aed82158ef7feed0beea74e337c91a72f5c6b56e04d33027214f2dcc1bee3e8 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ru.langpack.xpi) = 903117 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sk.langpack.xpi) = 59e3d10e170484dc36e7db9361ced649fea50ca2ca203ece2dad32cf2923d146 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sk.langpack.xpi) = 864480 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sv-SE.langpack.xpi) = 44b550171164b290bb5af66f34930a9da187d54fb8ea37e7f91026966dc8b149 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sv-SE.langpack.xpi) = 828261 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.tr.langpack.xpi) = 856ea876142e409caf81423da627f002664054f546df7839663f3c8a56a727ef -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.tr.langpack.xpi) = 813160 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.uk.langpack.xpi) = 6a70dc6b9832960216725889ca341d8d4ae2f3a80723d8b5a48c470c58a9d6fe -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.uk.langpack.xpi) = 875357 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-CN.langpack.xpi) = 2a378781a7a13ef0b8ec3758633ecf3d55f99d5439f8ee2d3a0a6ae4106f2aa3 -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-CN.langpack.xpi) = 838609 -SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-TW.langpack.xpi) = 4032cd3e4aff64f7c84258da2387857046bcb015ce3d13aed8ae61b2eeee1bbb -SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-TW.langpack.xpi) = 863793 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.be.langpack.xpi) = fec9ed55542d53940cc8c73c37519acbcbe5451106e495b661e85eda27b040c8 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.be.langpack.xpi) = 841560 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ca.langpack.xpi) = d2f1e695ce860c976fc8239f2315aee37e2a8c3fa482dbd2ec9b3f16dd6daff4 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ca.langpack.xpi) = 832917 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.cs.langpack.xpi) = 19616f12c39cc398b8e27197a81be822b08ee2bad104ec705d2877fa175831f8 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.cs.langpack.xpi) = 830451 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.de.langpack.xpi) = 6588e65232922c57a7cdd53cab38a3d8cd8f26fa6105ae564a3ae231be2d67b8 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.de.langpack.xpi) = 838041 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-GB.langpack.xpi) = f74ef701cb701527d4852591450864bd97ccd6f3b4b6392fedb474c260ab6a84 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-GB.langpack.xpi) = 804019 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-US.langpack.xpi) = 73cdd17bc37fc4346b594ee35f5adcc0e3fcc870a66662e9a67faafa372a40f6 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-US.langpack.xpi) = 803478 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-AR.langpack.xpi) = 2d40bc0f2f6e9a31618c149b7a1c9a69cbb92f5e79e1e90d063a94e9390d1326 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-AR.langpack.xpi) = 852545 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-ES.langpack.xpi) = 2d1e94907a26ffef9b0df13c6d79ef238f5f3da271add0e1503174a1bccc70f1 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-ES.langpack.xpi) = 829553 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fi.langpack.xpi) = 84c3d99167bb99f9dca4eb2c7f9f6c96c5610b0e4cf69a43a5bfa720f4ac4f7f +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fi.langpack.xpi) = 799881 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fr.langpack.xpi) = faa3938631be0862bfc2f851caf7f065a255bb931d4d6bddea0af656c1ac472c +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fr.langpack.xpi) = 810711 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.gl.langpack.xpi) = 2ddb7809dfbde64044c1b46b20ef9e86e82f13a9c1da18d8cd8b5c9cdc32038d +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.gl.langpack.xpi) = 814445 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.hu.langpack.xpi) = 7c87922eac25dd9cc8bfcc1f61e458c27197816be50d28948f759e5d5fdfae7e +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.hu.langpack.xpi) = 844069 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 1925e77234e5a4423d66b0e988a5ef9aeb067d8193e34a31273741570cb77540 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 742070 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = e44009f8ec92c476f0c04ea6862629db8884f8f143f707ae47418ac9ecbad6dd +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = 884921 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.lt.langpack.xpi) = f2b7a50cb4a8e02e2cdd4badcf5566ca520f95450a0d84d267297e6ca57b7a22 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.lt.langpack.xpi) = 852677 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nb-NO.langpack.xpi) = 0666795e29873639bf1cd127b22491a4c87d3d38894de5d5734a68e5a83356ea +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nb-NO.langpack.xpi) = 822959 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nl.langpack.xpi) = f7a93a63084268f9a593859d72fd207d33e01c87f2f0983ab4c536b529183b74 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nl.langpack.xpi) = 796641 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pl.langpack.xpi) = f6b5ac5a752ba2e3d2b5145f5f05d2d486ccc3fc1c56898ef143b0009a60d3c6 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pl.langpack.xpi) = 868114 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pt-PT.langpack.xpi) = 5bcdb4fa75d548301d7d16ecff4d97c7348f53c98cea6920a9154b3fa5c85611 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pt-PT.langpack.xpi) = 833784 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ru.langpack.xpi) = 039e3c3ba62b2157c7a3da45a6fa1ebbb5276524dbb059f6352cb5d7f0d74368 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ru.langpack.xpi) = 899661 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sk.langpack.xpi) = cb5111034a7561dc7a5928032920cdffe0e7a828c2e3188f37baebfd9619d496 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sk.langpack.xpi) = 857464 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sv-SE.langpack.xpi) = b8d3c4b1d11d21b11a2fde81fa265a1cfc228678f2021f306329f90c8bfd1af1 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sv-SE.langpack.xpi) = 825104 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.tr.langpack.xpi) = 88075220e2f653ca2b318e54d80a2d4f56b3cea041d861892822e63b63c493b8 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.tr.langpack.xpi) = 811614 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.uk.langpack.xpi) = 85772ee30485bd069ff97827d487ba974906369598ef80793ca41c0d59183c46 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.uk.langpack.xpi) = 873317 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-CN.langpack.xpi) = 6948c68c87c41587786f92f728cb0ac9568066f2e4e5e8cd858a09f8aa5c5d31 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-CN.langpack.xpi) = 834251 +SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-TW.langpack.xpi) = 58e96499f4a412741b04ecd3026ebbd2cb50be14ec69d17b6e5373f6b2915b71 +SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-TW.langpack.xpi) = 860363 Index: branches/2015Q1 =================================================================== --- branches/2015Q1 (revision 377079) +++ branches/2015Q1 (revision 377080) Property changes on: branches/2015Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r377062