head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2013.01.10.23.03.35;	author svnexp;	state Exp;
branches;
next	1.1;

1.1
date	2012.08.30.14.54.17;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310207
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310207 | flo | 2013-01-10 22:29:23 +0000 (Thu, 10 Jan 2013) | 9 lines
## SVN ##
## SVN ## - update www/firefox to 18.0
## SVN ## - update www/firefox-esr to 17.0.2
## SVN ## - update www/seamonkey to 2.15 (enigmail to 1.5.0)
## SVN ## - remove QT4 option to avoid confusion (it turned out to be too experimental)
## SVN ##
## SVN ## In collaboration with: Jan Beich <jbeich@@tormail.org>
## SVN ##
## SVN ## Security:	http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@--- gfx/skia/Makefile.in~
+++ gfx/skia/Makefile.in
@@@@ -339,10 +339,9 @@@@ CPPSRCS += \
 	SkMMapStream.cpp \
 	SkOSFile.cpp \
 	$(NULL)
-ifeq (Linux,$(OS_TARGET))
+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
 CPPSRCS += \
 	SkFontHost_linux.cpp \
-	SkFontHost_tables.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 endif
@


1.1
log
@SVN rev 303378 on 2012-08-30 14:54:17Z by flo

- update firefox and thunderbird to 15.0
- update firefox-esr, thunderbird-esr, linux-thunderbird and linux-firefox to 10.0.7
- update seamonkey and linux-seamonkey to 2.12
- update nss to 3.13.6
- update bsdipc code (posix_spawn, SysV shared memory)
- rename patches to easily track those not (yet) submitted upstream
- reduce package size, except for www/libxul[1]
- restore default objdir to what it was in 13.0
- fix mail/enigmail after thunderbird build changes
- don't accidentally pick up headers from installed ports[3]
- add support for PREFIX != LOCALBASE to Makefile.webplugins [4]
- document vulnerabilities in vuln.xml
- *miscellaneous cleanups and fixups*

Obtained from:	OpenBSD ports[1]
PR:		ports/159831, ports/160933, ports/170467[3], ports/170236 [4]
Submitted by:	avilla [4]
In collaboration with:	Jan Beich <jbeich@@tormail.net> Who did most of the hard
			work.
@
text
@d1 14
a14 20
--- widget/src/qt/nsNativeThemeQt.cpp~
+++ widget/src/qt/nsNativeThemeQt.cpp
@@@@ -25,7 +25,6 @@@@
 #include "nsThemeConstants.h"
 #include "nsIServiceManager.h"
 #include "nsIDOMHTMLInputElement.h"
-#include <malloc.h>
 
 
 #include "gfxASurface.h"
--- widget/src/qt/nsSound.cpp~
+++ widget/src/qt/nsSound.cpp
@@@@ -40,6 +40,7 @@@@
 #include <QSound>
 
 #include <string.h>
+#include <unistd.h>
 
 #include "nscore.h"
 #include "plstr.h"
@

