summaryrefslogtreecommitdiff
path: root/mail/thunderbird/files/patch-bug779713
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-07-23 23:36:07 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-07-23 23:36:07 +0000
commitbc2d7d11da0f41962ae6b00a099b76d57e17c64c (patch)
tree616c2752c978e0308f19227e781fbb1a64d73d1e /mail/thunderbird/files/patch-bug779713
parentwww/firefox{,-esr}, www/libxul: stop regressing r380782 (diff)
- Update Thunderbird to 38.1.0
Changes: https://www.mozilla.org/thunderbird/38.0.1/releasenotes/ Changes: https://www.mozilla.org/thunderbird/38.1.0/releasenotes/ PR: 201769 Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> (based on) MFH: 2015Q3 X-MFH-With: r392273 Security: https://vuxml.freebsd.org/freebsd/44d9daee-940c-4179-86bb-6e3ffd617869.html
Notes
Notes: svn path=/head/; revision=392761
Diffstat (limited to 'mail/thunderbird/files/patch-bug779713')
-rw-r--r--mail/thunderbird/files/patch-bug77971326
1 files changed, 14 insertions, 12 deletions
diff --git a/mail/thunderbird/files/patch-bug779713 b/mail/thunderbird/files/patch-bug779713
index 5137460a022c..aa2882a9a41c 100644
--- a/mail/thunderbird/files/patch-bug779713
+++ b/mail/thunderbird/files/patch-bug779713
@@ -1,3 +1,5 @@
+diff --git mfbt/Alignment.h mfbt/Alignment.h
+index e0843ca..353ec36 100644
--- mozilla/mfbt/Alignment.h
+++ mozilla/mfbt/Alignment.h
@@ -9,11 +9,20 @@
@@ -45,7 +47,15 @@ diff --git mfbt/Attributes.h mfbt/Attributes.h
index d317766..ddb13da 100644
--- mozilla/mfbt/Attributes.h
+++ mozilla/mfbt/Attributes.h
-@@ -54,6 +54,9 @@
+@@ -50,6 +50,7 @@
+ * don't indicate support for them here, due to
+ * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
+ */
++# define MOZ_HAVE_CXX11_ALIGNAS
+ # define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
+ # define MOZ_HAVE_NORETURN __declspec(noreturn)
+ # ifdef __clang__
+@@ -70,6 +71,9 @@
# ifndef __has_extension
# define __has_extension __has_feature /* compatibility, for older versions of clang */
# endif
@@ -55,21 +65,13 @@ index d317766..ddb13da 100644
# if __has_extension(cxx_constexpr)
# define MOZ_HAVE_CXX11_CONSTEXPR
# endif
-@@ -75,6 +78,9 @@
+@@ -84,6 +88,9 @@
# endif
#elif defined(__GNUC__)
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
+# define MOZ_HAVE_CXX11_ALIGNAS
+# endif
- # if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
- # define MOZ_HAVE_CXX11_OVERRIDE
- # define MOZ_HAVE_CXX11_FINAL final
-@@ -96,6 +102,7 @@
- # define MOZ_HAVE_NORETURN __attribute__((noreturn))
- #elif defined(_MSC_VER)
- # if _MSC_VER >= 1800
-+# define MOZ_HAVE_CXX11_ALIGNAS
- # define MOZ_HAVE_CXX11_DELETE
+ # define MOZ_HAVE_CXX11_CONSTEXPR
+ # define MOZ_HAVE_EXPLICIT_CONVERSION
# endif
- # if _MSC_VER >= 1700