summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
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/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
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/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h')
-rw-r--r--www/firefox/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/www/firefox/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h b/www/firefox/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
new file mode 100644
index 000000000000..14c7d3a684a9
--- /dev/null
+++ b/www/firefox/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
@@ -0,0 +1,17 @@
+--- media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h.orig 2012-12-09 16:28:45.641625374 +0100
++++ media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h 2012-12-09 19:09:11.664625374 +0100
+@@ -490,10 +490,10 @@
+ # define GTEST_ENV_HAS_TR1_TUPLE_ 1
+ # endif
+
+-// C++11 specifies that <tuple> provides std::tuple. Users can't use
+-// gtest in C++11 mode until their standard library is at least that
+-// compliant.
+-# if GTEST_LANG_CXX11
++// C++11 specifies that <tuple> provides std::tuple. Use that if gtest is used
++// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6
++// can build with clang but need to use gcc4.2's libstdc++).
++# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325)
+ # define GTEST_ENV_HAS_STD_TUPLE_ 1
+ # endif
+