Date: Sunday, July 2, 2017 @ 10:18:10 Author: arojas Revision: 299541
archrelease: copy trunk to testing-i686, testing-x86_64 Added: qt5-webkit/repos/testing-i686/PKGBUILD (from rev 299540, qt5-webkit/trunk/PKGBUILD) qt5-webkit/repos/testing-i686/qt5-webkit-gcc7.patch (from rev 299540, qt5-webkit/trunk/qt5-webkit-gcc7.patch) qt5-webkit/repos/testing-x86_64/PKGBUILD (from rev 299540, qt5-webkit/trunk/PKGBUILD) qt5-webkit/repos/testing-x86_64/qt5-webkit-gcc7.patch (from rev 299540, qt5-webkit/trunk/qt5-webkit-gcc7.patch) Deleted: qt5-webkit/repos/testing-i686/PKGBUILD qt5-webkit/repos/testing-x86_64/PKGBUILD --------------------------------------+ /PKGBUILD | 112 +++++++++++++++++++++++++++++++++ testing-i686/PKGBUILD | 51 --------------- testing-i686/qt5-webkit-gcc7.patch | 34 ++++++++++ testing-x86_64/PKGBUILD | 51 --------------- testing-x86_64/qt5-webkit-gcc7.patch | 34 ++++++++++ 5 files changed, 180 insertions(+), 102 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2017-07-02 10:17:40 UTC (rev 299540) +++ testing-i686/PKGBUILD 2017-07-02 10:18:10 UTC (rev 299541) @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt5-webkit -_qtver=5.212.0-alpha2 -pkgver=${_qtver/-/} -pkgrel=3 -arch=(i686 x86_64) -url='http://qt-project.org/' -license=(GPL3 LGPL3 FDL custom) -pkgdesc='Classes for a WebKit2 based implementation and a new QML API' -depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen) -makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools) -optdepends=('gst-plugins-good: Webm codec support') -conflicts=(qt5-webkit-ng) -replaces=(qt5-webkit-ng) -groups=(qt qt5) -_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz") -sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a') - -prepare() { - mkdir -p build -} - -build() { - cd build - - cmake ../qtwebkit-$_qtver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DPORT=Qt \ - -DENABLE_TOOLS=OFF - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} - -# Fix pkgconfig files - sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc - sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc - sed -e '/Name/a Description: Qt WebKit module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc - sed -e '/Name/a Description: Qt WebKitWidgets module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc -} Copied: qt5-webkit/repos/testing-i686/PKGBUILD (from rev 299540, qt5-webkit/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-07-02 10:18:10 UTC (rev 299541) @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-webkit +_qtver=5.212.0-alpha2 +pkgver=${_qtver/-/} +pkgrel=4 +arch=(i686 x86_64) +url='http://qt-project.org/' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Classes for a WebKit2 based implementation and a new QML API' +depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen) +makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools) +optdepends=('gst-plugins-good: Webm codec support') +conflicts=(qt5-webkit-ng) +replaces=(qt5-webkit-ng) +groups=(qt qt5) +_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" +source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz" qt5-webkit-gcc7.patch) +sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a' + 'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720') + +prepare() { + mkdir -p build + +# Fix crashes with GCC7 https://bugs.webkit.org/show_bug.cgi?id=173407 + cd qtwebkit-$_qtver + patch -p1 -i ../qt5-webkit-gcc7.patch +} + +build() { + cd build + + cmake ../qtwebkit-$_qtver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DPORT=Qt \ + -DENABLE_TOOLS=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} + +# Fix pkgconfig files + sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc + sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc + sed -e '/Name/a Description: Qt WebKit module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc + sed -e '/Name/a Description: Qt WebKitWidgets module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc +} Copied: qt5-webkit/repos/testing-i686/qt5-webkit-gcc7.patch (from rev 299540, qt5-webkit/trunk/qt5-webkit-gcc7.patch) =================================================================== --- testing-i686/qt5-webkit-gcc7.patch (rev 0) +++ testing-i686/qt5-webkit-gcc7.patch 2017-07-02 10:18:10 UTC (rev 299541) @@ -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) Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2017-07-02 10:17:40 UTC (rev 299540) +++ testing-x86_64/PKGBUILD 2017-07-02 10:18:10 UTC (rev 299541) @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt5-webkit -_qtver=5.212.0-alpha2 -pkgver=${_qtver/-/} -pkgrel=3 -arch=(i686 x86_64) -url='http://qt-project.org/' -license=(GPL3 LGPL3 FDL custom) -pkgdesc='Classes for a WebKit2 based implementation and a new QML API' -depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen) -makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools) -optdepends=('gst-plugins-good: Webm codec support') -conflicts=(qt5-webkit-ng) -replaces=(qt5-webkit-ng) -groups=(qt qt5) -_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz") -sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a') - -prepare() { - mkdir -p build -} - -build() { - cd build - - cmake ../qtwebkit-$_qtver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DPORT=Qt \ - -DENABLE_TOOLS=OFF - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} - -# Fix pkgconfig files - sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc - sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc - sed -e '/Name/a Description: Qt WebKit module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc - sed -e '/Name/a Description: Qt WebKitWidgets module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc -} Copied: qt5-webkit/repos/testing-x86_64/PKGBUILD (from rev 299540, qt5-webkit/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-07-02 10:18:10 UTC (rev 299541) @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-webkit +_qtver=5.212.0-alpha2 +pkgver=${_qtver/-/} +pkgrel=4 +arch=(i686 x86_64) +url='http://qt-project.org/' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='Classes for a WebKit2 based implementation and a new QML API' +depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen) +makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools) +optdepends=('gst-plugins-good: Webm codec support') +conflicts=(qt5-webkit-ng) +replaces=(qt5-webkit-ng) +groups=(qt qt5) +_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" +source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz" qt5-webkit-gcc7.patch) +sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a' + 'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720') + +prepare() { + mkdir -p build + +# Fix crashes with GCC7 https://bugs.webkit.org/show_bug.cgi?id=173407 + cd qtwebkit-$_qtver + patch -p1 -i ../qt5-webkit-gcc7.patch +} + +build() { + cd build + + cmake ../qtwebkit-$_qtver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DPORT=Qt \ + -DENABLE_TOOLS=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} + +# Fix pkgconfig files + sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc + sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc + sed -e '/Name/a Description: Qt WebKit module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc + sed -e '/Name/a Description: Qt WebKitWidgets module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc +} Copied: qt5-webkit/repos/testing-x86_64/qt5-webkit-gcc7.patch (from rev 299540, qt5-webkit/trunk/qt5-webkit-gcc7.patch) =================================================================== --- testing-x86_64/qt5-webkit-gcc7.patch (rev 0) +++ testing-x86_64/qt5-webkit-gcc7.patch 2017-07-02 10:18:10 UTC (rev 299541) @@ -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)