diff options
| author | Britney Fransen <brfransen@gmail.com> | 2018-09-06 16:35:27 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2018-09-06 16:35:27 (GMT) |
| commit | 5669815ec3a539cf7b5ac7d8da2cbba3aeff44be (patch) | |
| tree | f13051093a52f47f5954c2ee2a783bc2f0f62f96 /abs/core/qt5-webkit/qt5-webkit-gcc7.patch | |
| parent | 8d35f28049488f2585ef765bf48e7a58958fd587 (diff) | |
| parent | 04697136037cb5341ee6c051f8aaa265c0400c82 (diff) | |
| download | linhes_pkgbuild-5669815ec3a539cf7b5ac7d8da2cbba3aeff44be.zip linhes_pkgbuild-5669815ec3a539cf7b5ac7d8da2cbba3aeff44be.tar.gz linhes_pkgbuild-5669815ec3a539cf7b5ac7d8da2cbba3aeff44be.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/qt5-webkit/qt5-webkit-gcc7.patch')
| -rw-r--r-- | abs/core/qt5-webkit/qt5-webkit-gcc7.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/abs/core/qt5-webkit/qt5-webkit-gcc7.patch b/abs/core/qt5-webkit/qt5-webkit-gcc7.patch new file mode 100644 index 0000000..bddb6fc --- /dev/null +++ b/abs/core/qt5-webkit/qt5-webkit-gcc7.patch @@ -0,0 +1,34 @@ +diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h +--- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100 ++++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 13:13:57.801527350 +0200 +@@ -581,29 +581,7 @@ + // FIXME: Does this really belong in StringImpl? + template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters) + { +- if (numCharacters == 1) { +- *destination = *source; +- return; +- } +- +- if (numCharacters <= s_copyCharsInlineCutOff) { +- unsigned i = 0; +-#if (CPU(X86) || CPU(X86_64)) +- const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T); +- +- if (numCharacters > charsPerInt) { +- unsigned stopCount = numCharacters & ~(charsPerInt - 1); +- +- const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source); +- uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination); +- for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j) +- destCharacters[j] = srcCharacters[j]; +- } +-#endif +- for (; i < numCharacters; ++i) +- destination[i] = source[i]; +- } else +- memcpy(destination, source, numCharacters * sizeof(T)); ++ memcpy(destination, source, numCharacters * sizeof(T)); + } + + ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters) |