svn commit: r429221 - in branches/2016Q4: Mk/Uses www/linux-seamonkey www/seamonkey www/seamonkey-i18n www/seamonkey/files
Jan Beich
jbeich at FreeBSD.org
Fri Dec 23 04:39:50 UTC 2016
Author: jbeich
Date: Fri Dec 23 04:39:47 2016
New Revision: 429221
URL: https://svnweb.freebsd.org/changeset/ports/429221
Log:
MFH: r428671 r429039
www/seamonkey: update to 2.46
Changes: http://www.seamonkey-project.org/news#2016-12-22
Security: 4f00dac0-1e18-4481-95af-7aaad63fd303
Security: 2225c5b4-1e5a-44fc-9920-b3201c384a15
Security: 1bcfd963-e483-41b8-ab8e-bad5c3ce49c9
Security: 92d44f83-a7bf-41cf-91ee-3d1b8ecf579f
Security: 8065d37b-8e7c-4707-a608-1b0a2b8509c3
Security: aa1aefe3-6e37-47db-bfda-343ef4acb1b5
Security: 2c57c47e-8bb3-4694-83c8-9fc3abad3964
Security: 18f39fb6-7400-4063-acaf-0806e92c094f
Approved by: ports-secteam (junovitch)
Added:
branches/2016Q4/www/seamonkey/files/patch-bug1231349 (contents, props changed)
branches/2016Q4/www/seamonkey/files/patch-bug1256136
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1256136
branches/2016Q4/www/seamonkey/files/patch-bug1288587
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1288587
branches/2016Q4/www/seamonkey/files/patch-bug1299694
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1299694
branches/2016Q4/www/seamonkey/files/patch-bug1315986
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1315986
branches/2016Q4/www/seamonkey/files/patch-bug1320991
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1320991
branches/2016Q4/www/seamonkey/files/patch-bug1321877
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1321877
branches/2016Q4/www/seamonkey/files/patch-bug1322112
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1322112
branches/2016Q4/www/seamonkey/files/patch-bug1322660
- copied unchanged from r428671, head/www/seamonkey/files/patch-bug1322660
Deleted:
branches/2016Q4/www/seamonkey/files/patch-bug1209410
branches/2016Q4/www/seamonkey/files/patch-bug1228255
branches/2016Q4/www/seamonkey/files/patch-bug1228742
branches/2016Q4/www/seamonkey/files/patch-bug1233275
branches/2016Q4/www/seamonkey/files/patch-bug1234033
branches/2016Q4/www/seamonkey/files/patch-bug1243312
branches/2016Q4/www/seamonkey/files/patch-bug1245076
branches/2016Q4/www/seamonkey/files/patch-bug1268816
branches/2016Q4/www/seamonkey/files/patch-bug1269165
branches/2016Q4/www/seamonkey/files/patch-bug1269171
branches/2016Q4/www/seamonkey/files/patch-bug1285501
branches/2016Q4/www/seamonkey/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c
branches/2016Q4/www/seamonkey/files/patch-modules-libpref-init-all.js
branches/2016Q4/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h
Modified:
branches/2016Q4/Mk/Uses/gecko.mk
branches/2016Q4/www/linux-seamonkey/Makefile
branches/2016Q4/www/linux-seamonkey/distinfo
branches/2016Q4/www/linux-seamonkey/pkg-plist
branches/2016Q4/www/seamonkey-i18n/Makefile
branches/2016Q4/www/seamonkey-i18n/distinfo
branches/2016Q4/www/seamonkey/Makefile
branches/2016Q4/www/seamonkey/distinfo
branches/2016Q4/www/seamonkey/files/patch-bug1021761
branches/2016Q4/www/seamonkey/files/patch-bug1320621
branches/2016Q4/www/seamonkey/files/patch-bug702179
branches/2016Q4/www/seamonkey/files/patch-bug826985
branches/2016Q4/www/seamonkey/files/patch-bug847568
branches/2016Q4/www/seamonkey/files/patch-config-baseconfig.mk
branches/2016Q4/www/seamonkey/files/patch-ijg-libjpeg
branches/2016Q4/www/seamonkey/files/patch-sample-type
branches/2016Q4/www/seamonkey/files/patch-z-bug517422
Directory Properties:
branches/2016Q4/ (props changed)
Modified: branches/2016Q4/Mk/Uses/gecko.mk
==============================================================================
--- branches/2016Q4/Mk/Uses/gecko.mk Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/Mk/Uses/gecko.mk Fri Dec 23 04:39:47 2016 (r429221)
@@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE
.elif ${gecko_ARGS:Mseamonkey}
-_GECKO_DEFAULT_VERSION= 40
-_GECKO_VERSIONS= 40
+_GECKO_DEFAULT_VERSION= 46
+_GECKO_VERSIONS= 46
_GECKO_TYPE= seamonkey
.if exists(${LOCALBASE}/bin/seamonkey)
@@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE
.endif
# Dependence lines for different Seamonkey versions
-40_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
+46_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
.elif ${gecko_ARGS:Mthunderbird}
Modified: branches/2016Q4/www/linux-seamonkey/Makefile
==============================================================================
--- branches/2016Q4/www/linux-seamonkey/Makefile Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/linux-seamonkey/Makefile Fri Dec 23 04:39:47 2016 (r429221)
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= seamonkey
-DISTVERSION= 2.40
+DISTVERSION= 2.46
CATEGORIES= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/linux-i686/en-US
MAINTAINER= gecko at FreeBSD.org
COMMENT= The open source, standards compliant web browser
Modified: branches/2016Q4/www/linux-seamonkey/distinfo
==============================================================================
--- branches/2016Q4/www/linux-seamonkey/distinfo Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/linux-seamonkey/distinfo Fri Dec 23 04:39:47 2016 (r429221)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1475123784
-SHA256 (seamonkey-2.40.tar.bz2) = dc42044206fe4f3d2f2c797ef1516635e27789d6983293a56c6557626e1841be
-SIZE (seamonkey-2.40.tar.bz2) = 50683245
+TIMESTAMP = 1481682190
+SHA256 (seamonkey-2.46.tar.bz2) = 096a1a8e229eaa05c2db5ae0661f856aceae58f1cae406cf52d2b270ca8a9957
+SIZE (seamonkey-2.46.tar.bz2) = 48816262
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
Modified: branches/2016Q4/www/linux-seamonkey/pkg-plist
==============================================================================
--- branches/2016Q4/www/linux-seamonkey/pkg-plist Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/linux-seamonkey/pkg-plist Fri Dec 23 04:39:47 2016 (r429221)
@@ -51,7 +51,6 @@ lib/%%APP_NAME%%/chrome/icons/default/pl
lib/%%APP_NAME%%/chrome/icons/default/places48.png
lib/%%APP_NAME%%/chrome/icons/default/seamonkey.png
lib/%%APP_NAME%%/components/components.manifest
-lib/%%APP_NAME%%/components/libmozgnome.so
lib/%%APP_NAME%%/components/libsuite.so
lib/%%APP_NAME%%/crashreporter
lib/%%APP_NAME%%/crashreporter-override.ini
@@ -66,11 +65,10 @@ lib/%%APP_NAME%%/defaults/profile/panels
lib/%%APP_NAME%%/dependentlibs.list
lib/%%APP_NAME%%/dictionaries/en-US.aff
lib/%%APP_NAME%%/dictionaries/en-US.dic
-lib/%%APP_NAME%%/distribution/extensions/inspector at mozilla.org.xpi
-lib/%%APP_NAME%%/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
lib/%%APP_NAME%%/extensions/modern at themes.mozilla.org.xpi
lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
lib/%%APP_NAME%%/icons/updater.png
+lib/%%APP_NAME%%/icudt56l.dat
lib/%%APP_NAME%%/isp/Bogofilter.sfd
lib/%%APP_NAME%%/isp/DSPAM.sfd
lib/%%APP_NAME%%/isp/POPFile.sfd
@@ -78,8 +76,8 @@ lib/%%APP_NAME%%/isp/SpamAssassin.sfd
lib/%%APP_NAME%%/isp/SpamPal.sfd
lib/%%APP_NAME%%/isp/movemail.rdf
lib/%%APP_NAME%%/isp/rss.rdf
-lib/%%APP_NAME%%/libfreebl3.chk
-lib/%%APP_NAME%%/libfreebl3.so
+lib/%%APP_NAME%%/libfreeblpriv3.chk
+lib/%%APP_NAME%%/libfreeblpriv3.so
lib/%%APP_NAME%%/libldap60.so
lib/%%APP_NAME%%/libldif60.so
lib/%%APP_NAME%%/liblgpllibs.so
Modified: branches/2016Q4/www/seamonkey-i18n/Makefile
==============================================================================
--- branches/2016Q4/www/seamonkey-i18n/Makefile Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey-i18n/Makefile Fri Dec 23 04:39:47 2016 (r429221)
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= seamonkey-i18n
-PORTVERSION= 2.40
+PORTVERSION= 2.46
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/build9/langpack
PKGNAMEPREFIX=
DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./}
DIST_SUBDIR= xpi/${DISTNAME}
Modified: branches/2016Q4/www/seamonkey-i18n/distinfo
==============================================================================
--- branches/2016Q4/www/seamonkey-i18n/distinfo Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey-i18n/distinfo Fri Dec 23 04:39:47 2016 (r429221)
@@ -1,53 +1,53 @@
-TIMESTAMP = 1475123784
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) = 257bd56c3db3d62600e8fcb4e621df1cb3cede2e73354a0f588516152598e9b8
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) = 846940
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) = 06d423fc182c0d6b674572a94c0628febbe314883dc0be7f481583ae21ce9485
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) = 838972
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) = b2485aaed83ad46edb565fd6d35b785fc350ae96a7c32df91eb028807d8f442e
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) = 831462
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) = 8d72d02bcec01e63a6b4630bcfd092fa1dcdf21b8424f4de878d4460e6ba1865
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) = 839670
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) = b19890d7c446ffd98a9c94f95986cbbed9842f4149ce549d3463128957f1ed9f
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) = 801900
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) = 45c6f3aee27022a7523268d21f38924dbfa3553f2dfca25e8e11ef41c1119392
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) = 801237
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) = 096bfcbd124463398d1776955587036f7d8d969582053d8980dde18e34e21738
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) = 850745
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) = 8d95036953298f880de663961a4b686bed9b233dfdc247a5107465d97d671b68
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) = 819863
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) = fbbca3abdc2fca3a7d18500e606ef75e3ee4ecbaefce3fc6bec211422521ac0e
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) = 806026
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) = faed1301c6f7eebf6999521feb7a8161f4ec5c6dab01ae717f9bb7df360a6382
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) = 812115
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) = 36d8a69aa1a526dd8ecc6a2fe2da55b5b4d3e4bcbbd2d13af0f76fa79ae21fc4
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) = 817071
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) = b259e45414ea7247c586605797064743efd203ad22ef4a6ca734d9d39ea0ddcd
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) = 849367
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) = 6818ac8634aa959c049791bd96e228ee68fb4af214d73b2ded67cdf9e8fba159
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) = 730855
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) = 73c868aad2fdcc3ddf3cbb84bdca2ec7e43c7fcf0ac1d5ec243717123dcaf353
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) = 888099
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) = eb99109e0b25415e460c31fe6be35d41ada6040ca91bb90fb29af951f0b21b6a
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) = 858221
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) = 2762bcddb6b4d36b2d14bb961e6b3604420e099216d5efc60b8835bc2709251d
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) = 829131
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) = fa6f780f2fec5b43c75bc46778ddcfa983c989fe16a0c1995c0bc65a375188f9
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) = 796595
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) = 96d1eaf1bafce2a4b11abfc7b3cccc3409b073e7353416ec7eaec48f61d0ed83
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) = 861834
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) = 1ef665be4063a864564ac13d6cf87892bc5c3c57a9e4115efd03403382e14b8b
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) = 831873
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) = 68f6ca318be2cd1f78245db311ac9c0e0ae877697c0e310284615b352338a61e
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) = 892052
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) = af8c126fe02cb3a8b9783c4a1f8d4bdec8b684195a2a8b5be537df88e2ec2861
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) = 858148
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) = fc970bfc8b52119c147d564076904df9b3722fb922bc9703709ceb5be2bd6144
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) = 824804
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) = c5dce74507307008127e3402e0c9a877f333f2b1085b1c912c77969f4a433632
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) = 814264
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) = 9932ca0ac00312a9fd9bab3199f7e55564beb6f5f339647c7a6c0cdd4cd82241
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) = 875815
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) = 28f634be2ed10526dbf6bf310b28f4da921d5809bce8216418c34ad07ac75443
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) = 839892
-SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) = eaec998d922789be13cfc42660ab96abd0b1ec47cb4394b8a9f725969141ba89
-SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) = 861767
+TIMESTAMP = 1481640594
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.be.langpack.xpi) = d97376ff92ffcdf04ec08273b60b8750d2c4f65edd71eed734313f72885f45db
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.be.langpack.xpi) = 936650
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ca.langpack.xpi) = 11adc88aab13826dbb7dd9374f877b80c87a085d75712c976173f243950292a6
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ca.langpack.xpi) = 937577
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.cs.langpack.xpi) = 4fae0f46a8ba83a72e6c7a50b7ba73153f153055b874fa3e857ebf6867a48ff3
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.cs.langpack.xpi) = 936101
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.de.langpack.xpi) = e6d000492fbb3aa1f7624dbb3a546742bd9badb67a9cee8a95fd8b8ead7ac0eb
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.de.langpack.xpi) = 942796
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-GB.langpack.xpi) = be1e956e11c4e36def6af6ee0c0795f5ec19e4370d811b6f3fdf60ed38f184c4
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-GB.langpack.xpi) = 900232
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-US.langpack.xpi) = ff188a86cebac99fa25575b8f8a2eb01d0f6ee009485c826dd9fbf3701839eb4
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-US.langpack.xpi) = 900829
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-AR.langpack.xpi) = 5b7a9da73fe69c9004487f844f97f5f18d3db79e49dd151ae9a6229545ef7d2c
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-AR.langpack.xpi) = 952318
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-ES.langpack.xpi) = da0c4b4e156965310ad4280c5ab461abd778b89e55d16a1f1ee78f692bbb76cb
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-ES.langpack.xpi) = 881728
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fi.langpack.xpi) = 9242710c283628b6e9f68eee0425e1f7b81d81be27c1d5c3dc441018751b1511
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fi.langpack.xpi) = 905048
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fr.langpack.xpi) = e8e01037b879fe49e9dc042f27e08737083ac2bd7f9652ec2216d69f3de84ac9
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fr.langpack.xpi) = 945990
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.gl.langpack.xpi) = e10ed62becc1e090c1734434d4a48b403dadb75b2231b70b33e2f34666fa42fa
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.gl.langpack.xpi) = 915640
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.hu.langpack.xpi) = 7366d80af72e1e5c46275b0f3f4efa36290b59ac2c24dc4b2debf06dbdc469fe
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.hu.langpack.xpi) = 950137
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.it.langpack.xpi) = 939162085a89575988fc44251f6f484bce087433bf06220fe94a3a3ef31a4279
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.it.langpack.xpi) = 788290
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ja.langpack.xpi) = b3f8a0e23cbd3e235d33d1fb083ff6b5b4d0abdd4697d89be444f90e657afea5
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ja.langpack.xpi) = 1000175
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.lt.langpack.xpi) = 32ca1b4668234c96c161512e6e7a444d864229d86efdc89caafff5e1d882bd0d
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.lt.langpack.xpi) = 951611
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nb-NO.langpack.xpi) = 20b93b1f9475fc97a9f86f48d2bbcdeca43015c2cfe62a5a7b4d204dee1d7e0f
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nb-NO.langpack.xpi) = 921937
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nl.langpack.xpi) = eb9e84781c9c70411ccc199b8ccd6bf96729763ac09210d67d2dbe9178f9b8c4
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nl.langpack.xpi) = 926891
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pl.langpack.xpi) = 47a18be4d673bc8ef172b358512390d5bcfc6f81d1c2d327669aa135b2aec482
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pl.langpack.xpi) = 918214
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pt-PT.langpack.xpi) = 0ba281071038143950c64a03edaab7a37a4d284ed1583b50633ab58e393c7743
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pt-PT.langpack.xpi) = 934340
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ru.langpack.xpi) = fd50c7fd8f291530f68af88424dffd15e59340cb854a1edc915d2d5dc548ec78
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ru.langpack.xpi) = 960162
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sk.langpack.xpi) = 124d643a414d595941cc5fd72c0529629df8f3ea15c0f16186e7e3d5550dca22
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sk.langpack.xpi) = 962527
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sv-SE.langpack.xpi) = 6cadce5a8b40aaf1cc39157f5a9be3de5890d4b298082c11f9da1bdf43638869
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sv-SE.langpack.xpi) = 935346
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.tr.langpack.xpi) = 1ad81e539c119d4bcc9b4c15dc1a54d604ae8d999c3e7dbc112c2633dd914409
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.tr.langpack.xpi) = 912742
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.uk.langpack.xpi) = 50be5f1fc5bf46133308185fee7f6761eca90550bbbb6d27ded3a0f81e2cfb81
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.uk.langpack.xpi) = 995478
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-CN.langpack.xpi) = 19e835ebb01e3c7c8bdd3aeee9105f18187fb7c588bf2e329db45c39acb4e5dc
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-CN.langpack.xpi) = 942579
+SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-TW.langpack.xpi) = 2fe7403370d70d4daa6a302fc24fc72a062cb9777acc672faf20f51f2ed73955
+SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-TW.langpack.xpi) = 970970
Modified: branches/2016Q4/www/seamonkey/Makefile
==============================================================================
--- branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey/Makefile Fri Dec 23 04:39:47 2016 (r429221)
@@ -2,28 +2,27 @@
# $FreeBSD$
PORTNAME= seamonkey
-DISTVERSION= 2.40
-MOZILLA_VER= 43 # above + 3
-PORTREVISION= 2
+DISTVERSION= 2.46
+MOZILLA_VER= 49 # 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/build9/source
DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
MAINTAINER= gecko at FreeBSD.org
COMMENT= The open source, standards compliant web browser
-BUILD_DEPENDS= nspr>=4.10.10:devel/nspr \
- nss>=3.20.1:security/nss \
+BUILD_DEPENDS= nspr>=4.12:devel/nspr \
+ nss>=3.25:security/nss \
libevent2>=2.0.21_2:devel/libevent2 \
soundtouch>=1.9.0:audio/soundtouch \
- harfbuzz>=1.0.3:print/harfbuzz \
- graphite2>=1.3.4:graphics/graphite2 \
- png>=1.6.17:graphics/png \
+ harfbuzz>=1.2.6:print/harfbuzz \
+ graphite2>=1.3.8:graphics/graphite2 \
+ png>=1.6.21:graphics/png \
libvorbis>=1.3.5,3:audio/libvorbis \
libvpx>=1.5.0:multimedia/libvpx \
- sqlite3>=3.8.11.1:databases/sqlite3 \
+ sqlite3>=3.13:databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
v4l_compat>0:multimedia/v4l_compat \
autoconf-2.13:devel/autoconf213 \
@@ -32,8 +31,8 @@ BUILD_DEPENDS= nspr>=4.10.10:devel/nspr
LIB_DEPENDS= libv4l2.so:multimedia/libv4l
-EM_VERSION= 1.9.5
-L_VERSION= 4.5
+EM_VERSION= 1.9.6.1
+L_VERSION= 5.1
SSP_UNSAFE= yes
USE_GECKO= gecko
@@ -42,46 +41,32 @@ USES= tar:xz
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MOZ_EXTENSIONS= default
-MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \
- --enable-application=suite
+MOZ_OPTIONS+= --enable-application=suite
USE_MOZILLA= # empty
MOZ_PKGCONFIG_FILES=
NOT_FOR_ARCHS= ia64
-OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS RUST
+OPTIONS_DEFINE= ENIGMAIL LDAP LIGHTNING RUST
OPTIONS_SINGLE= TOOLKIT
OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
-OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL GTK2 LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CANBERRA ENIGMAIL GTK2 LDAP LIGHTNING
-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 <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MCHATZILLA}
-MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc
-.endif
-
-.include <bsd.port.pre.mk>
-
WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
-.if ! ${PORT_OPTIONS:MMAILNEWS}
-MOZ_OPTIONS+= --disable-ldap --disable-mailnews
-.else
-# mail and news desired, but not LDAP
.if ! ${PORT_OPTIONS:MLDAP}
-MOZ_OPTIONS+= --disable-ldap --enable-mailnews
+MOZ_OPTIONS+= --disable-ldap
.else
-MOZ_OPTIONS+= --enable-ldap --enable-mailnews
+MOZ_OPTIONS+= --enable-ldap
.endif
.if ${PORT_OPTIONS:MENIGMAIL}
MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail
@@ -96,11 +81,6 @@ EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/ins
${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
${XPI_LIBDIR}/${EM_ID}/modules/app.jsm
.endif
-.endif
-
-.if ! ${PORT_OPTIONS:MCOMPOSER}
-MOZ_OPTIONS+= --disable-composer
-.endif
.if ${PORT_OPTIONS:MLIGHTNING}
MOZ_OPTIONS+= --enable-calendar
@@ -113,7 +93,7 @@ XPI_ID= lightning at seamonkey.mozilla.org
MOZ_OPTIONS+= --disable-calendar
.endif
-.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL}
+.if ${PORT_OPTIONS:MENIGMAIL}
post-extract:
@${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \
-C ${WRKSRC}/mailnews/extensions
@@ -127,7 +107,7 @@ post-patch:
@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
< ${FILESDIR}/seamonkey.desktop.in > \
${WRKDIR}/${MOZILLA}.desktop
-.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL}
+.if ${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
@@ -145,13 +125,13 @@ pre-configure:
(cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13)
(cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
-.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL}
+.if ${PORT_OPTIONS:MENIGMAIL}
post-configure:
cd ${WRKSRC}/mailnews/extensions/enigmail/ && \
${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure
.endif
-.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL}
+.if ${PORT_OPTIONS:MENIGMAIL}
post-build:
${DO_MAKE_BUILD:N-j*:S,${MAKEFILE},Makefile,} all xpi \
-C ${WRKSRC}/mailnews/extensions/enigmail
@@ -170,7 +150,7 @@ post-install:
@${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}
+.if ${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}
@@ -180,4 +160,4 @@ post-install:
@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: branches/2016Q4/www/seamonkey/distinfo
==============================================================================
--- branches/2016Q4/www/seamonkey/distinfo Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey/distinfo Fri Dec 23 04:39:47 2016 (r429221)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1475123784
-SHA256 (seamonkey-2.40.source.tar.xz) = 7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01
-SIZE (seamonkey-2.40.source.tar.xz) = 193702432
-SHA256 (enigmail-1.9.5.tar.gz) = 831e53a4add0f465241f075be9475103367aa1452675adae054d8fb272e5d3ad
-SIZE (enigmail-1.9.5.tar.gz) = 1744278
+TIMESTAMP = 1481682190
+SHA256 (seamonkey-2.46.source.tar.xz) = 39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912
+SIZE (seamonkey-2.46.source.tar.xz) = 204913776
+SHA256 (enigmail-1.9.6.1.tar.gz) = 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f
+SIZE (enigmail-1.9.6.1.tar.gz) = 1745021
Modified: branches/2016Q4/www/seamonkey/files/patch-bug1021761
==============================================================================
--- branches/2016Q4/www/seamonkey/files/patch-bug1021761 Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1021761 Fri Dec 23 04:39:47 2016 (r429221)
@@ -1,7 +1,19 @@
-diff --git configure.in configure.in
+diff --git build/moz.configure/old.configure build/moz.configure/old.configure
+index b95dd2b..4cbefd5 100644
+--- mozilla/build/moz.configure/old.configure
++++ mozilla/build/moz.configure/old.configure
+@@ -305,6 +305,7 @@ def old_configure_options(*options):
+ '--with-nspr-prefix',
+ '--with-nss-exec-prefix',
+ '--with-nss-prefix',
++ '--with-oss',
+ '--with-pthreads',
+ '--with-qemu-exe',
+ '--with-servo',
+diff --git old-configure.in configure.in
index 48e60c0..ec08417 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
+--- mozilla/old-configure.in
++++ mozilla/old-configure.in
@@ -5591,6 +5591,67 @@ fi
AC_SUBST(MOZ_WEBM_ENCODER)
@@ -503,23 +515,21 @@ index a962553..1f780f4 100644
assert(r == 0);
/* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-@@ -848,23 +954,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name,
+@@ -859,7 +965,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
latency = latency < 500 ? 500 : latency;
}
- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
-- stm->params.channels, stm->params.rate, 1,
-- latency * 1000);
+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
-+ stm->params.channels, stm->params.rate, 1,
-+ latency * 1000);
+ stm->params.channels, stm->params.rate, 1,
+ latency * 1000);
if (r < 0) {
- alsa_stream_destroy(stm);
+@@ -867,15 +973,15 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
return CUBEB_ERROR_INVALID_FORMAT;
}
-- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &stm->period_size);
-+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &stm->period_size);
+- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
assert(r == 0);
- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
@@ -561,7 +571,7 @@ index a962553..1f780f4 100644
/* get a pcm, disabling resampling, so we get a rate the
* hardware/dmix/pulse/etc. supports. */
-- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
if (r < 0) {
return CUBEB_ERROR;
@@ -643,7 +653,7 @@ new file mode 100644
index 0000000..5e38e27
--- /dev/null
+++ mozilla/media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,432 @@
+@@ -0,0 +1,442 @@
+/*
+ * Copyright © 2014 Mozilla Foundation
+ *
@@ -664,6 +674,7 @@ index 0000000..5e38e27
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
++#include <assert.h>
+
+#include "cubeb/cubeb.h"
+#include "cubeb-internal.h"
@@ -762,7 +773,7 @@ index 0000000..5e38e27
+ pthread_mutex_lock(&stream->state_mutex);
+ if (stream->data_callback && stream->running && !stream->stopped) {
+ pthread_mutex_unlock(&stream->state_mutex);
-+ got = stream->data_callback(stream, stream->user_ptr, buffer, nframes);
++ got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes);
+ } else {
+ pthread_mutex_unlock(&stream->state_mutex);
+ }
@@ -892,7 +903,10 @@ index 0000000..5e38e27
+
+static int oss_stream_init(cubeb * context, cubeb_stream ** stm,
+ char const * stream_name,
-+ cubeb_stream_params stream_params,
++ cubeb_devid input_device,
++ cubeb_stream_params * input_stream_params,
++ cubeb_devid output_device,
++ cubeb_stream_params * output_stream_params,
+ unsigned int latency,
+ cubeb_data_callback data_callback,
+ cubeb_state_callback state_callback, void * user_ptr)
@@ -903,6 +917,12 @@ index 0000000..5e38e27
+ stream->state_callback = state_callback;
+ stream->user_ptr = user_ptr;
+
++ assert(!input_stream_params && "not supported.");
++ if (input_device || output_device) {
++ /* Device selection not yet implemented. */
++ return CUBEB_ERROR_DEVICE_UNAVAILABLE;
++ }
++
+ if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) {
+ free(stream);
+ return CUBEB_ERROR;
@@ -914,7 +934,7 @@ index 0000000..5e38e27
+ free(stream); \
+ return CUBEB_ERROR_INVALID_FORMAT; } } while (0)
+
-+ stream->params = stream_params;
++ stream->params = *output_stream_params;
+ stream->volume = 1.0;
+ stream->panning = 0.0;
+
@@ -1138,13 +1158,13 @@ index 991f03f..3d99eb5 100644
+if CONFIG['MOZ_OSS']:
+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
- if CONFIG['MOZ_NATIVE_JPEG']:
+ if CONFIG['MOZ_SYSTEM_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
diff --git toolkit/library/moz.build toolkit/library/moz.build
index e191f13..4fb268a 100644
--- mozilla/toolkit/library/moz.build
+++ mozilla/toolkit/library/moz.build
-@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -234,8 +234,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
if not CONFIG['MOZ_TREE_PIXMAN']:
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
Added: branches/2016Q4/www/seamonkey/files/patch-bug1231349
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1231349 Fri Dec 23 04:39:47 2016 (r429221)
@@ -0,0 +1,16 @@
+diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
+--- suite/installer/package-manifest.in
++++ suite/installer/package-manifest.in
+@@ -911,3 +956,12 @@
+ @RESPATH@/extensions/debugQA at mozilla.org/chrome/debugqa at JAREXT@
+ #endif
+ #endif
++
++#ifdef MOZ_CALENDAR
++[calendar]
++#ifdef NIGHTLY_BUILD
++ at RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
++#else
++ at RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
++#endif
++#endif
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1256136 (from r428671, head/www/seamonkey/files/patch-bug1256136)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1256136 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1256136)
@@ -0,0 +1,21 @@
+diff --git xpcom/glue/nsISupportsImpl.h xpcom/glue/nsISupportsImpl.h
+index 9102102..e1f34c0 100644
+--- mozilla/xpcom/glue/nsISupportsImpl.h
++++ mozilla/xpcom/glue/nsISupportsImpl.h
+@@ -32,11 +32,11 @@
+ #include "mozilla/TypeTraits.h"
+
+ #if defined(__clang__)
+- // bug 1028428 shows that at least in FreeBSD 10.0 with Clang 3.4 and libc++ 3.4,
+- // std::is_destructible is buggy in that it returns false when it should return true
+- // on ipc::SharedMemory. On the other hand, all Clang versions currently in use
+- // seem to handle the fallback just fine.
+-# define MOZ_CAN_USE_IS_DESTRUCTIBLE_FALLBACK
++# if MOZ_USING_LIBCXX && __has_include(<type_traits>)
++# define MOZ_HAVE_STD_IS_DESTRUCTIBLE
++# else
++# define MOZ_CAN_USE_IS_DESTRUCTIBLE_FALLBACK
++# endif
+ #elif defined(__GNUC__)
+ // GCC 4.7 is has buggy std::is_destructible
+ # if MOZ_USING_LIBSTDCXX && MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1288587 (from r428671, head/www/seamonkey/files/patch-bug1288587)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1288587 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1288587)
@@ -0,0 +1,67 @@
+diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
+index 855214a..1e91d51 100644
+--- mozilla/build/moz.configure/init.configure
++++ mozilla/build/moz.configure/init.configure
+@@ -165,16 +165,17 @@ option(env='PYTHON', nargs=1, help='Python interpreter')
+ # ==============================================================
+ @depends('PYTHON', check_build_environment, mozconfig, '--help')
+ @imports('os')
+ @imports('sys')
+ @imports('subprocess')
+ @imports(_from='mozbuild.configure.util', _import='LineIO')
+ @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
+ @imports(_from='mozbuild.virtualenv', _import='verify_python_version')
++ at imports(_from='__builtin__', _import='KeyError')
+ @imports('distutils.sysconfig')
+ def virtualenv_python(env_python, build_env, mozconfig, help):
+ if help:
+ return
+
+ python = env_python[0] if env_python else None
+
+ # Ideally we'd rely on the mozconfig injection from mozconfig_options,
+@@ -184,16 +185,22 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
+ if 'PYTHON' in mozconfig['env']['added']:
+ python = mozconfig['env']['added']['PYTHON']
+ elif 'PYTHON' in mozconfig['env']['modified']:
+ python = mozconfig['env']['modified']['PYTHON'][1]
+ elif 'PYTHON' in mozconfig['vars']['added']:
+ python = mozconfig['vars']['added']['PYTHON']
+ elif 'PYTHON' in mozconfig['vars']['modified']:
+ python = mozconfig['vars']['modified']['PYTHON'][1]
++ for i in ('env', 'vars'):
++ for j in ('added', 'modified'):
++ try:
++ del mozconfig[i][j]['PYTHON']
++ except KeyError:
++ pass
+
+ with LineIO(lambda l: log.error(l)) as out:
+ verify_python_version(out)
+ topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir
+ if topobjdir.endswith('/js/src'):
+ topobjdir = topobjdir[:-7]
+
+ with LineIO(lambda l: log.info(l)) as out:
+@@ -219,17 +226,20 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
+ log.info('Creating Python environment')
+ manager.build(python)
+
+ python = normsep(manager.python_path)
+
+ if python != normsep(sys.executable):
+ log.info('Reexecuting in the virtualenv')
+ if env_python:
+- del os.environ['PYTHON']
++ try:
++ del os.environ['PYTHON']
++ except KeyError:
++ pass
+ # One would prefer to use os.execl, but that's completely borked on
+ # Windows.
+ sys.exit(subprocess.call([python] + sys.argv))
+
+ # We are now in the virtualenv
+ if not distutils.sysconfig.get_python_lib():
+ die('Could not determine python site packages directory')
+
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1299694 (from r428671, head/www/seamonkey/files/patch-bug1299694)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1299694 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1299694)
@@ -0,0 +1,31 @@
+commit 6ab2496
+Author: Chris Pearce <cpearce at mozilla.com>
+Date: Mon Sep 5 13:54:37 2016 +1200
+
+ Bug 1299694 - Ensure we don't enable Widevine unintentionally. r=glandium
+
+ On FreeBSD the target.kernel etc checks in enable_eme are failing,
+ but we're still falling through to |return value|, and so Widevine
+ is being enabled. If we remove the |return value| from enable_eme
+ we at least make Widevine disabled where it's not supposed to be
+ enabled.
+
+ MozReview-Commit-ID: D1h0IUidxhv
+---
+ toolkit/moz.configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git toolkit/moz.configure toolkit/moz.configure
+index 0c98c7a..a00b6eb 100644
+--- mozilla/toolkit/moz.configure
++++ mozilla/toolkit/moz.configure
+@@ -366,7 +366,8 @@ def enable_eme(value, target):
+ return value
+ elif value and value.origin != 'default':
+ die('%s is not supported on %s' % (value.format('--enable-eme'), target.alias))
+- return value
++ # Return the same type of OptionValue (Positive or Negative), with an empty tuple.
++ return value.__class__(())
+
+ @depends(enable_eme, fmp4)
+ def eme(value, fmp4):
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1315986 (from r428671, head/www/seamonkey/files/patch-bug1315986)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1315986 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1315986)
@@ -0,0 +1,49 @@
+commit c0d2685148b5
+Author: Jonathan Kew <jkew at 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
Modified: branches/2016Q4/www/seamonkey/files/patch-bug1320621
==============================================================================
--- branches/2016Q4/www/seamonkey/files/patch-bug1320621 Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1320621 Fri Dec 23 04:39:47 2016 (r429221)
@@ -10,7 +10,7 @@ Make sure --enable-system-hunspell picks
-
FINAL_LIBRARY = 'xul'
-+if CONFIG['MOZ_NATIVE_HUNSPELL']:
++if CONFIG['MOZ_SYSTEM_HUNSPELL']:
+ CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
+else:
+ LOCAL_INCLUDES += ['../src']
@@ -26,7 +26,7 @@ Make sure --enable-system-hunspell picks
FINAL_LIBRARY = 'xul'
-+if CONFIG['MOZ_NATIVE_HUNSPELL']:
++if CONFIG['MOZ_SYSTEM_HUNSPELL']:
+ CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
+else:
+ LOCAL_INCLUDES += ['../hunspell/src']
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1320991 (from r428671, head/www/seamonkey/files/patch-bug1320991)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1320991 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1320991)
@@ -0,0 +1,24 @@
+--- mozilla/modules/libmar/tests/moz.build.orig 2016-10-31 20:15:26 UTC
++++ mozilla/modules/libmar/tests/moz.build
+@@ -9,21 +9,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh
+ 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'],
+ ]
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1321877 (from r428671, head/www/seamonkey/files/patch-bug1321877)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1321877 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1321877)
@@ -0,0 +1,42 @@
+commit a13d95795217
+Author: <tharvik at gmail.com>
+Date: Thu Dec 8 18:20:12 2016 -0600
+
+ Bug 1321877. Fix compiler warnings in Downscaler.h when skia is not enabled. r=tnikkel
+---
+ image/Downscaler.h | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git image/Downscaler.h image/Downscaler.h
+index 21179a38f200..0bdef0eaa646 100644
+--- mozilla/image/Downscaler.h
++++ mozilla/image/Downscaler.h
+@@ -154,14 +154,14 @@ private:
+ class Downscaler
+ {
+ public:
+- explicit Downscaler(const nsIntSize&)
++ explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0)
+ {
+ MOZ_RELEASE_ASSERT(false, "Skia is not enabled");
+ }
+
+- const nsIntSize& OriginalSize() const { return nsIntSize(); }
+- const nsIntSize& TargetSize() const { return nsIntSize(); }
+- const gfxSize& Scale() const { return gfxSize(1.0, 1.0); }
++ const nsIntSize& OriginalSize() const { return mSize; }
++ const nsIntSize& TargetSize() const { return mSize; }
++ const gfxSize& Scale() const { return mScale; }
+
+ nsresult BeginFrame(const nsIntSize&, const Maybe<nsIntRect>&, uint8_t*, bool, bool = false)
+ {
+@@ -177,6 +177,9 @@ public:
+ DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
+ void ResetForNextProgressivePass() { }
+ const nsIntSize FrameSize() const { return nsIntSize(0, 0); }
++private:
++ nsIntSize mSize;
++ gfxSize mScale;
+ };
+
+ #endif // MOZ_ENABLE_SKIA
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1322112 (from r428671, head/www/seamonkey/files/patch-bug1322112)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1322112 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1322112)
@@ -0,0 +1,23 @@
+--- 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);
+
+
Copied: branches/2016Q4/www/seamonkey/files/patch-bug1322660 (from r428671, head/www/seamonkey/files/patch-bug1322660)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q4/www/seamonkey/files/patch-bug1322660 Fri Dec 23 04:39:47 2016 (r429221, copy of r428671, head/www/seamonkey/files/patch-bug1322660)
@@ -0,0 +1,80 @@
+--- 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) {
Modified: branches/2016Q4/www/seamonkey/files/patch-bug702179
==============================================================================
--- branches/2016Q4/www/seamonkey/files/patch-bug702179 Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey/files/patch-bug702179 Fri Dec 23 04:39:47 2016 (r429221)
@@ -1,10 +1,13 @@
---- mozilla/js/src/moz.build.orig 2015-10-29 22:17:54 UTC
-+++ mozilla/js/src/moz.build
-@@ -637,7 +637,3 @@
+--- mozilla/js/src/moz.build.orig 2015-12-16 12:32:04.574425000 +0100
++++ mozilla/js/src/moz.build 2015-12-16 12:32:09.032032000 +0100
+@@ -671,10 +671,6 @@ CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+ LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
- if not CONFIG['GNU_CXX']:
- ALLOW_COMPILER_WARNINGS = True
--
-NO_EXPAND_LIBS = True
-
-DIST_INSTALL = True
+-
+ # Prepare self-hosted JS code for embedding
+ GENERATED_FILES += ['selfhosted.out.h']
+ selfhosted = GENERATED_FILES['selfhosted.out.h']
Modified: branches/2016Q4/www/seamonkey/files/patch-bug826985
==============================================================================
--- branches/2016Q4/www/seamonkey/files/patch-bug826985 Fri Dec 23 04:39:06 2016 (r429220)
+++ branches/2016Q4/www/seamonkey/files/patch-bug826985 Fri Dec 23 04:39:47 2016 (r429221)
@@ -5,7 +5,7 @@ Date: Fri Jan 4 13:49:22 2013 +0100
Bug 826985 - Support more video formats for WebRTC via libv4l2 on Linux.
---
config/system-headers | 1 +
- configure.in | 7 +++++++
+ old-configure.in | 7 +++++++
media/webrtc/signaling/test/Makefile.in | 1 +
.../modules/video_capture/linux/device_info_linux.cc | 17 +++++++++++++++++
.../modules/video_capture/linux/video_capture_linux.cc | 16 +++++++++++++++-
@@ -17,18 +17,18 @@ diff --git config/system-headers config/
index 55e4cd1..76567b3 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -627,6 +627,7 @@ libgnome/libgnome.h
+@@ -629,6 +629,7 @@ libgnome/libgnome.h
libgnomeui/gnome-icon-lookup.h
libgnomeui/gnome-icon-theme.h
libgnomeui/gnome-ui-init.h
+libv4l2.h
- lib$routines.h
limits
limits.h
-diff --git configure.in configure.in
+ link.h
+diff --git old-configure.in configure.in
index 55e4cd1..76567b3 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
+--- mozilla/old-configure.in
++++ mozilla/old-configure.in
@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
@@ -145,26 +145,26 @@ index d46b5aa..e452223 100644
'targets': [
{
'target_name': 'video_capture_module',
-@@ -69,6 +72,19 @@
- 'linux/video_capture_linux.cc',
- 'linux/video_capture_linux.h',
- ],
-+ 'conditions': [
-+ ['use_libv4l2==1', {
-+ 'defines': [
-+ 'HAVE_LIBV4L2',
+@@ -75,6 +78,19 @@
+ 'linux/video_capture_linux.cc',
+ 'linux/video_capture_linux.h',
+ ],
++ 'conditions': [
++ ['use_libv4l2==1', {
++ 'defines': [
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list