diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-10-05 09:39:08 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-10-05 09:39:08 +0000 |
| commit | 7f32d22f9a19ff331caa3504f4bd028494647f43 (patch) | |
| tree | 75898479a5541ec3342ce1b192b1a8aa95469763 | |
| parent | 5a7ea723ebd81ba4cb0ccc7684223b18af4e9fbf (diff) | |
| download | ports-7f32d22f9a19ff331caa3504f4bd028494647f43.tar.gz ports-7f32d22f9a19ff331caa3504f4bd028494647f43.zip | |
Notes
23 files changed, 381 insertions, 940 deletions
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk index a2975447daf2..1be490172a79 100644 --- a/Mk/Uses/gecko.mk +++ b/Mk/Uses/gecko.mk @@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g .elif ${gecko_ARGS:Mseamonkey} -_GECKO_DEFAULT_VERSION= 48 -_GECKO_VERSIONS= 48 +_GECKO_DEFAULT_VERSION= 49 +_GECKO_VERSIONS= 49 _GECKO_TYPE= seamonkey .if exists(${LOCALBASE}/bin/seamonkey) @@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/ .endif # Dependence lines for different Seamonkey versions -48_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey +49_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey .elif ${gecko_ARGS:Mthunderbird} diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile index db43667b7ea0..4aa03c3341f1 100644 --- a/www/seamonkey-i18n/Makefile +++ b/www/seamonkey-i18n/Makefile @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.48 +PORTVERSION= 2.49.1 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi \ + LOCAL/jbeich/${DIST_SUBDIR} PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} DIST_SUBDIR= xpi/${DISTNAME} diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo index c453664ea785..5b00bf7088a8 100644 --- a/www/seamonkey-i18n/distinfo +++ b/www/seamonkey-i18n/distinfo @@ -1,39 +1,39 @@ -TIMESTAMP = 1499406030 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.cs.langpack.xpi) = a8b955affee247a1c541bcca68fa383444fcf5db37659da045f47c0f6451d351 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.cs.langpack.xpi) = 929570 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.de.langpack.xpi) = 66cf0338e5607582824dffbd71dd6d82954275501de50bca3ebe70a2462c2b8a -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.de.langpack.xpi) = 937351 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-GB.langpack.xpi) = 835dbdca2c0d40be3e76045ec04932f0fff8223030febf7533885b9ff9868067 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-GB.langpack.xpi) = 901731 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-US.langpack.xpi) = 3f499d126578dc72c2982ac7bb6a47797dc6a520624b0eccaaf313f3de659330 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-US.langpack.xpi) = 921449 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-AR.langpack.xpi) = 78680bec36912e021ab35f144bd51c726dc9ce8031dbf7012bf9f2ef685872f4 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-AR.langpack.xpi) = 941407 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-ES.langpack.xpi) = 37702e2d54e965c6dffbd5c0c7bde9e4494ddfa9fc984136c826974a9fd253e5 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-ES.langpack.xpi) = 890255 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.fr.langpack.xpi) = f7a7c207878bfc84e9dd53f7111f00b7c297ad9c75c594ef4df4ddac532179a2 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.fr.langpack.xpi) = 957402 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.hu.langpack.xpi) = 2f1138ca9a9d1321dbe38d24cc0b6994a4a1569eb2bd4baebbcec00ed0e5355e -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.hu.langpack.xpi) = 943677 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.it.langpack.xpi) = f0084a1ce0681a1e3038597c6a77a2f3436b91166263f50b325a86cf9c708716 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.it.langpack.xpi) = 783035 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ja.langpack.xpi) = fb3029513e8fcf9713b5ad565e66ee6842d59822af509336e56b713373fce6bd -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ja.langpack.xpi) = 1027353 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.lt.langpack.xpi) = 54ccbd5b07e8260462ec060135f969a10dd94569238958fd96bde55e0cf61056 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.lt.langpack.xpi) = 944779 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.nl.langpack.xpi) = a2de7dcc53b7d0db496a8f1efab774fa603b4635a200fcf00cb503ebebb3227d -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.nl.langpack.xpi) = 946317 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pl.langpack.xpi) = 4083874a25597b833d4b9473f05bdac1f7de92d5f095793597a9fc855cb160b0 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pl.langpack.xpi) = 905621 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pt-PT.langpack.xpi) = 2c22ee0372cebea03737f6b506a0aaf002e67be9ed26662f70204250964dc642 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pt-PT.langpack.xpi) = 928435 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ru.langpack.xpi) = 0ee69e3b81708004bb7c155b68343a80d15c60735a603207a86939ff7b033060 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ru.langpack.xpi) = 986167 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sk.langpack.xpi) = cc176898ef9cb67728f0ed3eae24336cf52582bf0144a894f3fa04fc71140861 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sk.langpack.xpi) = 956279 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sv-SE.langpack.xpi) = 831a4b42faa31f4006984269e2d6d3472a0f1450f92895fb8190c1719e2ff2c8 -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sv-SE.langpack.xpi) = 930510 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-CN.langpack.xpi) = 991629043056dd722202116ef026aeb86a8615539aabf41a28b6a78da63eab7b -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-CN.langpack.xpi) = 934871 -SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-TW.langpack.xpi) = bb41ee50948baca9e78ae1ba0174046bde21d7bb823c6b365e32d7a8c6a9c50f -SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-TW.langpack.xpi) = 991735 +TIMESTAMP = 1505804275 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.cs.langpack.xpi) = 3da0bd7a341a90d5d10348ea53be7ffa3935202919a6d0aea59e69593499e246 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.cs.langpack.xpi) = 941974 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.de.langpack.xpi) = c5d997ed331867310dbe3468a6ea14ed327681015b62d61c021b433376ec2ebd +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.de.langpack.xpi) = 949902 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.en-GB.langpack.xpi) = 6a168ce1d5e5a6d5e4036f74dada7eac91f0feef6d53165afde30c9f39de643e +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.en-GB.langpack.xpi) = 911789 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.en-US.langpack.xpi) = 046b40b3231073c08975c8608ffd25c0d30ae1377ddae07916c6e859b44a2605 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.en-US.langpack.xpi) = 930971 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.es-AR.langpack.xpi) = d34c3ab2145d0829c814ce96b51c63c30c925e5c5a84810d411777be059d2cbd +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.es-AR.langpack.xpi) = 952759 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.es-ES.langpack.xpi) = 7fce4de8e1160996af38838093710d9e8a6c9f16f1a05e1b76c2778586fb643f +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.es-ES.langpack.xpi) = 897737 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.fr.langpack.xpi) = 5d32cebf47cea1a6c1cf20da828c4d2f944aa8f2252231d341dd292001fbdf55 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.fr.langpack.xpi) = 969290 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.hu.langpack.xpi) = 5795275d5eba01fe8c48af7f4f661ef5f3e7263f55029c2364a53f9288064401 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.hu.langpack.xpi) = 955174 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.it.langpack.xpi) = 9c8726b46dc3feaaf014ae142aac7d00c3d7eb4cc11157178c1fc265cd021807 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.it.langpack.xpi) = 793590 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.ja.langpack.xpi) = 2e7279bd818493bc3ba34352458aeb8d4b27499fa776683e97d0cf3da9f2cdb2 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.ja.langpack.xpi) = 1033801 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.lt.langpack.xpi) = f80892e20e5aad5c97b6c748d36fae3d75174d0164b3796ac45aaa1a5e3432ba +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.lt.langpack.xpi) = 956024 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.nl.langpack.xpi) = 6641ac30d2cfc6be47aeb92ee796924697be5a54bb384c4196d035f794d90a36 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.nl.langpack.xpi) = 957391 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.pl.langpack.xpi) = 704d1836d6d9b39224b6beb63320b636f45919bd54833996c34ad5bb7144edc7 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.pl.langpack.xpi) = 913004 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.pt-PT.langpack.xpi) = 7d04419a91c82e3e0c5c5e054e757bf1fea6ea9cac2080c8e4c6f2a9e2f803ec +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.pt-PT.langpack.xpi) = 939012 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.ru.langpack.xpi) = 0b125d063e304a5cab261c4a749ec6140ecb61c3c3069f1b0bbb47962b9d4a97 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.ru.langpack.xpi) = 995907 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.sk.langpack.xpi) = 944dabb4e4b177cf43a4304e6d89a8bbf1c5b9b67edf44b20240ff3e406a3196 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.sk.langpack.xpi) = 967988 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.sv-SE.langpack.xpi) = 1d047f07347acd38fd3c2a726f98697b43294969772f4540d171ade622ed2d7e +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.sv-SE.langpack.xpi) = 940793 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.zh-CN.langpack.xpi) = b815362ac40fd7928e4f76344e9472225e556751b0fe9babbf4a7462ed8d3264 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.zh-CN.langpack.xpi) = 946349 +SHA256 (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.zh-TW.langpack.xpi) = c08143641eb99e20df9beff3a0a9e1645c7e67d63eb18bc0314a612866cd7d43 +SIZE (xpi/seamonkey-i18n-2.49.1/seamonkey-2.49.1.zh-TW.langpack.xpi) = 1002365 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index a28b11dda68a..bbe2ab3294dc 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.48 -MOZILLA_VER= 51 # above + 3 -PORTREVISION= 4 +DISTVERSION= 2.49.1 +MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} @@ -15,14 +14,14 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ - nss>=3.28.1:security/nss \ + nss>=3.28.6:security/nss \ libevent>=2.0.21_2:devel/libevent \ - harfbuzz>=1.3.0:print/harfbuzz \ + harfbuzz>=1.4.1:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.25:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.14.1:databases/sqlite3 \ + sqlite3>=3.17.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 065b407e98f7..0cbdc937ec43 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499406030 -SHA256 (seamonkey-2.48.source.tar.xz) = 6f9a07c86ba6474b44e5083f9d1315d01778c097937f7da4c5701debffab2631 -SIZE (seamonkey-2.48.source.tar.xz) = 220412744 +TIMESTAMP = 1507108797 +SHA256 (seamonkey-2.49.1.source.tar.xz) = 7b669d8ada95e528d2a999c22ef81f3dcc49c159913f426f10c8cf3e8b777834 +SIZE (seamonkey-2.49.1.source.tar.xz) = 229758108 diff --git a/www/seamonkey/files/patch-bug1142056 b/www/seamonkey/files/patch-bug1142056 deleted file mode 100644 index 59613f8ccffd..000000000000 --- a/www/seamonkey/files/patch-bug1142056 +++ /dev/null @@ -1,64 +0,0 @@ -commit ef0d953d9e2d -Author: Makoto Kato <m_kato@ga2.so-net.ne.jp> -Date: Tue Aug 23 16:54:06 2016 +0900 - - Bug 1142056 - Add aarch64 configuration on Skia's moz.build. r=gw280 - - MozReview-Commit-ID: 60iAZjFg6W6 - - --HG-- - extra : histedit_source : b3bb5a3e556393ba49f43dc4ab8bdaa9be40fb0c ---- - gfx/skia/generate_mozbuild.py | 6 ++++-- - gfx/skia/moz.build | 12 ++++++++++-- - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py -index 2088b729d476..1eb04c1d7f57 100755 ---- mozilla/gfx/skia/generate_mozbuild.py -+++ mozilla/gfx/skia/generate_mozbuild.py -@@ -429,10 +429,12 @@ def write_mozbuild(sources): - f.write("if CONFIG['INTEL_ARCHITECTURE']:\n") - write_sources(f, sources['intel'], 4) - -- f.write("elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:\n") -+ f.write("elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:\n") - write_sources(f, sources['arm'], 4) - -- f.write(" if CONFIG['BUILD_ARM_NEON']:\n") -+ f.write(" if CONFIG['CPU_ARCH'] == 'aarch64':\n") -+ write_sources(f, sources['neon'], 8) -+ f.write(" elif CONFIG['BUILD_ARM_NEON']:\n") - write_list(f, 'SOURCES', sources['neon'], 8) - write_cflags(f, sources['neon'], 'neon', "CONFIG['NEON_FLAGS']", 8) - -diff --git gfx/skia/moz.build gfx/skia/moz.build -index b33f1cdbee54..9dba87978dd3 100644 ---- mozilla/gfx/skia/moz.build -+++ mozilla/gfx/skia/moz.build -@@ -519,7 +519,7 @@ if CONFIG['INTEL_ARCHITECTURE']: - 'skia/src/opts/SkOpts_sse41.cpp', - 'skia/src/opts/SkOpts_ssse3.cpp', - ] --elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: -+elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']: - UNIFIED_SOURCES += [ - 'skia/src/core/SkUtilsArm.cpp', - 'skia/src/opts/SkBitmapProcState_opts_arm.cpp', -@@ -528,7 +528,15 @@ elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: - SOURCES += [ - 'skia/src/opts/SkBlitRow_opts_arm.cpp', - ] -- if CONFIG['BUILD_ARM_NEON']: -+ if CONFIG['CPU_ARCH'] == 'aarch64': -+ SOURCES += [ -+ 'skia/src/opts/SkBitmapProcState_arm_neon.cpp', -+ 'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp', -+ 'skia/src/opts/SkBlitMask_opts_arm_neon.cpp', -+ 'skia/src/opts/SkBlitRow_opts_arm_neon.cpp', -+ 'skia/src/opts/SkOpts_neon.cpp', -+ ] -+ elif CONFIG['BUILD_ARM_NEON']: - SOURCES += [ - 'skia/src/opts/SkBitmapProcState_arm_neon.cpp', - 'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp', diff --git a/www/seamonkey/files/patch-bug1315986 b/www/seamonkey/files/patch-bug1315986 deleted file mode 100644 index 70e74b7ac981..000000000000 --- a/www/seamonkey/files/patch-bug1315986 +++ /dev/null @@ -1,49 +0,0 @@ -commit c0d2685148b5 -Author: Jonathan Kew <jkew@mozilla.com> -Date: Wed Nov 9 15:07:54 2016 +0000 - - Bug 1315986 - Update line-break class mapping in nsJISx4051LineBreaker to handle new classes in ICU58/Unicode 9, and add assertions to detect any future additions that will require further updates. r=masayuki ---- - intl/lwbrk/nsJISx4051LineBreaker.cpp | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git intl/lwbrk/nsJISx4051LineBreaker.cpp intl/lwbrk/nsJISx4051LineBreaker.cpp -index 0d89e91..1b262fa 100644 ---- mozilla/intl/lwbrk/nsJISx4051LineBreaker.cpp -+++ mozilla/intl/lwbrk/nsJISx4051LineBreaker.cpp -@@ -12,6 +12,10 @@ - #include "nsTArray.h" - #include "nsUnicodeProperties.h" - -+#if ENABLE_INTL_API -+#include "unicode/uchar.h" // for U_LB_COUNT until bug 1305700 -+#endif -+ - /* - - Simplification of Pair Table in JIS X 4051 -@@ -547,10 +551,22 @@ GetClass(uint32_t u) - /* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER, - /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE, - /* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER, -- /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER -+ /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER, -+#if U_ICU_VERSION_MAJOR_NUM > 57 -+ /* E_BASE = 40, [EB] */ CLASS_BREAKABLE, -+ /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER, -+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER, -+#endif - }; - -- return sUnicodeLineBreakToClass[mozilla::unicode::GetLineBreakClass(u)]; -+#if ENABLE_INTL_API -+ static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass), -+ "Gecko vs ICU LineBreak class mismatch"); -+#endif -+ -+ auto cls = mozilla::unicode::GetLineBreakClass(u); -+ MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass)); -+ return sUnicodeLineBreakToClass[cls]; - } - - static bool diff --git a/www/seamonkey/files/patch-bug1316879 b/www/seamonkey/files/patch-bug1316879 deleted file mode 100644 index a036183c95e6..000000000000 --- a/www/seamonkey/files/patch-bug1316879 +++ /dev/null @@ -1,13 +0,0 @@ -Don't use CPP/CXXCPP from environment after bug 1299919. r=glandium, a=jcristau - -diff --git build/buildconfig.py build/buildconfig.py -index bb12114b2f4a..e73903a1a981 100644 ---- mozilla/build/buildconfig.py -+++ mozilla/build/buildconfig.py -@@ -16,5 +16,5 @@ for var in ('topsrcdir', 'topobjdir', 'defines', 'non_global_defines', - substs = dict(substs) - - for var in os.environ: -- if var != 'SHELL' and var in substs: -+ if var not in ('CPP', 'CXXCPP', 'SHELL') and var in substs: - substs[var] = os.environ[var] diff --git a/www/seamonkey/files/patch-bug1318914 b/www/seamonkey/files/patch-bug1318914 deleted file mode 100644 index c3d16bfb982f..000000000000 --- a/www/seamonkey/files/patch-bug1318914 +++ /dev/null @@ -1,34 +0,0 @@ -commit 6dbb1148210e -Author: Mike Hommey <mh+mozilla@glandium.org> -Date: Sun Nov 20 17:51:17 2016 +0900 - - Bug 1318914 - Fix --with-system-libevent build against libevent 2.1. r=billm - - --HG-- - extra : rebase_source : da25767f6045507447f90ab03291c60a4f2c6b3d ---- - ipc/chromium/src/base/message_pump_libevent.cc | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git ipc/chromium/src/base/message_pump_libevent.cc ipc/chromium/src/base/message_pump_libevent.cc -index 2db827e5bade..3cca238c1e7c 100644 ---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc -+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc -@@ -22,9 +22,17 @@ - - // This macro checks that the _EVENT_SIZEOF_* constants defined in - // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct. -+#if defined(_EVENT_SIZEOF_SHORT) - #define CHECK_EVENT_SIZEOF(TYPE, type) \ - static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \ - "bad _EVENT_SIZEOF_"#TYPE); -+#elif defined(EVENT__SIZEOF_SHORT) -+#define CHECK_EVENT_SIZEOF(TYPE, type) \ -+ static_assert(EVENT__SIZEOF_##TYPE == sizeof(type), \ -+ "bad EVENT__SIZEOF_"#TYPE); -+#else -+#error Cannot find libevent type sizes -+#endif - - CHECK_EVENT_SIZEOF(LONG, long); - CHECK_EVENT_SIZEOF(LONG_LONG, long long); diff --git a/www/seamonkey/files/patch-bug1320991 b/www/seamonkey/files/patch-bug1320991 deleted file mode 100644 index ed0ed3be32ff..000000000000 --- a/www/seamonkey/files/patch-bug1320991 +++ /dev/null @@ -1,55 +0,0 @@ -commit 454e2dbe1b4f -Author: Mike Shal <mshal@mozilla.com> -Date: Tue Dec 20 16:37:18 2016 -0500 - - Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar; r?glandium - - The problem with the modules/libmar/tests/moz.build file when building - --with-system-nspr and --with-system-nss is that the nss libraries don't - exist in the tree, so they fail when trying to copy into the test - directory. - - However, it turns out that the libraries copied into the test directory - aren't even used when building with an in-tree copy, because the - xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we - use the dist/bin copies anyway for an in-tree build, we can stop copying - them into the test directory and simultaneously fix the --with-system - build. - - The DEFINES can also go away since this directory doesn't actually build - anything. - - MozReview-Commit-ID: Bk2f28wc9ZJ ---- - modules/libmar/tests/moz.build | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git modules/libmar/tests/moz.build modules/libmar/tests/moz.build -index ee72571b0c6b..9642553e8aa2 100644 ---- mozilla/modules/libmar/tests/moz.build -+++ mozilla/modules/libmar/tests/moz.build -@@ -6,24 +6,7 @@ - - XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] - --DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] -- - if CONFIG['OS_TARGET'] != 'Android': -- nss_files = ['nss3'] -- if not CONFIG['MOZ_FOLD_LIBS']: -- nss_files.extend([ -- 'nssutil3', -- 'plc4', -- 'nspr4', -- 'plds4', -- ]) -- TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted( -- ['!/dist/bin/%s%s%s' % ( -- CONFIG['DLL_PREFIX'], -- name, -- CONFIG['DLL_SUFFIX'], -- ) for name in nss_files] -- ) - TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [ - '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'], - ] diff --git a/www/seamonkey/files/patch-bug1322112 b/www/seamonkey/files/patch-bug1322112 deleted file mode 100644 index 684a79556518..000000000000 --- a/www/seamonkey/files/patch-bug1322112 +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/image/decoders/nsIconDecoder.cpp -+++ mozilla/image/decoders/nsIconDecoder.cpp -@@ -89,17 +89,18 @@ nsIconDecoder::ReadRowOfPixels(const cha - { - MOZ_ASSERT(aLength % 4 == 0, "Rows should contain a multiple of four bytes"); - - auto result = mPipe.WritePixels<uint32_t>([&]() -> NextPixel<uint32_t> { - if (aLength == 0) { - return AsVariant(WriteState::NEED_MORE_DATA); // Done with this row. - } - -- uint32_t pixel = *reinterpret_cast<const uint32_t*>(aData); -+ uint32_t pixel; -+ memcpy(&pixel, aData, 4); - aData += 4; - aLength -= 4; - - return AsVariant(pixel); - }); - - MOZ_ASSERT(result != WriteState::FAILURE); - - diff --git a/www/seamonkey/files/patch-bug1322660 b/www/seamonkey/files/patch-bug1322660 deleted file mode 100644 index 9944ae4109ce..000000000000 --- a/www/seamonkey/files/patch-bug1322660 +++ /dev/null @@ -1,80 +0,0 @@ ---- mozilla/modules/woff2/src/store_bytes.h -+++ mozilla/modules/woff2/src/store_bytes.h -@@ -29,41 +29,44 @@ inline size_t StoreU32(uint8_t* dst, size_t offset, uint32_t x) { - dst[offset + 1] = x >> 16; - dst[offset + 2] = x >> 8; - dst[offset + 3] = x; - return offset + 4; - } - - inline size_t Store16(uint8_t* dst, size_t offset, int x) { - #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + offset) = -- ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); -+ uint16_t v = ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); -+ memcpy(dst + offset, &v, 2); - #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + offset) = static_cast<uint16_t>(x); -+ uint16_t v = static_cast<uint16_t>(x); -+ memcpy(dst + offset, &v, 2); - #else - dst[offset] = x >> 8; - dst[offset + 1] = x; - #endif - return offset + 2; - } - - inline void StoreU32(uint32_t val, size_t* offset, uint8_t* dst) { - dst[(*offset)++] = val >> 24; - dst[(*offset)++] = val >> 16; - dst[(*offset)++] = val >> 8; - dst[(*offset)++] = val; - } - - inline void Store16(int val, size_t* offset, uint8_t* dst) { - #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + *offset) = -+ uint16_t v = ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); -+ memcpy(dst + *offset, &v, 2); - ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); - *offset += 2; - #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + *offset) = static_cast<uint16_t>(val); -+ uint16_t v = static_cast<uint16_t>(val); -+ memcpy(dst + *offset, &v, 2); - *offset += 2; - #else - dst[(*offset)++] = val >> 8; - dst[(*offset)++] = val; - #endif - } - - inline void StoreBytes(const uint8_t* data, size_t len, ---- mozilla/modules/woff2/src/woff2_common.cc -+++ mozilla/modules/woff2/src/woff2_common.cc -@@ -20,22 +20,23 @@ - - namespace woff2 { - - - uint32_t ComputeULongSum(const uint8_t* buf, size_t size) { - uint32_t checksum = 0; - size_t aligned_size = size & ~3; - for (size_t i = 0; i < aligned_size; i += 4) { -+ uint32_t v; -+ memcpy(&v, buf + i, 4); - #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) -- uint32_t v = *reinterpret_cast<const uint32_t*>(buf + i); - checksum += (((v & 0xFF) << 24) | ((v & 0xFF00) << 8) | - ((v & 0xFF0000) >> 8) | ((v & 0xFF000000) >> 24)); - #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) -- checksum += *reinterpret_cast<const uint32_t*>(buf + i); -+ checksum += v; - #else - checksum += (buf[i] << 24) | (buf[i + 1] << 16) | - (buf[i + 2] << 8) | buf[i + 3]; - #endif - } - - // treat size not aligned on 4 as if it were padded to 4 with 0's - if (size != aligned_size) { diff --git a/www/seamonkey/files/patch-bug1329520 b/www/seamonkey/files/patch-bug1329520 deleted file mode 100644 index 70c0728c5b65..000000000000 --- a/www/seamonkey/files/patch-bug1329520 +++ /dev/null @@ -1,154 +0,0 @@ -commit 8b0557b033b9 -Author: Dimitry Andric <dimitry> -Date: Fri Jan 27 13:55:00 2017 +0100 - - Bug 1329520 - Fix "memory/mozalloc/throw_gcc.h:35:1: note: declaration missing '[[noreturn]]' (libc++ 4.0)" r=nfroyd ---- - memory/mozalloc/throw_gcc.h | 47 ++++++++++++++++++++++++++++++--------------- - 1 file changed, 31 insertions(+), 16 deletions(-) - -diff --git memory/mozalloc/throw_gcc.h memory/mozalloc/throw_gcc.h -index 18027e04a4a3..4264df63d493 100644 ---- mozilla/memory/mozalloc/throw_gcc.h -+++ mozilla/memory/mozalloc/throw_gcc.h -@@ -19,104 +19,117 @@ - - #include "mozilla/mozalloc_abort.h" - -+// libc++ 4.0.0 and higher use C++11 [[noreturn]] attributes for the functions -+// below, and since clang does not allow mixing __attribute__((noreturn)) and -+// [[noreturn]], we have to explicitly use the latter here. See bug 1329520. -+#if defined(__clang__) -+# if __has_feature(cxx_attributes) && \ -+ defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 4000 -+# define MOZ_THROW_NORETURN [[noreturn]] -+# endif -+#endif -+#ifndef MOZ_THROW_NORETURN -+# define MOZ_THROW_NORETURN MOZ_NORETURN -+#endif -+ - namespace std { - - // NB: user code is not supposed to touch the std:: namespace. We're - // doing this after careful review because we want to define our own - // exception throwing semantics. Don't try this at home! - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_bad_exception(void) - { - mozalloc_abort("fatal: STL threw bad_exception"); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_bad_alloc(void) - { - mozalloc_abort("fatal: STL threw bad_alloc"); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_bad_cast(void) - { - mozalloc_abort("fatal: STL threw bad_cast"); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_bad_typeid(void) - { - mozalloc_abort("fatal: STL threw bad_typeid"); - } - - // used by <functional> --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_bad_function_call(void) - { - mozalloc_abort("fatal: STL threw bad_function_call"); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_logic_error(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_domain_error(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_invalid_argument(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_length_error(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_out_of_range(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_runtime_error(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_range_error(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_overflow_error(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_underflow_error(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_ios_failure(const char* msg) - { - mozalloc_abort(msg); - } - --MOZ_EXPORT MOZ_NORETURN MOZ_ALWAYS_INLINE void -+MOZ_THROW_NORETURN MOZ_EXPORT MOZ_ALWAYS_INLINE void - __throw_system_error(int err) - { - char error[128]; -@@ -127,4 +140,6 @@ __throw_system_error(int err) - - } // namespace std - -+#undef MOZ_THROW_NORETURN -+ - #endif // mozilla_throw_gcc_h diff --git a/www/seamonkey/files/patch-bug1330119 b/www/seamonkey/files/patch-bug1330119 deleted file mode 100644 index 17bf191ff961..000000000000 --- a/www/seamonkey/files/patch-bug1330119 +++ /dev/null @@ -1,13 +0,0 @@ -diff --git xpcom/reflect/xptcall/md/unix/moz.build xpcom/reflect/xptcall/md/unix/moz.build -index 019487bd69a2..a54026e70412 100644 ---- mozilla/xpcom/reflect/xptcall/md/unix/moz.build -+++ mozilla/xpcom/reflect/xptcall/md/unix/moz.build -@@ -151,7 +151,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD': - 'xptcstubs_netbsd_m68k.cpp' - ] - --if CONFIG['OS_ARCH'] == 'Linux': -+if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'): - if CONFIG['OS_TEST'] == 'aarch64': - SOURCES += [ - 'xptcinvoke_aarch64.cpp', diff --git a/www/seamonkey/files/patch-bug1336791 b/www/seamonkey/files/patch-bug1336791 deleted file mode 100644 index 04b014b8b361..000000000000 --- a/www/seamonkey/files/patch-bug1336791 +++ /dev/null @@ -1,21 +0,0 @@ -# Allow readelf to print types without parentheses - ---- mozilla/toolkit/library/dependentlibs.py -+++ mozilla/toolkit/library/dependentlibs.py -@@ -57,11 +57,15 @@ def dependentlibs_readelf(lib): - for line in proc.stdout: - # Each line has the following format: - # tag (TYPE) value -+ # or with BSD readelf: -+ # tag TYPE value - # Looking for NEEDED type entries - tmp = line.split(' ', 3) -- if len(tmp) > 3 and tmp[2] == '(NEEDED)': -+ if len(tmp) > 3 and 'NEEDED' in tmp[2]: - # NEEDED lines look like: - # 0x00000001 (NEEDED) Shared library: [libname] -+ # or with BSD readelf: -+ # 0x00000001 NEEDED Shared library: [libname] - match = re.search('\[(.*)\]', tmp[3]) - if match: - deps.append(match.group(1)) diff --git a/www/seamonkey/files/patch-bug1338655 b/www/seamonkey/files/patch-bug1338655 index f08b07cf062f..2471ca987e12 100644 --- a/www/seamonkey/files/patch-bug1338655 +++ b/www/seamonkey/files/patch-bug1338655 @@ -35,21 +35,21 @@ diff --git media/libstagefright/binding/mp4parse-cargo.patch media/libstagefrigh index 1dd13d20472a..bfa0ab74b424 100644 --- mozilla/media/libstagefright/binding/mp4parse-cargo.patch +++ mozilla/media/libstagefright/binding/mp4parse-cargo.patch -@@ -2,12 +2,13 @@ diff --git a/media/libstagefright/binding/mp4parse_cap - index 5092cd7..ecbc8c0 100644 +@@ -25,12 +25,13 @@ diff --git a/media/libstagefright/binding/mp4parse_cap + index aeeebc65..5c0836a 100644 --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml --@@ -17,15 +17,7 @@ exclude = [ -+@@ -17,4 +17,4 @@ exclude = [ +-@@ -18,17 +18,9 @@ exclude = [ ++@@ -18,17 +18,11 @@ exclude = [ "*.mp4", ] -build = "build.rs" -- ++build = false -+ ++ [dependencies] - "mp4parse" = {version = "0.5.1", path = "../mp4parse"} + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} diff --git media/libstagefright/binding/mp4parse_capi/Cargo.toml media/libstagefright/binding/mp4parse_capi/Cargo.toml index aee7ee947151..d7e3f55119d3 100644 diff --git a/www/seamonkey/files/patch-bug1359142 b/www/seamonkey/files/patch-bug1359142 deleted file mode 100644 index 6e5fc6e67dd5..000000000000 --- a/www/seamonkey/files/patch-bug1359142 +++ /dev/null @@ -1,57 +0,0 @@ -Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs - -diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp -index 1ab76eeb4bd9..bcdff0487837 100644 ---- mozilla/js/src/asmjs/WasmSignalHandlers.cpp -+++ mozilla/js/src/asmjs/WasmSignalHandlers.cpp -@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault - # define R12_sig(p) ((p)->sc_r12) - # define R13_sig(p) ((p)->sc_r13) - # define R14_sig(p) ((p)->sc_r14) --# define R15_sig(p) ((p)->sc_r15) -+# if defined(__arm__) -+# define R15_sig(p) ((p)->sc_pc) -+# else -+# define R15_sig(p) ((p)->sc_r15) -+# endif -+# if defined(__aarch64__) -+# define EPC_sig(p) ((p)->sc_elr) -+# define RFP_sig(p) ((p)->sc_x[29]) -+# endif -+# if defined(__mips__) -+# define EPC_sig(p) ((p)->sc_pc) -+# define RFP_sig(p) ((p)->sc_regs[30]) -+# endif - #elif defined(__linux__) || defined(SOLARIS) - # if defined(__linux__) - # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) -@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault - # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13]) - # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14]) - # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15]) -+# if defined(__aarch64__) -+# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) -+# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29]) -+# endif -+# if defined(__mips__) -+# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) -+# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) -+# endif - #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - # if defined(__DragonFly__) - # define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) -@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault - # else - # define R15_sig(p) ((p)->uc_mcontext.mc_r15) - # endif -+# if defined(__FreeBSD__) && defined(__aarch64__) -+# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr) -+# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29]) -+# endif -+# if defined(__FreeBSD__) && defined(__mips__) -+# define EPC_sig(p) ((p)->uc_mcontext.mc_pc) -+# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) -+# endif - #elif defined(XP_DARWIN) - # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip) - # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp) diff --git a/www/seamonkey/files/patch-bug757366 b/www/seamonkey/files/patch-bug757366 deleted file mode 100644 index 7a21b9ba111a..000000000000 --- a/www/seamonkey/files/patch-bug757366 +++ /dev/null @@ -1,58 +0,0 @@ -commit 2a3be4b384b9 -Author: Jonathan Kew <jkew@mozilla.com> -Date: Mon Sep 26 18:05:14 2016 +0100 - - Bug 757366 - Don't cast pointers to 'name'-table data to uint16_t*, as they may not be 16-bit-aligned. r=jrmuizel ---- - gfx/thebes/gfxFontUtils.cpp | 26 ++++++++++++++------------ - 1 file changed, 14 insertions(+), 12 deletions(-) - -diff --git gfx/thebes/gfxFontUtils.cpp gfx/thebes/gfxFontUtils.cpp -index 526e17d..cb505e8 100644 ---- mozilla/gfx/thebes/gfxFontUtils.cpp -+++ mozilla/gfx/thebes/gfxFontUtils.cpp -@@ -918,16 +918,18 @@ IsValidSFNTVersion(uint32_t version) - version == TRUETYPE_TAG('t','r','u','e'); - } - --// copy and swap UTF-16 values, assume no surrogate pairs, can be in place -+// Copy and swap UTF-16 values, assume no surrogate pairs, can be in place. -+// aInBuf and aOutBuf are NOT necessarily 16-bit-aligned, so we should avoid -+// accessing them directly as uint16_t* values. -+// aLen is count of UTF-16 values, so the byte buffers are twice that. - static void --CopySwapUTF16(const uint16_t *aInBuf, uint16_t *aOutBuf, uint32_t aLen) -+CopySwapUTF16(const char* aInBuf, char* aOutBuf, uint32_t aLen) - { -- const uint16_t *end = aInBuf + aLen; -+ const char* end = aInBuf + aLen * 2; - while (aInBuf < end) { -- uint16_t value = *aInBuf; -- *aOutBuf = (value >> 8) | (value & 0xff) << 8; -- aOutBuf++; -- aInBuf++; -+ uint8_t b0 = *aInBuf++; -+ *aOutBuf++ = *aInBuf++; -+ *aOutBuf++ = b0; - } - } - -@@ -1446,13 +1448,13 @@ gfxFontUtils::DecodeFontName(const char *aNameData, int32_t aByteLen, - if (csName[0] == 0) { - // empty charset name: data is utf16be, no need to instantiate a converter - uint32_t strLen = aByteLen / 2; --#ifdef IS_LITTLE_ENDIAN - aName.SetLength(strLen); -- CopySwapUTF16(reinterpret_cast<const uint16_t*>(aNameData), -- reinterpret_cast<uint16_t*>(aName.BeginWriting()), strLen); -+#ifdef IS_LITTLE_ENDIAN -+ CopySwapUTF16(aNameData, reinterpret_cast<char*>(aName.BeginWriting()), -+ strLen); - #else -- aName.Assign(reinterpret_cast<const char16_t*>(aNameData), strLen); --#endif -+ memcpy(aName.BeginWriting(), aNameData, strLen * 2); -+#endif - return true; - } - diff --git a/www/seamonkey/files/patch-bug826985 b/www/seamonkey/files/patch-bug826985 index baa2f786c3c1..2453978e69e0 100644 --- a/www/seamonkey/files/patch-bug826985 +++ b/www/seamonkey/files/patch-bug826985 @@ -67,7 +67,7 @@ diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_lin index 239a292..bab496c 100644 --- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -@@ -25,10 +25,21 @@ +@@ -25,6 +25,9 @@ #else #include <linux/videodev2.h> #endif @@ -77,6 +77,9 @@ index 239a292..bab496c 100644 #include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/trace.h" +@@ -34,6 +37,15 @@ + #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) ) + #endif +#ifdef HAVE_LIBV4L2 +#define open v4l2_open @@ -86,10 +89,11 @@ index 239a292..bab496c 100644 +#define mmap v4l2_mmap +#define munmap v4l2_munmap +#endif - ++ namespace webrtc { -@@ -130,6 +142,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDeviceName( + namespace videocapturemodule +@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName( memset(deviceNameUTF8, 0, deviceNameLength); memcpy(cameraName, cap.card, sizeof(cap.card)); diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568 index 4eaeef626ced..5becc65ac514 100644 --- a/www/seamonkey/files/patch-bug847568 +++ b/www/seamonkey/files/patch-bug847568 @@ -1,26 +1,26 @@ # Allow building against system-wide graphite2/harfbuzz. diff --git config/Makefile.in config/Makefile.in -index 10807cf..f4b8587 100644 +index e2e11dc0e27e..a6206bb0ff30 100644 --- mozilla/config/Makefile.in +++ mozilla/config/Makefile.in -@@ -49,6 +49,8 @@ export:: $(export-preqs) - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ - -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ +@@ -41,6 +41,8 @@ export:: $(export-preqs) + $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ + -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ + -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ + -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \ + -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - $(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers - $(INSTALL) system_wrappers $(DIST) - + -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ + -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ + -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ diff --git config/system-headers config/system-headers -index 48afa0f..61612f6 100644 +index a0c53c651a3e..5ee7f71f9634 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers -@@ -1331,3 +1331,12 @@ unicode/utypes.h +@@ -1269,6 +1269,15 @@ libsn/sn-launcher.h + libsn/sn-monitor.h + libsn/sn-util.h #endif - libutil.h - unwind.h +#if MOZ_SYSTEM_GRAPHITE2==1 +graphite2/Font.h +graphite2/Segment.h @@ -30,11 +30,14 @@ index 48afa0f..61612f6 100644 +harfbuzz/hb-ot.h +harfbuzz/hb.h +#endif + #if MOZ_SYSTEM_HUNSPELL==1 + hunspell.hxx + #endif diff --git dom/base/moz.build dom/base/moz.build -index 6e0d4f5..0770717 100644 +index 8e19020315ae..2fcdbb6f7b42 100644 --- mozilla/dom/base/moz.build +++ mozilla/dom/base/moz.build -@@ -457,6 +457,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +@@ -464,6 +464,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: if CONFIG['MOZ_X11']: CXXFLAGS += CONFIG['TK_CFLAGS'] @@ -45,7 +48,7 @@ index 6e0d4f5..0770717 100644 'PropertyUseCounterMap.inc', 'UseCounterList.h', diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh -index faaab1b..04eff5f 100644 +index faaab1b17971..04eff5f09882 100644 --- mozilla/gfx/graphite2/moz-gr-update.sh +++ mozilla/gfx/graphite2/moz-gr-update.sh @@ -1,6 +1,7 @@ @@ -75,23 +78,23 @@ index faaab1b..04eff5f 100644 echo echo If gfx/graphite2/src/files.mk has changed, please make corresponding diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla -index 24e6cbb..0b7a5df 100644 +index 22c76a7df020..a01490bd49ee 100644 --- mozilla/gfx/harfbuzz/README-mozilla +++ mozilla/gfx/harfbuzz/README-mozilla -@@ -20,3 +20,8 @@ the mozilla tree. +@@ -19,3 +19,8 @@ the mozilla tree. If the collection of source files changes, manual updates to moz.build may be needed, as we don't use the upstream makefiles. + +The in-tree copy may be omitted during build by --with-system-harfbuzz. -+Make sure to keep pkg-config version check within old-configure.in in sync ++Make sure to keep pkg-config version check within toolkit/moz.configure 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 2509198..5cc4663 100644 +index 771f652e837a..3b358d84e384 100644 --- mozilla/gfx/moz.build +++ mozilla/gfx/moz.build -@@ -7,6 +7,12 @@ +@@ -10,6 +10,12 @@ with Files('**'): if CONFIG['MOZ_TREE_CAIRO']: DIRS += ['cairo'] @@ -104,7 +107,7 @@ index 2509198..5cc4663 100644 DIRS += [ '2d', 'ycbcr', -@@ -15,8 +21,6 @@ DIRS += [ +@@ -18,8 +24,6 @@ DIRS += [ 'qcms', 'gl', 'layers', @@ -114,57 +117,57 @@ index 2509198..5cc4663 100644 'thebes', 'ipc', diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py -index ab1365f..8897c27 100755 +index e06ae3457a47..93faa61594a3 100755 --- mozilla/gfx/skia/generate_mozbuild.py +++ mozilla/gfx/skia/generate_mozbuild.py -@@ -140,6 +140,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -143,6 +143,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: '-Wno-unused-private-field', ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'): + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git gfx/skia/moz.build gfx/skia/moz.build -index a2f914b..d3759b0 100644 +index 2118677ca3a8..e4978b413784 100644 --- mozilla/gfx/skia/moz.build +++ mozilla/gfx/skia/moz.build -@@ -664,6 +664,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -753,6 +753,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: '-Wno-unused-private-field', ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'): + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git gfx/thebes/moz.build gfx/thebes/moz.build -index bbbce6fd..db0ceb1 100644 +index dee9b7bfa2cb..bd801f3a468e 100644 --- mozilla/gfx/thebes/moz.build +++ mozilla/gfx/thebes/moz.build -@@ -289,7 +289,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): +@@ -273,7 +273,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] -DEFINES['GRAPHITE2_STATIC'] = True -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] +else: + DEFINES['GRAPHITE2_STATIC'] = True ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] if CONFIG['CLANG_CXX']: # Suppress warnings from Skia header files. diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build -index 9754753..768cc7d 100644 +index cb1233c56d7e..06fb1f9f174b 100644 --- mozilla/intl/unicharutil/util/moz.build +++ mozilla/intl/unicharutil/util/moz.build -@@ -42,4 +42,7 @@ if CONFIG['_MSC_VER']: +@@ -40,4 +40,7 @@ if CONFIG['_MSC_VER']: if CONFIG['ENABLE_INTL_API']: USE_LIBS += ['icu'] @@ -172,46 +175,11 @@ index 9754753..768cc7d 100644 + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + DIST_INSTALL = True -diff --git moz.configure moz.configure -index e762576..196dafd 100644 ---- mozilla/moz.configure -+++ mozilla/moz.configure -@@ -216,6 +216,30 @@ check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'), - check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'), - allow_missing=True) - -+option('--with-system-graphite2', -+ help="Use system graphite2 (located with pkgconfig)") -+ -+@depends('--with-system-graphite2', compile_environment) -+def check_for_graphite2(value, compile_env): -+ return value and compile_env -+ -+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', -+ check_for_graphite2) -+ -+set_config('MOZ_SYSTEM_GRAPHITE2', system_graphite2) -+ -+option('--with-system-harfbuzz', -+ help="Use system harfbuzz (located with pkgconfig)") -+ -+@depends('--with-system-harfbuzz', compile_environment) -+def check_for_harfbuzz(value, compile_env): -+ return value and compile_env -+ -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.0', -+ check_for_harfbuzz) -+ -+set_config('MOZ_SYSTEM_HARFBUZZ', system_harfbuzz) -+ - option('--enable-system-hunspell', - help="Use system hunspell (located with pkgconfig)") - diff --git netwerk/dns/moz.build netwerk/dns/moz.build -index f788d9a..5662301 100644 +index 79c26e3e7001..c4d93bc5f7dc 100644 --- mozilla/netwerk/dns/moz.build +++ mozilla/netwerk/dns/moz.build -@@ -66,6 +66,9 @@ LOCAL_INCLUDES += [ +@@ -69,6 +69,9 @@ LOCAL_INCLUDES += [ '/netwerk/base', ] @@ -222,11 +190,11 @@ index f788d9a..5662301 100644 DEFINES['IDNA2008'] = True USE_LIBS += ['icu'] diff --git old-configure.in old-configure.in -index 0070d48..9d1129f 100644 +index 95a58b634593..b614eef85c89 100644 --- mozilla/old-configure.in +++ mozilla/old-configure.in -@@ -5764,6 +5764,27 @@ if test "$USE_FC_FREETYPE"; then - fi +@@ -4888,6 +4888,27 @@ dnl ======================================================== + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) dnl ======================================================== +dnl Check for graphite2 @@ -254,10 +222,10 @@ index 0070d48..9d1129f 100644 dnl ======================================================== diff --git toolkit/library/moz.build toolkit/library/moz.build -index a3d5450..2c684a7e 100644 +index 24f940e1ed7e..079a575adec3 100644 --- mozilla/toolkit/library/moz.build +++ mozilla/toolkit/library/moz.build -@@ -217,6 +217,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: +@@ -228,6 +228,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: if CONFIG['MOZ_SYSTEM_PNG']: OS_LIBS += CONFIG['MOZ_PNG_LIBS'] @@ -270,3 +238,34 @@ index a3d5450..2c684a7e 100644 if CONFIG['MOZ_SYSTEM_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] +diff --git toolkit/moz.configure toolkit/moz.configure +index 9297e4d6f501..d8e273887e4b 100644 +--- mozilla/toolkit/moz.configure ++++ mozilla/toolkit/moz.configure +@@ -343,6 +343,26 @@ add_old_configure_assignment('FT2_LIBS', + add_old_configure_assignment('FT2_CFLAGS', + delayed_getattr(ft2_info, 'cflags')) + ++# Graphite2 ++# ============================================================== ++option('--with-system-graphite2', ++ help="Use system graphite2 (located with pkgconfig)") ++ ++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', ++ when='--with-system-graphite2') ++ ++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) ++ ++# HarfBuzz ++# ============================================================== ++option('--with-system-harfbuzz', ++ help="Use system harfbuzz (located with pkgconfig)") ++ ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.1', ++ when='--with-system-harfbuzz') ++ ++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) ++ + # Apple platform decoder support + # ============================================================== + @depends(toolkit) diff --git a/www/seamonkey/files/patch-bug981348 b/www/seamonkey/files/patch-bug981348 index 99143321c9c4..3e8848868cd9 100644 --- a/www/seamonkey/files/patch-bug981348 +++ b/www/seamonkey/files/patch-bug981348 @@ -1,8 +1,28 @@ diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp -index 4b21361..cb3be32 100644 +index 88bba9baa401..99f240952dfe 100644 --- mozilla/dom/system/OSFileConstants.cpp +++ mozilla/dom/system/OSFileConstants.cpp -@@ -662,7 +662,7 @@ +@@ -16,14 +16,17 @@ + #include "dirent.h" + #include "poll.h" + #include "sys/stat.h" +-#if defined(ANDROID) ++#if defined(XP_LINUX) + #include <sys/vfs.h> + #define statvfs statfs ++#define f_frsize f_bsize + #else + #include "sys/statvfs.h" ++#endif // defined(XP_LINUX) ++#if !defined(ANDROID) + #include "sys/wait.h" + #include <spawn.h> +-#endif // defined(ANDROID) ++#endif // !defined(ANDROID) + #endif // defined(XP_UNIX) + + #if defined(XP_LINUX) +@@ -699,7 +702,7 @@ static const dom::ConstantSpec gLibcProperties[] = { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) }, @@ -12,7 +32,7 @@ index 4b21361..cb3be32 100644 #endif // defined(XP_UNIX) diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm -index b59fca4..0cf220b 100644 +index a028dda7d5ec..f5c632e3d7e5 100644 --- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm +++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm @@ -228,8 +228,8 @@ @@ -27,11 +47,11 @@ index b59fca4..0cf220b 100644 "f_bavail", Type.fsblkcnt_t.implementation); diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm -index 99e5e9b..de642c5 100644 +index bd60d4d8419c..a8cd6b546b0e 100644 --- mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm +++ mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm -@@ -373,7 +373,7 @@ - throw_on_negative("statvfs", UnixFile.statvfs(sourcePath, fileSystemInfoPtr)); +@@ -399,7 +399,7 @@ + throw_on_negative("statvfs", (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr)); let bytes = new Type.uint64_t.implementation( - fileSystemInfo.f_bsize * fileSystemInfo.f_bavail); diff --git a/www/seamonkey/files/patch-env-api-keys b/www/seamonkey/files/patch-env-api-keys index 11c31cb09f6a..79ef822b0761 100644 --- a/www/seamonkey/files/patch-env-api-keys +++ b/www/seamonkey/files/patch-env-api-keys @@ -10,10 +10,10 @@ def keyfile(value): if value: try: -@@ -29,7 +30,7 @@ def keyfile(desc, help=None, callback=lambda x: x): - raise - except IOError: - pass +@@ -28,7 +29,7 @@ def keyfile(desc, help=None, callback=lambda x: x): + raise FatalCheckError("'%s' is empty." % value[0]) + except IOError as e: + raise FatalCheckError("'%s': %s." % (value[0], e.strerror)) - return no_key + return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422 index e96e659421c3..e7f14c0a473c 100644 --- a/www/seamonkey/files/patch-z-bug517422 +++ b/www/seamonkey/files/patch-z-bug517422 @@ -1,10 +1,10 @@ # Allow more config/external/ libs built against system-wide version. diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index 42ab554..c91df3d 100644 +index d0fe7accffe6..c46bdd023225 100644 --- mozilla/build/moz.configure/old.configure +++ mozilla/build/moz.configure/old.configure -@@ -320,7 +320,12 @@ def old_configure_options(*options): +@@ -288,7 +288,12 @@ def old_configure_options(*options): '--with-system-libvpx', '--with-system-nspr', '--with-system-nss', @@ -18,13 +18,13 @@ index 42ab554..c91df3d 100644 '--with-thumb', '--with-thumb-interwork', diff --git config/Makefile.in config/Makefile.in -index 5383399..0410004 100644 +index a6206bb0ff30..f20987c61754 100644 --- mozilla/config/Makefile.in +++ mozilla/config/Makefile.in @@ -51,6 +51,11 @@ export:: $(export-preqs) + -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ + -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ - -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \ - -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ + -DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \ + -DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \ + -DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \ @@ -34,12 +34,12 @@ index 5383399..0410004 100644 $(INSTALL) system_wrappers $(DIST) diff --git config/external/moz.build config/external/moz.build -index f67c5c7..eb909ce 100644 +index 029ff8504795..2c3a40caa1ba 100644 --- mozilla/config/external/moz.build +++ mozilla/config/external/moz.build -@@ -20,12 +20,21 @@ if CONFIG['MOZ_UPDATER']: - # There's no "native brotli" yet, but probably in the future... +@@ -21,12 +21,21 @@ if CONFIG['MOZ_UPDATER']: external_dirs += ['modules/brotli'] + external_dirs += ['modules/woff2'] -if CONFIG['MOZ_VORBIS']: +if not CONFIG['MOZ_SYSTEM_OGG']: @@ -61,7 +61,7 @@ index f67c5c7..eb909ce 100644 if CONFIG['MOZ_WEBM_ENCODER']: external_dirs += ['media/libmkv'] -@@ -51,12 +60,9 @@ external_dirs += [ +@@ -52,12 +61,9 @@ external_dirs += [ 'media/kiss_fft', 'media/libcubeb', 'media/libnestegg', @@ -71,17 +71,17 @@ index f67c5c7..eb909ce 100644 'media/libspeex_resampler', 'media/libstagefright', - 'media/libsoundtouch', + 'media/psshparser' ] - DIRS += ['../../' + i for i in external_dirs] diff --git config/system-headers config/system-headers -index bef567c..9807c29 100644 +index 5ee7f71f9634..13178ac3b3ab 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers -@@ -1364,3 +1363,17 @@ graphite2/Segment.h - harfbuzz/hb-ot.h - harfbuzz/hb.h - #endif +@@ -1348,3 +1348,17 @@ unicode/utypes.h + libutil.h + unwind.h + fenv.h +#if MOZ_SYSTEM_OGG==1 +ogg/ogg.h +ogg/os_types.h @@ -96,128 +96,12 @@ index bef567c..9807c29 100644 +#if MOZ_SYSTEM_TREMOR==1 +tremor/ivorbiscodec.h +#endif -diff --git old-configure.in configure.in -index 87db361..7947626 100644 ---- mozilla/old-configure.in -+++ mozilla/old-configure.in -@@ -5401,6 +5401,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then - fi - fi - -+dnl ======================================================== -+dnl Check for libogg -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-ogg, -+[ --with-system-ogg Use system libogg (located with pkgconfig)], -+MOZ_SYSTEM_OGG=1, -+MOZ_SYSTEM_OGG=) -+ -+if test -n "$MOZ_SYSTEM_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_SYSTEM_OGG) -+ -+dnl ======================================================== -+dnl Check for libvorbis -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-vorbis, -+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], -+MOZ_SYSTEM_VORBIS=1, -+MOZ_SYSTEM_VORBIS=) -+ -+if test -n "$MOZ_SYSTEM_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_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_SYSTEM_TREMOR=1, -+MOZ_SYSTEM_TREMOR=) -+ -+if test -n "$MOZ_SYSTEM_TREMOR"; then -+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_TREMOR) -+ -+dnl ======================================================== -+dnl Check for libtheora -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-theora, -+[ --with-system-theora Use system libtheora (located with pkgconfig)], -+MOZ_SYSTEM_THEORA=1, -+MOZ_SYSTEM_THEORA=) -+ -+if test -n "$MOZ_SYSTEM_THEORA"; then -+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_THEORA) -+ -+dnl ======================================================== -+dnl Check for libSoundTouch -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-soundtouch, -+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], -+MOZ_SYSTEM_SOUNDTOUCH=1, -+MOZ_SYSTEM_SOUNDTOUCH=) -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.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 <SoundTouch.h> -+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES -+ #error soundtouch expects float samples -+ #endif], -+ [], -+ [ac_cv_soundtouch_sample_type=short], -+ [ac_cv_soundtouch_sample_type=float])]) -+ CXXFLAGS=$_SAVE_CXXFLAGS -+ AC_LANG_RESTORE -+ -+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ -+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then -+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) -+ fi -+fi -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) -+fi -+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) -+ - dnl system libvpx Support - dnl ======================================================== - MOZ_ARG_WITH_BOOL(system-libvpx, diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp -index 2127256..1ec09fe 100644 +index 93ecda4319af..ff674c64ea07 100644 --- mozilla/dom/media/AudioStream.cpp +++ mozilla/dom/media/AudioStream.cpp -@@ -125,7 +125,9 @@ AudioStream::AudioStream(DataSource& aSo - , mOutRate(0) +@@ -115,7 +115,9 @@ AudioStream::AudioStream(DataSource& aSource) + : mMonitor("AudioStream") , mChannels(0) , mOutChannels(0) +#ifndef MOZ_SYSTEM_SOUNDTOUCH @@ -226,7 +110,7 @@ index 2127256..1ec09fe 100644 , mDumpFile(nullptr) , mState(INITIALIZED) , mDataSource(aSource) -@@ -152,9 +154,11 @@ AudioStream::~AudioStream() +@@ -130,9 +132,11 @@ AudioStream::~AudioStream() if (mDumpFile) { fclose(mDumpFile); } @@ -238,7 +122,7 @@ index 2127256..1ec09fe 100644 } size_t -@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretche +@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() { mMonitor.AssertCurrentThreadOwns(); if (!mTimeStretcher) { @@ -251,11 +135,11 @@ index 2127256..1ec09fe 100644 mTimeStretcher->setChannels(mOutChannels); mTimeStretcher->setPitch(1.0); diff --git dom/media/AudioStream.h dom/media/AudioStream.h -index a552e3e..02b80b1 100644 +index 7dc1f60f95cc..67d402a4117f 100644 --- mozilla/dom/media/AudioStream.h +++ mozilla/dom/media/AudioStream.h -@@ -15,7 +15,11 @@ - #include "mozilla/RefPtr.h" +@@ -16,7 +16,11 @@ + #include "mozilla/TimeStamp.h" #include "mozilla/UniquePtr.h" #include "CubebUtils.h" +#ifdef MOZ_SYSTEM_SOUNDTOUCH @@ -266,9 +150,9 @@ index a552e3e..02b80b1 100644 namespace mozilla { -@@ -277,7 +277,11 @@ private: - // Number of frames written to the buffers. - int64_t mWritten; +@@ -287,7 +291,11 @@ private: + uint32_t mChannels; + uint32_t mOutChannels; AudioClock mAudioClock; +#ifdef MOZ_SYSTEM_SOUNDTOUCH + nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher; @@ -276,13 +160,13 @@ index a552e3e..02b80b1 100644 soundtouch::SoundTouch* mTimeStretcher; +#endif - // Stream start time for stream open delay telemetry. - TimeStamp mStartTime; + // Output file for dumping audio + FILE* mDumpFile; diff --git dom/media/moz.build dom/media/moz.build -index 7526cff..e0a0ca0 100644 +index 86b051c58d33..fb6186dce78b 100644 --- mozilla/dom/media/moz.build +++ mozilla/dom/media/moz.build -@@ -300,6 +300,21 @@ if CONFIG['MOZ_WEBRTC']: +@@ -308,6 +308,21 @@ if CONFIG['MOZ_WEBRTC']: DEFINES['MOZILLA_INTERNAL_API'] = True @@ -304,11 +188,50 @@ index 7526cff..e0a0ca0 100644 if CONFIG['OS_TARGET'] == 'WINNT': DEFINES['WEBRTC_WIN'] = True else: +diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp +index 078f6ea5ef60..c600db067539 100644 +--- mozilla/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp ++++ mozilla/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp +@@ -11,9 +11,13 @@ + #include "prmem.h" + #include "prlink.h" + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++#include "nsXPCOMPrivate.h" // for XUL_DLL ++#else + // We use a known symbol located in lgpllibs to determine its location. + // soundtouch happens to be always included in lgpllibs + #include "soundtouch/SoundTouch.h" ++#endif + + namespace mozilla { + +@@ -50,6 +54,12 @@ FFVPXRuntimeLinker::Init() + + sLinkStatus = LinkStatus_FAILED; + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ // We retrieve the path of the XUL library as this is where mozavcodec and ++ // mozavutil libs are located. ++ char* path = ++ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); ++#else + // We retrieve the path of the lgpllibs library as this is where mozavcodec + // and mozavutil libs are located. + char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs"); +@@ -60,6 +70,7 @@ FFVPXRuntimeLinker::Init() + PR_GetLibraryFilePathname(lgpllibsname, + (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); + PR_FreeLibraryName(lgpllibsname); ++#endif + if (!path) { + return false; + } diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA -index 0833e4d..7ece97b 100644 +index 6213fdc7770c..ada799916a17 100644 --- mozilla/media/libogg/README_MOZILLA +++ mozilla/media/libogg/README_MOZILLA -@@ -6,3 +6,6 @@ The svn revision number used was r17287. +@@ -6,3 +6,6 @@ package downloaded from xiph.org and copied using the update.sh script. 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 @@ -316,7 +239,7 @@ index 0833e4d..7ece97b 100644 +The in-tree copy may be omitted during build by --with-system-ogg. +Keep version in old-configure.in in sync on updates. diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA -index bfd4b1a..15b158d 100644 +index dc0dbe8f6886..ea73b55e3e39 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, @@ -326,7 +249,7 @@ index bfd4b1a..15b158d 100644 +The in-tree copy may be omitted during build by --with-system-soundtouch. +Keep version in old-configure.in in sync on updates. diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h -index 0af2fe6..d80c145 100644 +index 0af2fe618311..10973564e7a4 100644 --- mozilla/media/libsoundtouch/src/soundtouch_perms.h +++ mozilla/media/libsoundtouch/src/soundtouch_perms.h @@ -12,7 +12,9 @@ @@ -340,7 +263,7 @@ index 0af2fe6..d80c145 100644 #endif // MOZILLA_SOUNDTOUCH_PERMS_H diff --git media/libtheora/README_MOZILLA media/libtheora/README_MOZILLA -index d48dbfa..f08a2ed 100644 +index d48dbfa6f63d..6f30f250220e 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, @@ -351,10 +274,10 @@ index d48dbfa..f08a2ed 100644 +The in-tree copy may be omitted during build by --with-system-theora. +Keep version in old-configure.in in sync on updates. diff --git media/libtheora/moz.build media/libtheora/moz.build -index 14265b1..3069e99 100644 +index c7f85eebff95..aae7b814adb5 100644 --- mozilla/media/libtheora/moz.build +++ mozilla/media/libtheora/moz.build -@@ -21,6 +21,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']: +@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias' # The encoder is currently not included. DEFINES['THEORA_DISABLE_ENCODE'] = True @@ -362,10 +285,10 @@ index 14265b1..3069e99 100644 + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] + # Suppress warnings in third-party code. - if CONFIG['GNU_CC']: + if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: CFLAGS += ['-Wno-type-limits'] diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA -index ee67b53..3f34a09 100644 +index ee67b53a05c5..81c971773d55 100644 --- mozilla/media/libtremor/README_MOZILLA +++ mozilla/media/libtremor/README_MOZILLA @@ -5,3 +5,6 @@ Makefile.in files for the Mozilla build system. @@ -376,20 +299,20 @@ index ee67b53..3f34a09 100644 +The in-tree copy may be omitted during build by --with-system-tremor. +Keep version in old-configure.in in sync on updates. diff --git media/libtremor/moz.build media/libtremor/moz.build -index 31831ba..a03d576 100644 +index 83afc8e37c64..71ef159da3d7 100644 --- mozilla/media/libtremor/moz.build +++ mozilla/media/libtremor/moz.build -@@ -6,3 +6,5 @@ +@@ -9,3 +9,5 @@ with Files('*'): DIRS += ['include/tremor', 'lib'] +if CONFIG['MOZ_SYSTEM_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA -index 7c7454c..55baedd 100644 +index 1211ac074b33..eb31084aed25 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 +@@ -8,3 +8,6 @@ https://svn.xiph.org/tags/vorbis/libvorbis-1.3.5@19464 Some files are renamed during the copy to prevent clashes with object file names with other Mozilla libraries. @@ -397,21 +320,137 @@ index 7c7454c..55baedd 100644 +The in-tree copy may be omitted during build by --with-system-vorbis. +Keep version in old-configure.in in sync on updates. diff --git media/libvorbis/moz.build media/libvorbis/moz.build -index 919b99e..cc776f7 100644 +index adf393782cc9..923b76231107 100644 --- mozilla/media/libvorbis/moz.build +++ mozilla/media/libvorbis/moz.build -@@ -55,3 +55,6 @@ FINAL_LIBRARY = 'gkmedias' +@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias' # Suppress warnings in third-party code. if CONFIG['GNU_CC']: CFLAGS += ['-Wno-uninitialized'] + +if CONFIG['MOZ_SYSTEM_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] +diff --git old-configure.in old-configure.in +index b614eef85c89..85f9099dba4d 100644 +--- mozilla/old-configure.in ++++ mozilla/old-configure.in +@@ -2941,6 +2941,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then + fi + fi + ++dnl ======================================================== ++dnl Check for libogg ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-ogg, ++[ --with-system-ogg Use system libogg (located with pkgconfig)], ++MOZ_SYSTEM_OGG=1, ++MOZ_SYSTEM_OGG=) ++ ++if test -n "$MOZ_SYSTEM_OGG"; then ++ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.0) ++ ++ _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_SYSTEM_OGG) ++ ++dnl ======================================================== ++dnl Check for libvorbis ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-vorbis, ++[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], ++MOZ_SYSTEM_VORBIS=1, ++MOZ_SYSTEM_VORBIS=) ++ ++if test -n "$MOZ_SYSTEM_VORBIS"; then ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_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_SYSTEM_TREMOR=1, ++MOZ_SYSTEM_TREMOR=) ++ ++if test -n "$MOZ_SYSTEM_TREMOR"; then ++ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_TREMOR) ++ ++dnl ======================================================== ++dnl Check for libtheora ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-theora, ++[ --with-system-theora Use system libtheora (located with pkgconfig)], ++MOZ_SYSTEM_THEORA=1, ++MOZ_SYSTEM_THEORA=) ++ ++if test -n "$MOZ_SYSTEM_THEORA"; then ++ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_THEORA) ++ ++dnl ======================================================== ++dnl Check for libSoundTouch ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-soundtouch, ++[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], ++MOZ_SYSTEM_SOUNDTOUCH=1, ++MOZ_SYSTEM_SOUNDTOUCH=) ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.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 <SoundTouch.h> ++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES ++ #error soundtouch expects float samples ++ #endif], ++ [], ++ [ac_cv_soundtouch_sample_type=short], ++ [ac_cv_soundtouch_sample_type=float])]) ++ CXXFLAGS=$_SAVE_CXXFLAGS ++ AC_LANG_RESTORE ++ ++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ ++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then ++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) ++ fi ++fi ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) ++fi ++AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) ++ + dnl system libvpx Support + dnl ======================================================== + MOZ_ARG_WITH_BOOL(system-libvpx, diff --git toolkit/library/moz.build toolkit/library/moz.build -index d42137a..695e75a8 100644 +index 079a575adec3..514d901195de 100644 --- mozilla/toolkit/library/moz.build +++ mozilla/toolkit/library/moz.build -@@ -178,6 +178,21 @@ if CONFIG['MOZ_SYSTEM_PNG']: +@@ -237,6 +237,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: if CONFIG['MOZ_SYSTEM_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] @@ -434,20 +473,20 @@ index d42137a..695e75a8 100644 OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp -index 2cf281e..6d7af0e 100644 +index c083ab4bc4f3..62b917043a2c 100644 --- mozilla/xpcom/build/XPCOMInit.cpp +++ mozilla/xpcom/build/XPCOMInit.cpp -@@ -138,7 +138,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); - #include "mozilla/VisualEventTracer.h" - #endif +@@ -154,7 +154,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); + + #include "mozilla/ipc/GeckoChildProcessHost.h" +#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, + #if defined(HAVE_STDINT_H) + // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in +@@ -664,11 +666,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, // this oddness. mozilla::SetICUMemoryFunctions(); |