diff --git a/srcpkgs/qt5-webkit/patches/qt5-webkit-gcc7.patch b/srcpkgs/qt5-webkit/patches/qt5-webkit-gcc7.patch new file mode 100644 index 00000000000..f5ceb175f03 --- /dev/null +++ b/srcpkgs/qt5-webkit/patches/qt5-webkit-gcc7.patch @@ -0,0 +1,33 @@ +--- Source/WTF/wtf/text/StringImpl.h 2017-04-18 22:15:27.000000000 +0200 ++++ Source/WTF/wtf/text/StringImpl.h 2018-01-20 11:34:19.280270335 +0100 +@@ -625,29 +625,7 @@ + // FIXME: Does this really belong in StringImpl? + template 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(source); +- uint32_t* destCharacters = reinterpret_cast(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) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 0e62cf6e7ba..025beebeff1 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -1,7 +1,7 @@ # Template file for 'qt5-webkit' pkgname=qt5-webkit -version=5.8.0 -revision=4 +version=5.9.0 +revision=1 wrksrc=qtwebkit-opensource-src-${version} hostmakedepends="bison flex gperf perl python ruby pkg-config" makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel libjpeg-turbo-devel @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-3, LGPL-2.1" homepage="https://www.qt.io/" distfiles="https://download.qt.io/community_releases/${version%.*}/${version}-final/qtwebkit-opensource-src-${version}.tar.xz" -checksum=79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec +checksum=8dad193b740055a998312e04a040f2e32a923c0823b2d239b24eab08276a4e04 CXXFLAGS="-std=c++11 -fno-delete-null-pointer-checks" LDFLAGS="-ldl" @@ -25,6 +25,10 @@ do_configure() { cd build # Generate headers syncqt.pl-qt5 -version ${version} ${wrksrc}/Source/sync.profile + # Patch to enable video + sed -i ${wrksrc}/Tools/qmake/mkspecs/features/features.pri \ + -e"s;\(ENABLE_VIDEO\)=0;\1=1;" \ + -e"s;\(ENABLE_WEB_AUDIO\)=0;\1=1;" # Patch for QtWebProcess LFLAGS sed -i ${wrksrc}/Source/WebKit2/WebProcess.pro \ -e"/TARGET = QtWebProcess/i QMAKE_LFLAGS = $LDFLAGS"