summaryrefslogtreecommitdiff
path: root/mail/thunderbird/files/patch-bug783463
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-09-18 22:40:57 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-09-18 22:40:57 +0000
commitec4fcd4b2ae992fc8b3cedac4e53df84bbdf643d (patch)
tree424e8968903e2637d7f62a6c7e33ecfdbabacec0 /mail/thunderbird/files/patch-bug783463
parentAdd comas, to improve grammar (diff)
- update firefox, thunderbird and libxul to 24.0
- update seamonkey to 2.21 - update firefox-esr to 17.0.9 - enable GSTREAMER by default for html5 with h264/aac/mp3 - WEBRTC is now always built - add PROFILE and TESTS options Security: 7dfed67b-20aa-11e3-b8d8-0025905a4771 In collaboration with: Jan Beich <jbeich@tormail.org>
Diffstat (limited to 'mail/thunderbird/files/patch-bug783463')
-rw-r--r--mail/thunderbird/files/patch-bug78346328
1 files changed, 14 insertions, 14 deletions
diff --git a/mail/thunderbird/files/patch-bug783463 b/mail/thunderbird/files/patch-bug783463
index a774272227ea..7fc8ba00f21a 100644
--- a/mail/thunderbird/files/patch-bug783463
+++ b/mail/thunderbird/files/patch-bug783463
@@ -1,14 +1,14 @@
---- mozilla/gfx/skia/Makefile.in~
-+++ mozilla/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
+--- mozilla/gfx/skia/moz.build~
++++ mozilla/gfx/skia/moz.build
+@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+ 'SkMMapStream.cpp',
+ 'SkOSFile.cpp',
+ ]
+- if CONFIG['OS_TARGET'] == 'Linux':
++ if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux':
+ CPP_SOURCES += [
+ 'SkFontHost_linux.cpp',
+- 'SkFontHost_tables.cpp',
+ 'SkThread_pthread.cpp',
+ 'SkTime_Unix.cpp',
+ ]