Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 433746 Details for
Bug 582522
dev-qt/qtscript-4.8.7 fails to build with gcc-6: ‘std::tr1’ has not been declared
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
qtscript-4.8.7-gcc-6.0.patch
qtscript-4.8.7-gcc-6.0.patch (text/plain), 3.35 KB, created by
Mark Wright
on 2016-05-09 09:09:05 UTC
(
hide
)
Description:
qtscript-4.8.7-gcc-6.0.patch
Filename:
MIME Type:
Creator:
Mark Wright
Created:
2016-05-09 09:09:05 UTC
Size:
3.35 KB
patch
obsolete
>--- qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp 2015-05-08 00:14:47.000000000 +1000 >+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp 2016-05-08 12:58:46.000000000 +1000 >@@ -719,7 +719,7 @@ > > constructor.setupOffsets(); > >- return false; >+ return NULL; > }; > > >--- qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h 2015-05-08 00:14:48.000000000 +1000 >+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h 2016-05-07 21:55:51.000000000 +1000 >@@ -317,7 +317,7 @@ > TransitionTable* transitionTable = new TransitionTable; > setTransitionTable(transitionTable); > if (existingTransition) >- add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), existingTransition, existingTransition->m_specificValueInPrevious); >+ add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), static_cast<unsigned int>(existingTransition->m_attributesInPrevious)), existingTransition, existingTransition->m_specificValueInPrevious); > } > } // namespace JSC > >--- qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp 2015-05-08 00:14:48.000000000 +1000 >+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp 2016-05-07 21:38:16.000000000 +1000 >@@ -157,7 +157,7 @@ > { > if (m_previous) { > if (m_nameInPrevious) >- m_previous->table.remove(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(m_nameInPrevious.get()), m_attributesInPrevious), m_specificValueInPrevious); >+ m_previous->table.remove(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(m_nameInPrevious.get()), static_cast<unsigned int>(m_attributesInPrevious)), m_specificValueInPrevious); > else > m_previous->table.removeAnonymousSlotTransition(m_anonymousSlotsInPrevious); > >--- qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h 2015-05-08 00:14:48.000000000 +1000 >+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h 2016-05-05 21:06:32.000000000 +1000 >@@ -25,8 +25,12 @@ > #include "Platform.h" > > #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) >+#if (__cplusplus >= 201402L) >+#include <tr1/type_traits> >+#else > #include <type_traits> > #endif >+#endif > > namespace WTF { > >--- qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h 2015-05-08 00:14:48.000000000 +1000 >+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h 2016-05-05 21:07:05.000000000 +1000 >@@ -257,7 +257,7 @@ > > using std::swap; > >-#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION) >+#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION) && (__cplusplus < 201402L) > // The Dinkumware C++ library (used by MSVC and QNX) and clang's libc++ have a swap for pairs defined. > > // swap pairs by component, in case of pair members that specialize swap
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 582522
: 433746 |
435892