summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-bug783463
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-01-10 22:29:23 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-01-10 22:29:23 +0000
commite676e2910f592704af67424758ebd4cfdff9ebcd (patch)
treedd14b47bf2d53036668a1976cb68d74952705242 /www/firefox-esr/files/patch-bug783463
parent- bump PORTREVISION since shlib version of gflags was changed (diff)
- update www/firefox to 18.0
- update www/firefox-esr to 17.0.2 - update www/seamonkey to 2.15 (enigmail to 1.5.0) - remove QT4 option to avoid confusion (it turned out to be too experimental) In collaboration with: Jan Beich <jbeich@tormail.org> Security: http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html
Notes
Notes: svn path=/head/; revision=310207
Diffstat (limited to 'www/firefox-esr/files/patch-bug783463')
-rw-r--r--www/firefox-esr/files/patch-bug78346334
1 files changed, 14 insertions, 20 deletions
diff --git a/www/firefox-esr/files/patch-bug783463 b/www/firefox-esr/files/patch-bug783463
index 56ec54b3fcc3..b27a1997c534 100644
--- a/www/firefox-esr/files/patch-bug783463
+++ b/www/firefox-esr/files/patch-bug783463
@@ -1,20 +1,14 @@
---- 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"
+--- 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