Date: Saturday, October 7, 2017 @ 06:33:46 Author: arojas Revision: 307070
Qt 5.9.2 Modified: qt5-3d/trunk/PKGBUILD qt5-base/trunk/PKGBUILD qt5-base/trunk/rebuild.list qt5-canvas3d/trunk/PKGBUILD qt5-charts/trunk/PKGBUILD qt5-connectivity/trunk/PKGBUILD qt5-datavis3d/trunk/PKGBUILD qt5-declarative/trunk/PKGBUILD qt5-doc/trunk/PKGBUILD qt5-examples/trunk/PKGBUILD qt5-gamepad/trunk/PKGBUILD qt5-graphicaleffects/trunk/PKGBUILD qt5-imageformats/trunk/PKGBUILD qt5-location/trunk/PKGBUILD qt5-multimedia/trunk/PKGBUILD qt5-networkauth/trunk/PKGBUILD qt5-quickcontrols/trunk/PKGBUILD qt5-quickcontrols2/trunk/PKGBUILD qt5-remoteobjects/trunk/PKGBUILD qt5-script/trunk/PKGBUILD qt5-scxml/trunk/PKGBUILD qt5-sensors/trunk/PKGBUILD qt5-serialbus/trunk/PKGBUILD qt5-serialport/trunk/PKGBUILD qt5-speech/trunk/PKGBUILD qt5-svg/trunk/PKGBUILD qt5-tools/trunk/PKGBUILD qt5-translations/trunk/PKGBUILD qt5-virtualkeyboard/trunk/PKGBUILD qt5-wayland/trunk/PKGBUILD qt5-webchannel/trunk/PKGBUILD qt5-webengine/trunk/PKGBUILD qt5-websockets/trunk/PKGBUILD qt5-webview/trunk/PKGBUILD qt5-x11extras/trunk/PKGBUILD qt5-xmlpatterns/trunk/PKGBUILD Deleted: qt5-webengine/trunk/clip-ft-glyph.diff ----------------------------------------+ qt5-3d/trunk/PKGBUILD | 6 - qt5-base/trunk/PKGBUILD | 14 -- qt5-base/trunk/rebuild.list | 3 qt5-canvas3d/trunk/PKGBUILD | 6 - qt5-charts/trunk/PKGBUILD | 6 - qt5-connectivity/trunk/PKGBUILD | 6 - qt5-datavis3d/trunk/PKGBUILD | 6 - qt5-declarative/trunk/PKGBUILD | 15 -- qt5-doc/trunk/PKGBUILD | 4 qt5-examples/trunk/PKGBUILD | 4 qt5-gamepad/trunk/PKGBUILD | 6 - qt5-graphicaleffects/trunk/PKGBUILD | 4 qt5-imageformats/trunk/PKGBUILD | 4 qt5-location/trunk/PKGBUILD | 6 - qt5-multimedia/trunk/PKGBUILD | 6 - qt5-networkauth/trunk/PKGBUILD | 6 - qt5-quickcontrols/trunk/PKGBUILD | 6 - qt5-quickcontrols2/trunk/PKGBUILD | 6 - qt5-remoteobjects/trunk/PKGBUILD | 6 - qt5-script/trunk/PKGBUILD | 6 - qt5-scxml/trunk/PKGBUILD | 4 qt5-sensors/trunk/PKGBUILD | 6 - qt5-serialbus/trunk/PKGBUILD | 6 - qt5-serialport/trunk/PKGBUILD | 6 - qt5-speech/trunk/PKGBUILD | 6 - qt5-svg/trunk/PKGBUILD | 6 - qt5-tools/trunk/PKGBUILD | 6 - qt5-translations/trunk/PKGBUILD | 4 qt5-virtualkeyboard/trunk/PKGBUILD | 6 - qt5-wayland/trunk/PKGBUILD | 6 - qt5-webchannel/trunk/PKGBUILD | 6 - qt5-webengine/trunk/PKGBUILD | 10 - qt5-webengine/trunk/clip-ft-glyph.diff | 162 ------------------------------- qt5-websockets/trunk/PKGBUILD | 6 - qt5-webview/trunk/PKGBUILD | 6 - qt5-x11extras/trunk/PKGBUILD | 6 - qt5-xmlpatterns/trunk/PKGBUILD | 6 - 37 files changed, 102 insertions(+), 282 deletions(-) Modified: qt5-3d/trunk/PKGBUILD =================================================================== --- qt5-3d/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-3d/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-3d -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4f1fe5b812d78987341b854e7f2907f0375dc188cfa6cf9db101b26e9dfd4996') +sha256sums=('c955a92fe2f3f2f03493ae0e9d973ebe1c4b1e037b58f18092fa2040f5b50783') prepare() { mkdir -p build Modified: qt5-base/trunk/PKGBUILD =================================================================== --- qt5-base/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-base/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -4,9 +4,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=5 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -27,12 +27,8 @@ groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch" - qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch" harmony-fix.diff) -sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6' - 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3' - '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3' +sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b' '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3') prepare() { @@ -52,10 +48,6 @@ # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417 sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf - # Fix accessibility build - patch -p1 -i ../qtbug-61731.patch - # Fix doc navigation - patch -p1 -i ../qtcreatorbug-18448.patch # Freetype 2.8.1 patch -p1 -i ../harmony-fix.diff } Modified: qt5-base/trunk/rebuild.list =================================================================== --- qt5-base/trunk/rebuild.list 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-base/trunk/rebuild.list 2017-10-07 06:33:46 UTC (rev 307070) @@ -7,9 +7,8 @@ kwin lxqt-qtplugin pyqt5 * -qt5-styleplugins +qt5-styleplugins * deepin-qt5integration * -deepin-tool-kit * deepin-file-manager * dtkwidget * dtkwm * Modified: qt5-canvas3d/trunk/PKGBUILD =================================================================== --- qt5-canvas3d/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-canvas3d/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-canvas3d -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4b8bf09330f03d2b3998f5447991546704715478c54f4f8d82d00bee3047de81') +sha256sums=('84a8d66c2c35b67af84376037cac71fe77a105df09ffef7906a9cb1aeafb3eea') prepare() { mkdir -p build Modified: qt5-charts/trunk/PKGBUILD =================================================================== --- qt5-charts/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-charts/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=qt5-charts -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7328cbdc138a0b40f874bb8db36e0aee7cdf1c93263e3a184471867876710da0') +sha256sums=('4e7af70a73828ee1eb9606bd2c071cc7347c5f928aaf07b420dce7376b1c6aa4') prepare() { mkdir -p build Modified: qt5-connectivity/trunk/PKGBUILD =================================================================== --- qt5-connectivity/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-connectivity/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-connectivity -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('40638b715517bff8509fe9fe1e6a4e45e0f66e68920605048e080dd023ae7fd5') +sha256sums=('2c759597ec959d54f29a3f628896d9208cf1f4e2269d8e01a9d3036f6995f3cc') prepare() { mkdir -p build Modified: qt5-datavis3d/trunk/PKGBUILD =================================================================== --- qt5-datavis3d/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-datavis3d/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=qt5-datavis3d -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('233cab90fa35c926717bf697e7259b4e5bc7af6a26183657b006dac80fc0a191') +sha256sums=('06ae5699872d048e8bb99464c420db3749c8b7601e9f855ce8b1e156d792b2b2') prepare() { mkdir -p build Modified: qt5-declarative/trunk/PKGBUILD =================================================================== --- qt5-declarative/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-declarative/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-declarative -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=5 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,11 +16,8 @@ conflicts=('qtchooser' 'qt5-declarative-render2d') replaces=('qt5-declarative-render2d') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qtbug-61681.patch::"https://github.com/qt/qtdeclarative/commit/ab5d4c78.patch" qtbug-61754.patch) -sha256sums=('d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff' - '0d8f1e91b221da8727618b81f3a6b80566095d1afe442f198a6ef29cdfb58898' - '6b4a77535275a6358f61d44b6f740cb85729992582f3b5669ac3b1ed1fdb4e05') +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08') prepare() { mkdir -p build @@ -27,10 +24,6 @@ # Use python2 for Python 2.x find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g' - - cd ${_pkgfqn} - patch -p1 -i ../qtbug-61681.patch # https://bugreports.qt.io/browse/QTBUG-61681 - patch -p1 -i ../qtbug-61754.patch # fix memory leak with threaded renderer } build() { Modified: qt5-doc/trunk/PKGBUILD =================================================================== --- qt5-doc/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-doc/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -4,7 +4,7 @@ # Contributor: Michael Hansen <zrax0111 gmail com> pkgname=qt5-doc -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz") -sha256sums=('7b41a37d4fe5e120cdb7114862c0153f86c07abbec8db71500443d2ce0c89795') +sha256sums=('6c6171a4d1ea3fbd4212d6a04899650218583df3ec583a8a6a4a589fe18620ff') prepare() { cd ${_pkgfqn} Modified: qt5-examples/trunk/PKGBUILD =================================================================== --- qt5-examples/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-examples/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -4,7 +4,7 @@ # Contributor: Michael Hansen <zrax0111 gmail com> pkgname=qt5-examples -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz") -sha256sums=('7b41a37d4fe5e120cdb7114862c0153f86c07abbec8db71500443d2ce0c89795') +sha256sums=('6c6171a4d1ea3fbd4212d6a04899650218583df3ec583a8a6a4a589fe18620ff') package() { _base="$pkgdir"/usr/share/doc/qt/examples Modified: qt5-gamepad/trunk/PKGBUILD =================================================================== --- qt5-gamepad/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-gamepad/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=qt5-gamepad -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('f10714df314b3ef992060454db62e07d0b6a1fc7cf8a4175c023c59f8821bc14') +sha256sums=('76d1e90d9015a189b6d77b3eeac1a8927cdb6a6d92b574d847f9387d07d9a552') prepare() { mkdir -p build Modified: qt5-graphicaleffects/trunk/PKGBUILD =================================================================== --- qt5-graphicaleffects/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-graphicaleffects/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-graphicaleffects -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} pkgrel=1 arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('5f86c38e36d9553049cfbe56d4869e73cf8ab920905402cbcafb56dd8a1a59ff') +sha256sums=('14594e7eb4b704dd69bf336828306fe8e6537c321d49ee0b701b3b1cdd8bfb76') prepare() { mkdir -p build Modified: qt5-imageformats/trunk/PKGBUILD =================================================================== --- qt5-imageformats/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-imageformats/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-imageformats -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} pkgrel=1 arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('79fee307310a66100bd3d907ea69bd039dcd727c15f27e990167e7a27d1b8a47') +sha256sums=('3a626ca0ac7ffc56b59c4b3f66aac6bc76954054cedb6938b961562228eb9df3') prepare() { mkdir -p build Modified: qt5-location/trunk/PKGBUILD =================================================================== --- qt5-location/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-location/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-location -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4bc43c1df69c5322f982588711d4a65f8408b71a36e43ba19b39d1aae87e1515') +sha256sums=('c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c') prepare() { mkdir -p build Modified: qt5-multimedia/trunk/PKGBUILD =================================================================== --- qt5-multimedia/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-multimedia/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-multimedia -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e48fbe71b4418eb7caba5ef5aa422483fb28d0e894cbc41f3d8b73b3d7fee6e4') +sha256sums=('c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520') prepare() { mkdir -p build Modified: qt5-networkauth/trunk/PKGBUILD =================================================================== --- qt5-networkauth/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-networkauth/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -2,9 +2,9 @@ # Maintainer: Felix Yan <felixonm...@archlinux.org> pkgname=qt5-networkauth -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=(i686 x86_64) url='http://qt-project.org/' license=(GPL3 LGPL3 FDL custom) @@ -13,7 +13,7 @@ groups=(qt qt5) _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2aff7ec9d12e686d0d0ea6bb957ac09d0f39afb31d072b7e129f617aeee8eab9') +sha256sums=('a003f05aaa330605c6572212b4df869c026eabbbeb241c991031fad2511d239a') prepare() { mkdir -p build Modified: qt5-quickcontrols/trunk/PKGBUILD =================================================================== --- qt5-quickcontrols/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-quickcontrols/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-quickcontrols -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('520ed0e110f9d0977eb873ea0e05a3d205c9c1b1ad2dd606875708848b21ec2e') +sha256sums=('5f09ecf8648acd8abed20d727b8517e0c53cf945e83a992ee58d4baadd84bd1f') prepare() { mkdir -p build Modified: qt5-quickcontrols2/trunk/PKGBUILD =================================================================== --- qt5-quickcontrols2/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-quickcontrols2/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-quickcontrols2 -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('203be0321112d1513b722fce463f9e30d7d00befb33349901d9517f4f13408ff') +sha256sums=('2b55dd3dd53b4a6abb0ceb74b7fb98a5e52e9056c71a6cdbaead5cdf9d1ac8d2') prepare() { mkdir -p build Modified: qt5-remoteobjects/trunk/PKGBUILD =================================================================== --- qt5-remoteobjects/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-remoteobjects/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=qt5-remoteobjects -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=(i686 x86_64) url='http://qt-project.org/' license=(GPL3 LGPL3 FDL custom) @@ -16,7 +16,7 @@ groups=(qt qt5) _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a04ef16017903050a4afefb64f1d6a88fadb3c9b3668b320d6dfc4fa1cc07c82') +sha256sums=('e68c10ea12b0162cf4a55ccd89ee131082e6701790c79eea259e0c1d798397fa') prepare() { mkdir -p build Modified: qt5-script/trunk/PKGBUILD =================================================================== --- qt5-script/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-script/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-script -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('176a08865d5f66437b0f279fc5d7f381f359f20bafbffcebdcac61e86415188f') +sha256sums=('47807db5c2684609a0252601fda0a153530a2c97abb8c96df30f4e7897cd40f1') prepare() { mkdir -p build Modified: qt5-scxml/trunk/PKGBUILD =================================================================== --- qt5-scxml/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-scxml/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,7 +3,7 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=qt5-scxml -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} pkgrel=1 arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('409758206d1381f262e879d8bde72c147f36f04af2be58986b5a61581e376bd4') +sha256sums=('9d2b1292bc632305aa1963bfbfc06e8b4489ca0f9ed380ea6410c9dc38aeb15d') prepare() { mkdir -p build Modified: qt5-sensors/trunk/PKGBUILD =================================================================== --- qt5-sensors/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-sensors/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-sensors -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('5af19397aa8ccd88c1fbb7cda4ee2a583f05bdf8ae090eb616bb276ff2e9e29c') +sha256sums=('79441588c9c8bd1b34b91481441614077ea335a0005e79a1dc68ad964284b5d3') prepare() { mkdir -p build Modified: qt5-serialbus/trunk/PKGBUILD =================================================================== --- qt5-serialbus/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-serialbus/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-serialbus -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('caa9feefbf1d51b38d6bc923428009d524c0c5eb77f30e4b6d84fec1ce19f3c3') +sha256sums=('bbc24bdafd0191fc808e08b19f378e74bedbb79faf4e396b66ba7ca9fed9be08') prepare() { mkdir -p build Modified: qt5-serialport/trunk/PKGBUILD =================================================================== --- qt5-serialport/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-serialport/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-serialport -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e1fe85bf292929c3a62cb4d21efaaa4e89f70f48ea10914da07d0670ec617a69') +sha256sums=('50ed9cc22db1615bc00267d24b0819813b854af3651ab6e5ffaa7f7c7e62cd42') prepare() { mkdir -p build Modified: qt5-speech/trunk/PKGBUILD =================================================================== --- qt5-speech/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-speech/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -2,9 +2,9 @@ # Maintainer: Felix Yan <felixonm...@archlinux.org> pkgname=qt5-speech -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=(i686 x86_64) url='http://qt-project.org/' license=(GPL3 LGPL3 FDL custom) @@ -15,7 +15,7 @@ groups=(qt qt5) _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ac9cef10637b54fa8d0bfe83f5b98c1c295cb68e63cf0973b2c6f188dcecaa01') +sha256sums=('ef7a84ec5a30c7c79d390b5cc56d476baa7c8b9f3b36f8b76d079fe85c1b0333') prepare() { mkdir -p build Modified: qt5-svg/trunk/PKGBUILD =================================================================== --- qt5-svg/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-svg/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-svg -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('99f294f874b13553e4ed49cd9465580ad0c9b92e29cdfa47b2e4096835c1e2e5') +sha256sums=('ba96ebfbb60d2793547295b7122a127d21ba44cf586bfd3c8212c59d68661108') prepare() { mkdir -p build Modified: qt5-tools/trunk/PKGBUILD =================================================================== --- qt5-tools/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-tools/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-tools -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -18,7 +18,7 @@ _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" {assistant,designer,linguist,qdbusviewer}.desktop) -sha256sums=('c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8' +sha256sums=('2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a' '8092d6d846e39632107b14726fa112862d800e929ef10f05f2a284dbda9b53c4' '366e18ba400068df40d26a3c944d6bd4925bf22c32f171b837a3f4e387eff019' 'db1ad1d27ce73820b8d50291618b6f817292f15f55107274064b9ae99201069a' Modified: qt5-translations/trunk/PKGBUILD =================================================================== --- qt5-translations/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-translations/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-translations -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4a12528a14ed77f31672bd7469cad30624e7b672f241b8f19ad59510298eb269') +sha256sums=('5df16ddf9da0f42a3040aef2a92ad7da67381e2e4c132632fddf3a7a8026d12f') prepare() { mkdir -p build Modified: qt5-virtualkeyboard/trunk/PKGBUILD =================================================================== --- qt5-virtualkeyboard/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-virtualkeyboard/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=qt5-virtualkeyboard -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('6b746a6dc3ab54edf3007d0f6a2f8f31281aed03629830f59acfbc8514d6e94c') +sha256sums=('e836ca0348b21df28635e541713726444abed7b53a0acf3358cc90532e64c6fc') prepare() { mkdir -p build Modified: qt5-wayland/trunk/PKGBUILD =================================================================== --- qt5-wayland/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-wayland/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-wayland -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('cf0cb1982a7b748bfec8c7834691f13072f104884c61809d0bbd1a01ebda3ffa') +sha256sums=('f6434d03f933867dfb219abec2cf19e2c1d1ef23d46d12cb9333c8066027f6c6') prepare() { mkdir -p build Modified: qt5-webchannel/trunk/PKGBUILD =================================================================== --- qt5-webchannel/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-webchannel/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-webchannel -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('80425f5a6df8784f5221809ffd664486ed38427f514ab4ec174e20456b027000') +sha256sums=('9c1b4defecadd7f9ee15d5815d464abef0961fc565cc7831720fc7c0c0d13a26') prepare() { mkdir -p build Modified: qt5-webengine/trunk/PKGBUILD =================================================================== --- qt5-webengine/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-webengine/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-webengine -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('LGPL3' 'LGPL2.1' 'BSD') @@ -17,9 +17,8 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - clip-ft-glyph.diff harmony-fix.diff) -sha256sums=('f6a37eeb9188474a16d29ede498fce959396ab80329a0a83eaeb925251686401' - 'd5e5580a96ecc4a66ce12dde0737c1ed5cb31017a6ec488ffe372192ed893e1b' + harmony-fix.diff) +sha256sums=('cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108' '2c309c0f6978e6a399422319b5034b01881d5526cf48b2ee5fcc7f418029a344') prepare() { @@ -32,7 +31,6 @@ cd ${_pkgfqn} # FreeType 2.8.1 - patch -d src/3rdparty/chromium/third_party -Np3 < ../clip-ft-glyph.diff patch -Np1 -i ../harmony-fix.diff } Deleted: qt5-webengine/trunk/clip-ft-glyph.diff =================================================================== --- qt5-webengine/trunk/clip-ft-glyph.diff 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-webengine/trunk/clip-ft-glyph.diff 2017-10-07 06:33:46 UTC (rev 307070) @@ -1,162 +0,0 @@ -# HG changeset patch -# User Lee Salzman <lsalz...@mozilla.com> -# Date 1504120456 14400 -# Wed Aug 30 15:14:16 2017 -0400 -# Node ID 708d52f954b6d7ca2497fcb5b5084c6483300e89 -# Parent 33224536ce20d942576cd4b9ffb350d6dce397bc -clip FreeType glyph bitmap to mask in Skia - -MozReview-Commit-ID: 9NqLj9SkHFo - -diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp ---- a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp -+++ b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp -@@ -390,65 +390,131 @@ void SkScalerContext_FreeType_Base::gene - const SkMatrix& bitmapTransform) - { - const bool doBGR = SkToBool(fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag); - const bool doVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag); - - switch ( face->glyph->format ) { - case FT_GLYPH_FORMAT_OUTLINE: { - FT_Outline* outline = &face->glyph->outline; -- FT_BBox bbox; -- FT_Bitmap target; - - int dx = 0, dy = 0; - if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) { - dx = SkFixedToFDot6(glyph.getSubXFixed()); - dy = SkFixedToFDot6(glyph.getSubYFixed()); - // negate dy since freetype-y-goes-up and skia-y-goes-down - dy = -dy; - } -- FT_Outline_Get_CBox(outline, &bbox); -- /* -- what we really want to do for subpixel is -- offset(dx, dy) -- compute_bounds -- offset(bbox & !63) -- but that is two calls to offset, so we do the following, which -- achieves the same thing with only one offset call. -- */ -- FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), -- dy - ((bbox.yMin + dy) & ~63)); -+ -+ memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); - - if (SkMask::kLCD16_Format == glyph.fMaskFormat) { -+ FT_Outline_Translate(outline, dx, dy); - FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : - FT_RENDER_MODE_LCD); - if (err) { - SK_TRACEFTR(err, "Could not render glyph."); -- sk_bzero(glyph.fImage, glyph.computeImageSize()); - return; - } -+ - SkMask mask; - glyph.toMask(&mask); -+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE -+ memset(mask.fImage, 0x80, mask.fBounds.height() * mask.fRowBytes); -+#endif -+ FT_GlyphSlotRec& ftGlyph = *face->glyph; -+ -+ if (!SkIRect::Intersects(mask.fBounds, -+ SkIRect::MakeXYWH( ftGlyph.bitmap_left, -+ -ftGlyph.bitmap_top, -+ ftGlyph.bitmap.width, -+ ftGlyph.bitmap.rows))) -+ { -+ return; -+ } -+ -+ // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask. -+ // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded). -+ unsigned char* origBuffer = ftGlyph.bitmap.buffer; -+ // First align the top left (origin). -+ if (-ftGlyph.bitmap_top < mask.fBounds.fTop) { -+ int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top); -+ ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff; -+ ftGlyph.bitmap.rows -= topDiff; -+ ftGlyph.bitmap_top = -mask.fBounds.fTop; -+ } -+ if (ftGlyph.bitmap_left < mask.fBounds.fLeft) { -+ int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left; -+ ftGlyph.bitmap.buffer += leftDiff; -+ ftGlyph.bitmap.width -= leftDiff; -+ ftGlyph.bitmap_left = mask.fBounds.fLeft; -+ } -+ if (mask.fBounds.fTop < -ftGlyph.bitmap_top) { -+ mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop); -+ mask.fBounds.fTop = -ftGlyph.bitmap_top; -+ } -+ if (mask.fBounds.fLeft < ftGlyph.bitmap_left) { -+ mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft); -+ mask.fBounds.fLeft = ftGlyph.bitmap_left; -+ } -+ // Origins aligned, clean up the width and height. -+ int ftVertScale = (doVert ? 3 : 1); -+ int ftHoriScale = (doVert ? 1 : 3); -+ if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) { -+ ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale; -+ } -+ if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) { -+ ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale; -+ } -+ if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) { -+ mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale; -+ } -+ if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) { -+ mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale; -+ } - if (fPreBlend.isApplicable()) { -- copyFT2LCD16<true>(face->glyph->bitmap, mask, doBGR, -+ copyFT2LCD16<true>(ftGlyph.bitmap, mask, doBGR, - fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); - } else { -- copyFT2LCD16<false>(face->glyph->bitmap, mask, doBGR, -+ copyFT2LCD16<false>(ftGlyph.bitmap, mask, doBGR, - fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); - } -+ // Restore the buffer pointer so FreeType can properly free it. -+ ftGlyph.bitmap.buffer = origBuffer; - } else { -+ FT_BBox bbox; -+ FT_Bitmap target; -+ FT_Outline_Get_CBox(outline, &bbox); -+ /* -+ what we really want to do for subpixel is -+ offset(dx, dy) -+ compute_bounds -+ offset(bbox & !63) -+ but that is two calls to offset, so we do the following, which -+ achieves the same thing with only one offset call. -+ */ -+ FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), -+ dy - ((bbox.yMin + dy) & ~63)); -+ - target.width = glyph.fWidth; - target.rows = glyph.fHeight; - target.pitch = glyph.rowBytes(); - target.buffer = reinterpret_cast<uint8_t*>(glyph.fImage); - target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat); - target.num_grays = 256; - -- memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); - FT_Outline_Get_Bitmap(face->glyph->library, outline, &target); -+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE -+ for (int y = 0; y < glyph.fHeight; ++y) { -+ for (int x = 0; x < glyph.fWidth; ++x) { -+ uint8_t& a = ((uint8_t*)glyph.fImage)[(glyph.rowBytes() * y) + x]; -+ a = SkTMax<uint8_t>(a, 0x20); -+ } -+ } -+#endif - } - } break; - - case FT_GLYPH_FORMAT_BITMAP: { - FT_Pixel_Mode pixel_mode = static_cast<FT_Pixel_Mode>(face->glyph->bitmap.pixel_mode); - SkMask::Format maskFormat = static_cast<SkMask::Format>(glyph.fMaskFormat); - - // Assume that the other formats do not exist. Modified: qt5-websockets/trunk/PKGBUILD =================================================================== --- qt5-websockets/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-websockets/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-websockets -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('01277362430b5a75c19a16ded8cf4c53a3bccddcc0ba2f50648e0f2985f23464') +sha256sums=('afddc1bd915ea47ccbec968a7af02e2a5405c717830e4671924fe35b55e81674') prepare() { mkdir -p build Modified: qt5-webview/trunk/PKGBUILD =================================================================== --- qt5-webview/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-webview/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=qt5-webview -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('d6f77bfa60033561d123b1224679178c956319549666e84d4736c5e109ccbd62') +sha256sums=('fccaec79c73c62010f90bdd1a85b31d5caa63e0a1a28983bb74f6127afe1b8b1') prepare() { mkdir -p build Modified: qt5-x11extras/trunk/PKGBUILD =================================================================== --- qt5-x11extras/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-x11extras/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-x11extras -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a63d0e28958331d672dbd0f8c554bdaddbc974a27be37601f7f221a2ef1ad601') +sha256sums=('db85450ad4851816a4fade1ffc10d078d28f2cca174cffa6cbd6d1220b395ac5') prepare() { mkdir -p build Modified: qt5-xmlpatterns/trunk/PKGBUILD =================================================================== --- qt5-xmlpatterns/trunk/PKGBUILD 2017-10-06 22:51:40 UTC (rev 307069) +++ qt5-xmlpatterns/trunk/PKGBUILD 2017-10-07 06:33:46 UTC (rev 307070) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=qt5-xmlpatterns -_qtver=5.9.1 +_qtver=5.9.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('b584686496ad1b1b3426d642bd705cab3fc02313b067a33d1b826a27aee29c24') +sha256sums=('0aa6aa83087d5754cfefaa3d119454009fc2dd5f266c1eb2ea7a434cef22d34e') prepare() { mkdir -p build