Date: Thursday, September 5, 2019 @ 08:51:27 Author: arojas Revision: 361635
Qt 5.13.1 Modified: qt5-3d/trunk/PKGBUILD qt5-base/repos/extra-x86_64/PKGBUILD qt5-base/trunk/PKGBUILD qt5-charts/trunk/PKGBUILD qt5-connectivity/trunk/PKGBUILD qt5-datavis3d/trunk/PKGBUILD qt5-declarative/trunk/PKGBUILD qt5-doc/trunk/PKGBUILD qt5-gamepad/trunk/PKGBUILD qt5-graphicaleffects/trunk/PKGBUILD qt5-imageformats/trunk/PKGBUILD qt5-location/trunk/PKGBUILD qt5-lottie/trunk/PKGBUILD qt5-multimedia/trunk/PKGBUILD qt5-networkauth/trunk/PKGBUILD qt5-purchasing/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-webglplugin/trunk/PKGBUILD qt5-websockets/trunk/PKGBUILD qt5-webview/trunk/PKGBUILD qt5-x11extras/trunk/PKGBUILD qt5-xmlpatterns/trunk/PKGBUILD Deleted: qt5-base/trunk/virtualbox-focus.patch qt5-webengine/trunk/qtbug-76958.patch qt5-webengine/trunk/qtwebengine-glibc-2.29.patch --------------------------------------------------+ qt5-3d/trunk/PKGBUILD | 4 qt5-base/repos/extra-x86_64/PKGBUILD | 25 ++++- qt5-base/trunk/PKGBUILD | 18 --- qt5-base/trunk/virtualbox-focus.patch | 13 -- qt5-charts/trunk/PKGBUILD | 4 qt5-connectivity/trunk/PKGBUILD | 4 qt5-datavis3d/trunk/PKGBUILD | 4 qt5-declarative/trunk/PKGBUILD | 4 qt5-doc/trunk/PKGBUILD | 4 qt5-gamepad/trunk/PKGBUILD | 4 qt5-graphicaleffects/trunk/PKGBUILD | 4 qt5-imageformats/trunk/PKGBUILD | 13 -- qt5-location/trunk/PKGBUILD | 4 qt5-lottie/trunk/PKGBUILD | 8 + qt5-multimedia/trunk/PKGBUILD | 4 qt5-networkauth/trunk/PKGBUILD | 4 qt5-purchasing/trunk/PKGBUILD | 4 qt5-quickcontrols/trunk/PKGBUILD | 4 qt5-quickcontrols2/trunk/PKGBUILD | 4 qt5-remoteobjects/trunk/PKGBUILD | 4 qt5-script/trunk/PKGBUILD | 4 qt5-scxml/trunk/PKGBUILD | 4 qt5-sensors/trunk/PKGBUILD | 4 qt5-serialbus/trunk/PKGBUILD | 4 qt5-serialport/trunk/PKGBUILD | 4 qt5-speech/trunk/PKGBUILD | 4 qt5-svg/trunk/PKGBUILD | 4 qt5-tools/trunk/PKGBUILD | 6 - qt5-translations/trunk/PKGBUILD | 4 qt5-virtualkeyboard/trunk/PKGBUILD | 4 qt5-wayland/trunk/PKGBUILD | 19 --- qt5-webchannel/trunk/PKGBUILD | 4 qt5-webengine/trunk/PKGBUILD | 23 +--- qt5-webengine/trunk/qtbug-76958.patch | 31 ------ qt5-webengine/trunk/qtwebengine-glibc-2.29.patch | 105 --------------------- qt5-webglplugin/trunk/PKGBUILD | 4 qt5-websockets/trunk/PKGBUILD | 4 qt5-webview/trunk/PKGBUILD | 4 qt5-x11extras/trunk/PKGBUILD | 4 qt5-xmlpatterns/trunk/PKGBUILD | 4 40 files changed, 110 insertions(+), 271 deletions(-) Modified: qt5-3d/trunk/PKGBUILD =================================================================== --- qt5-3d/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-3d/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-3d -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -13,7 +13,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('9f6b317acbcf483bf78465956669957eb19fdd8df610e9a580d42017e629ec4f') +sha256sums=('092dc9a691eb784b30b1a48799c23578f0f17d892b1cbd25f18130c67f51a452') prepare() { mkdir -p build Modified: qt5-base/repos/extra-x86_64/PKGBUILD =================================================================== --- qt5-base/repos/extra-x86_64/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-base/repos/extra-x86_64/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -5,7 +5,13 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.13.0 pkgver=${_qtver/-/} +<<<<<<< .mine +pkgrel=2 +||||||| .r356453 +pkgrel=1 +======= pkgrel=7 +>>>>>>> .r361627 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -26,8 +32,17 @@ conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" +<<<<<<< .mine source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"; + qtbug-76440.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=6d61b10";) +sha256sums=('20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195') +||||||| .r356453 +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) +sha256sums=('20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195') +======= +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; + qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"; qtbase-zlib-compression.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77"; virtualbox-focus.patch) sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe' @@ -34,6 +49,7 @@ '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646' '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233' '21c4acce7a789cd0e1e67aca76cf15f536ae8e30ef711a434cfe7ec377556f06') +>>>>>>> .r361627 prepare() { cd ${_pkgfqn} @@ -44,10 +60,17 @@ mkspecs/common/gcc-base.conf sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ mkspecs/common/g++-unix.conf +<<<<<<< .mine patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze + patch -p1 -i ../qtbug-76440.patch # Fix crashes on multi-screen systems +||||||| .r356453 +======= + + patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze patch -p1 -i ../qtbase-zlib-compression.patch # Change the default compression back to zlib for backwards compatibility patch -p1 -i ../virtualbox-focus.patch # Fix virtualbox constantly stealing focus https://bugreports.qt.io/browse/QTBUG-76742 +>>>>>>> .r361627 } build() { @@ -66,7 +89,7 @@ -openssl-linked \ -nomake examples \ -no-rpath \ - -optimized-qmake \ +# -optimized-qmake \ -dbus-linked \ -system-harfbuzz \ -journald \ Modified: qt5-base/trunk/PKGBUILD =================================================================== --- qt5-base/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-base/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -3,9 +3,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} -pkgrel=7 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -26,14 +26,8 @@ conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; - qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"; - qtbase-zlib-compression.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77"; - virtualbox-focus.patch) -sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe' - '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646' - '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233' - '21c4acce7a789cd0e1e67aca76cf15f536ae8e30ef711a434cfe7ec377556f06') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) +sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab') prepare() { cd ${_pkgfqn} @@ -44,10 +38,6 @@ mkspecs/common/gcc-base.conf sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ mkspecs/common/g++-unix.conf - - patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze - patch -p1 -i ../qtbase-zlib-compression.patch # Change the default compression back to zlib for backwards compatibility - patch -p1 -i ../virtualbox-focus.patch # Fix virtualbox constantly stealing focus https://bugreports.qt.io/browse/QTBUG-76742 } build() { Deleted: qt5-base/trunk/virtualbox-focus.patch =================================================================== --- qt5-base/trunk/virtualbox-focus.patch 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-base/trunk/virtualbox-focus.patch 2019-09-05 08:51:27 UTC (rev 361635) @@ -1,13 +0,0 @@ -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9382488b74..1bf1ab268d 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut() - connection()->setFocusWindow(nullptr); - relayFocusToModalWindow(); - // Do not set the active window to nullptr if there is a FocusIn coming. -- connection()->focusInTimer().start(400); -+ connection()->focusInTimer().start(100); - } - - struct QtMotifWmHints { Modified: qt5-charts/trunk/PKGBUILD =================================================================== --- qt5-charts/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-charts/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-charts -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('04e381ec287edf230583eb32fbcde40bce62119d3eabbe2978f4ce8366e36b27') +sha256sums=('95fb573137bfd9e3655d4fb0e9fc80894e58d4f5fc02c48e46068cee27ff7aad') prepare() { mkdir -p build Modified: qt5-connectivity/trunk/PKGBUILD =================================================================== --- qt5-connectivity/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-connectivity/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-connectivity -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('64fad0692c639d25295cc85f12526f3fe2eaeb51bcf47d8561ad00dd57ad5053') +sha256sums=('a1c4120ca00a8b6f275d6ad3f94565fd154b5ec2c7ca167f99cdccf6b0d5ee6f') prepare() { mkdir -p build Modified: qt5-datavis3d/trunk/PKGBUILD =================================================================== --- qt5-datavis3d/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-datavis3d/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-datavis3d -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('6f4e5dd8e7a94d117f374a9b66013e373f5c1ccf963ad6556bf1fc8baf783821') +sha256sums=('b153f05028eabf9485c6b5c321fb3e093402be9d8717518dd9eaaad8fafaa256') prepare() { mkdir -p build Modified: qt5-declarative/trunk/PKGBUILD =================================================================== --- qt5-declarative/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-declarative/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-declarative -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ conflicts=('qtchooser') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9') +sha256sums=('ae3477401b13d6b31e8569629d3f73b3e81e27cec27595988ffd320eaec7f0e2') prepare() { mkdir -p build Modified: qt5-doc/trunk/PKGBUILD =================================================================== --- qt5-doc/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-doc/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -4,7 +4,7 @@ pkgbase=qt5-doc pkgname=(qt5-doc qt5-examples) -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="qt-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz";) -sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6') +sha256sums=('adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e') prepare() { cd ${_pkgfqn} Modified: qt5-gamepad/trunk/PKGBUILD =================================================================== --- qt5-gamepad/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-gamepad/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-gamepad -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('6bc1086d8c6a36a80dfa939b5ecb372be8c913a81e2986d84302012eafdc4b63') +sha256sums=('660e2bea430be5dc75557d038f162b77454c945ab6df1a1f4a7d69011e02c199') prepare() { mkdir -p build Modified: qt5-graphicaleffects/trunk/PKGBUILD =================================================================== --- qt5-graphicaleffects/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-graphicaleffects/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-graphicaleffects -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('33bf92d6560d4d7b87f3e99dfacbc9cafc7ea5ef3d40f00cc3777a005251d0ff') +sha256sums=('f6611773c1104c26fed412dc559ae34563dbd7aea9582722fdde098cc3cbc8a7') prepare() { mkdir -p build Modified: qt5-imageformats/trunk/PKGBUILD =================================================================== --- qt5-imageformats/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-imageformats/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,9 +2,9 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-imageformats -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -13,16 +13,11 @@ makedepends=() groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; - qtimageformats-system-libtiff.patch::"https://code.qt.io/cgit/qt/qtimageformats.git/patch/?id=626c3053";) -sha256sums=('91cb638e5f856acc17ab5a2e1a052dc91bb1af2bdbd7d99ba6a8a48f4a15f499' - '272e6b1e4eaeb11ea97ae9e563c6375ed1a202bf21339cdd85dae9341dbd9130') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) +sha256sums=('f6aa1e3fe6c3d786e211e4bd46a1349192efd82364739c0d708b7f2003a93ddf') prepare() { mkdir -p build - - cd $_pkgfqn - patch -p1 -i ../qtimageformats-system-libtiff.patch # Fix using system libtiff } build() { Modified: qt5-location/trunk/PKGBUILD =================================================================== --- qt5-location/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-location/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-location -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -13,7 +13,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('205a47d259841b3879c59d3054d8b1098d3b0e7b45c64ad327daedefb4421414') +sha256sums=('16bd4d64b12fc3f8276fe37985f2b0f5443317c882937ab5e0b583a3a9eed298') prepare() { mkdir -p build Modified: qt5-lottie/trunk/PKGBUILD =================================================================== --- qt5-lottie/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-lottie/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt5-lottie -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -9,11 +9,13 @@ url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations' -depends=('qt5-declarative') +depends=('qt5-base') +makedepends=('qt5-declarative') +optdepends=('qt5-declarative: QML bindings') groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('5315e8a5d1ab76b61e1cf5f88f5ed43fe06b91ec732139902c9a242ac5ea714c') +sha256sums=('ea8697bcbb903befde08edce95589b6ef17872c1cab11f164cac0a7ddec51136') prepare() { mkdir -p build Modified: qt5-multimedia/trunk/PKGBUILD =================================================================== --- qt5-multimedia/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-multimedia/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-multimedia -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -17,7 +17,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('5076219d277083d2535e5f739d06783abe2e059e9d3fd9f924a1fa7970946d72') +sha256sums=('5efdb5876596c3472d24acf1ed753574dfa87b500458ea675c3112e8c2acec65') prepare() { mkdir -p build Modified: qt5-networkauth/trunk/PKGBUILD =================================================================== --- qt5-networkauth/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-networkauth/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt5-networkauth -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -13,7 +13,7 @@ groups=(qt qt5) _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('91ff879d0a9f7e8ff658fb569136f102ee9f25bd47852e97a1f39826c1932c0d') +sha256sums=('d5306dd7d6aa128382505046b06ad7f9c17c56a9c4277dc862c13add06b89e4a') prepare() { mkdir -p build Modified: qt5-purchasing/trunk/PKGBUILD =================================================================== --- qt5-purchasing/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-purchasing/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-purchasing -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('8aba72cf543f3ef26d128824f844487beea319fbd155931a8771afcf48cdeb7e') +sha256sums=('7e5ef82f758cb73285920c9f6918454504450f03e0323e357cfe2f3f2552f559') prepare() { mkdir -p build Modified: qt5-quickcontrols/trunk/PKGBUILD =================================================================== --- qt5-quickcontrols/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-quickcontrols/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-quickcontrols -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('a5c6d40e0432246129d3f350a9aa419901dd73f2e4f8af6efb7a3e86e57ae167') +sha256sums=('5f3dd9a7c25aabe7a21ed7d137c23e2bfff948fefe94b183b5dee1a13667eb9b') prepare() { mkdir -p build Modified: qt5-quickcontrols2/trunk/PKGBUILD =================================================================== --- qt5-quickcontrols2/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-quickcontrols2/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-quickcontrols2 -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('a5cb7e6d68285203bfb1aee87551228879fa9d93d87be5c8bab38e5a79dc916d') +sha256sums=('47df5a0d9b65bd6d06fc7edc2a93fba679249d4942163230a72ff6f3cc9f7ab8') prepare() { mkdir -p build Modified: qt5-remoteobjects/trunk/PKGBUILD =================================================================== --- qt5-remoteobjects/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-remoteobjects/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-remoteobjects -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt qt5) _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('24b2fc953ab4db7f46d8b7da38fef2483b2e9a51ea6836007077947e246fdadc') +sha256sums=('892a10502b2659e6a0f20167a5b6d71338fd01082e33e4b07eba43b0bbfcce69') prepare() { mkdir -p build Modified: qt5-script/trunk/PKGBUILD =================================================================== --- qt5-script/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-script/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-script -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('2323eb93a215b837d8d276f7f35e7dfb6a28b952d8b51fb92c60619813a37a80') +sha256sums=('870c65c5dff20eb797a629bd4544aa60874f44eecc0743300e83cce5708648c8') prepare() { mkdir -p build Modified: qt5-scxml/trunk/PKGBUILD =================================================================== --- qt5-scxml/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-scxml/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-scxml -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('fcd5b347a51d47b70b8192a20934951bb80cafa18fa55413ffc9e1fcb1bb2766') +sha256sums=('0669ede4e1373199893308362b9a0ba828f570a578dca52e1f17d1d622612511') prepare() { mkdir -p build Modified: qt5-sensors/trunk/PKGBUILD =================================================================== --- qt5-sensors/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-sensors/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-sensors -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('1fae52836c786a9fd50e9e1d590384b9aea479f4569e33fc2d69536bbe2cde48') +sha256sums=('fa55e96bebb946326c46b720059536bce1e939a63b60f3c990a24ac8fec759d3') prepare() { mkdir -p build Modified: qt5-serialbus/trunk/PKGBUILD =================================================================== --- qt5-serialbus/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-serialbus/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-serialbus -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('5ef8ce8d7dbdd4065e1a1e842d7effb7134ce262790fcd59076937f3b40b78f3') +sha256sums=('643bf5512212a1dc89047d25ed3f766bf08362c143f1da485f5235d3023ca565') prepare() { mkdir -p build Modified: qt5-serialport/trunk/PKGBUILD =================================================================== --- qt5-serialport/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-serialport/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-serialport -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('2f58309789e1d6b3a2653922f932703cfffddaea06bff63a552900bd63beb985') +sha256sums=('d96706f406d89b459ed0ecd129b68309a91cea0f132b839958b5311ea0d118d2') prepare() { mkdir -p build Modified: qt5-speech/trunk/PKGBUILD =================================================================== --- qt5-speech/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-speech/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt5-speech -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt qt5) _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('1bfeea13cc23a9d9a02081f4e3378bc8ef51af5dfd684b261cf0a0e93be5b644') +sha256sums=('347343a96710b389e8e05506df3c971b9437f101d09677e44f4bf2a87bf25556') prepare() { mkdir -p build Modified: qt5-svg/trunk/PKGBUILD =================================================================== --- qt5-svg/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-svg/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-svg -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -13,7 +13,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('0f568e20d13418c6d8e395db2ce4d2d706d3fb470cd665853e3637a29fde0eaf') +sha256sums=('409e8845c28412041c36f559a7a6e2414f3d9a8dd45c5a85065e279b788e07ab') prepare() { mkdir -p build Modified: qt5-tools/trunk/PKGBUILD =================================================================== --- qt5-tools/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-tools/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,9 +2,9 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-tools -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -17,7 +17,7 @@ _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; {assistant,designer,linguist,qdbusviewer}.desktop) -sha256sums=('a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819' +sha256sums=('7947bdd758514a0c2d44b0a2110adb6056b18bce75c716711e48bcc8de5c7e82' '8092d6d846e39632107b14726fa112862d800e929ef10f05f2a284dbda9b53c4' '92f3e5dc8bc416e02893c38a05287238853e0c20732df1e62d6a672744a34e7c' '15781519115e36d2c67c12ee6bc636425cd445072f43cb8bdd1364cfacbe4c45' Modified: qt5-translations/trunk/PKGBUILD =================================================================== --- qt5-translations/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-translations/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-translations -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('2f8fb3b2c62fcf1aacd0b32432b960a83546384688c0ea78514e4cf4f2f94c28') +sha256sums=('01320c62ce28c5d7bc6d3c078e11d4d80415ab007ad94ffe1a635a2ce0ddccfd') prepare() { mkdir -p build Modified: qt5-virtualkeyboard/trunk/PKGBUILD =================================================================== --- qt5-virtualkeyboard/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-virtualkeyboard/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-virtualkeyboard -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('91483feb79c648ec8820a238ee2a12cf1aa117e8f3a5b06d069450e0c9ad42e9') +sha256sums=('b44b2f788250a85d86f682bea4c0cdc8a70dd630d44682a545790b2618b28195') prepare() { mkdir -p build Modified: qt5-wayland/trunk/PKGBUILD =================================================================== --- qt5-wayland/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-wayland/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,9 +2,9 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-wayland -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -12,22 +12,11 @@ depends=('qt5-declarative' 'libxcomposite') groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; - kdebug-407651.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=21a5038f"; - qtbug-76397a.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=ec905708"; - qtbug-76397b.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=a4e6f88f";) -sha256sums=('b67a6d8119628bca3301bd03992880db07d61d405534067c9cd2a598695a7cf3' - 'f21ff86a4ffb4ba7648cba8d6434d7b0a8caa8abf650ba382d3cfa63c934e01b' - 'ab3c4c1f91c3ebfb4da463fc52959cc4a9b531988b6253fb78e64be05581905d' - 'b61b9872c83a27aad97d21f4e217b6c21f8d94deb164358ce09e3fdbd09332b4') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) +sha256sums=('def836f365b8af99cc693625f2079a54a0f71f5eff3f370dcf6f30b8944caf77') prepare() { mkdir -p build - - cd $_pkgfqn - patch -p1 -i ../kdebug-407651.patch # Prevent windows from getting larger after closing and reopening https://bugs.kde.org/show_bug.cgi?id=407651 - patch -p1 -i ../qtbug-76397a.patch - patch -p1 -i ../qtbug-76397b.patch # https://bugreports.qt.io/browse/QTBUG-76657 } build() { Modified: qt5-webchannel/trunk/PKGBUILD =================================================================== --- qt5-webchannel/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-webchannel/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-webchannel -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('7f6260c73bca968511ab2facfbb14b4d8cc7a9c5b2d0f9211e7390ed8fb52b9a') +sha256sums=('f72f875a0cafe7931341ef31084acfb489ede79c36dbce74820c2a5b5d6afb2c') prepare() { mkdir -p build Modified: qt5-webengine/trunk/PKGBUILD =================================================================== --- qt5-webengine/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-webengine/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,9 +2,9 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-webengine -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} -pkgrel=4 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('LGPL3' 'LGPL2.1' 'BSD') @@ -15,26 +15,15 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; - qtwebengine-glibc-2.29.patch - qtbug-77037-workaround.patch - qtbug-76913.patch::"https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=4746bb90"; - qtbug-76958.patch) # "https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=662de14c"; -sha256sums=('e0af82ecee1ab41b6732697f667b98b7b0c53164bebcfaad8070e88b2e064efe' - 'dd791f154b48e69cd47fd94753c45448655b529590995fd71ac1591c53a3d60c' - '3e3bb8ecf292e7f249d001db4a4a072ca4ba38f713f496122bd7c73d93d5def9' - '5771af2442d7743ef7c59f0d3716a23985383e2b69ecb4fa9d4ea8e8f7c551fa' - 'eef55340b3ec5f8d1020b7327eda67f86729aaf70107c688deb15083f5ca8fbc') + qtbug-77037-workaround.patch) +sha256sums=('7f12e710b76ff2be4497bf368fc01ecd2419e2e962fb90599b0ece00ae2eb7d0' + '3e3bb8ecf292e7f249d001db4a4a072ca4ba38f713f496122bd7c73d93d5def9') prepare() { mkdir -p build cd ${_pkgfqn} - patch -p1 -i ../qtbug-76913.patch # Fix crashes on media-heavy sites - patch -p1 -i ../qtbug-76958.patch # Fix crash when loading tabs on the background - patch -p1 -i ../qtbug-77037-workaround.patch # Link to pulseaudio to avoid header mismatch - - cd src/3rdparty/chromium - patch -p1 -i "$srcdir"/qtwebengine-glibc-2.29.patch # Fix PPAPI plugins with glibc 2.29 + patch -p1 -i "$srcdir"/qtbug-77037-workaround.patch # Fix build with pulseaudio 13 } build() { Deleted: qt5-webengine/trunk/qtbug-76958.patch =================================================================== --- qt5-webengine/trunk/qtbug-76958.patch 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-webengine/trunk/qtbug-76958.patch 2019-09-05 08:51:27 UTC (rev 361635) @@ -1,31 +0,0 @@ -diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp -index c4f4591e..dc005b62 100644 ---- a/src/core/web_contents_adapter.cpp -+++ b/src/core/web_contents_adapter.cpp -@@ -671,19 +671,23 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request) - } - } - -- auto navigate = [](WebContentsAdapter *adapter, const content::NavigationController::LoadURLParams ¶ms) { -+ auto navigate = [](QWeakPointer<WebContentsAdapter> weakAdapter, const content::NavigationController::LoadURLParams ¶ms) { -+ WebContentsAdapter *adapter = weakAdapter.data(); -+ if (!adapter) -+ return; - adapter->webContents()->GetController().LoadURLWithParams(params); - // Follow chrome::Navigate and invalidate the URL immediately. - adapter->m_webContentsDelegate->NavigationStateChanged(adapter->webContents(), content::INVALIDATE_TYPE_URL); - adapter->focusIfNecessary(); - }; - -+ QWeakPointer<WebContentsAdapter> weakThis(sharedFromThis()); - if (resizeNeeded) { - // Schedule navigation on the event loop. - base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI}, -- base::BindOnce(navigate, this, std::move(params))); -+ base::BindOnce(navigate, std::move(weakThis), std::move(params))); - } else { -- navigate(this, params); -+ navigate(std::move(weakThis), params); - } - } - Deleted: qt5-webengine/trunk/qtwebengine-glibc-2.29.patch =================================================================== --- qt5-webengine/trunk/qtwebengine-glibc-2.29.patch 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-webengine/trunk/qtwebengine-glibc-2.29.patch 2019-09-05 08:51:27 UTC (rev 361635) @@ -1,105 +0,0 @@ -From 65046b8f90d0336cbe5f2f15cc7da5cb798360ad Mon Sep 17 00:00:00 2001 -From: Matthew Denton <[email protected]> -Date: Wed, 24 Apr 2019 15:44:40 +0000 -Subject: [PATCH] Update Linux Seccomp syscall restrictions to EPERM - posix_spawn/vfork - -Glibc's system() function switched to using posix_spawn, which uses -CLONE_VFORK. Pepperflash includes a sandbox debugging check which -relies on us EPERM-ing process creation like this, rather than crashing -the process with SIGSYS. - -So whitelist clone() calls, like posix_spawn, that include the flags -CLONE_VFORK and CLONE_VM. - -Bug: 949312 -Change-Id: I3f4b90114b2fc1d9929e3c0a85bbe8f10def3c20 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1568086 -Commit-Queue: Robert Sesek <[email protected]> -Reviewed-by: Robert Sesek <[email protected]> -Cr-Commit-Position: refs/heads/master@{#653590} ---- - .../baseline_policy_unittest.cc | 29 +++++++++++++++++++ - .../syscall_parameters_restrictions.cc | 13 +++++++-- - 2 files changed, 40 insertions(+), 2 deletions(-) - -diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -index cdeb210ccb..40fcebf933 100644 ---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -@@ -10,7 +10,9 @@ - #include <sched.h> - #include <signal.h> - #include <stddef.h> -+#include <stdlib.h> - #include <string.h> -+#include <sys/mman.h> - #include <sys/prctl.h> - #include <sys/resource.h> - #include <sys/socket.h> -@@ -130,6 +132,33 @@ BPF_TEST_C(BaselinePolicy, ForkArmEperm, BaselinePolicy) { - BPF_ASSERT_EQ(EPERM, fork_errno); - } - -+BPF_TEST_C(BaselinePolicy, SystemEperm, BaselinePolicy) { -+ errno = 0; -+ int ret_val = system("echo SHOULD NEVER RUN"); -+ BPF_ASSERT_EQ(-1, ret_val); -+ BPF_ASSERT_EQ(EPERM, errno); -+} -+ -+BPF_TEST_C(BaselinePolicy, CloneVforkEperm, BaselinePolicy) { -+ errno = 0; -+ // Allocate a couple pages for the child's stack even though the child should -+ // never start. -+ constexpr size_t kStackSize = 4096 * 4; -+ void* child_stack = mmap(nullptr, kStackSize, PROT_READ | PROT_WRITE, -+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0); -+ BPF_ASSERT_NE(child_stack, nullptr); -+ pid_t pid = syscall(__NR_clone, CLONE_VM | CLONE_VFORK | SIGCHLD, -+ static_cast<char*>(child_stack) + kStackSize, nullptr, -+ nullptr, nullptr); -+ const int clone_errno = errno; -+ TestUtils::HandlePostForkReturn(pid); -+ -+ munmap(child_stack, kStackSize); -+ -+ BPF_ASSERT_EQ(-1, pid); -+ BPF_ASSERT_EQ(EPERM, clone_errno); -+} -+ - BPF_TEST_C(BaselinePolicy, CreateThread, BaselinePolicy) { - base::Thread thread("sandbox_tests"); - BPF_ASSERT(thread.Start()); -diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -index 100afe50e3..348ab6e8c5 100644 ---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -@@ -135,7 +135,8 @@ namespace sandbox { - #if !defined(OS_NACL_NONSFI) - // Allow Glibc's and Android pthread creation flags, crash on any other - // thread creation attempts and EPERM attempts to use neither --// CLONE_VM, nor CLONE_THREAD, which includes all fork() implementations. -+// CLONE_VM nor CLONE_THREAD (all fork implementations), unless CLONE_VFORK is -+// present (as in newer versions of posix_spawn). - ResultExpr RestrictCloneToThreadsAndEPERMFork() { - const Arg<unsigned long> flags(0); - -@@ -154,8 +155,16 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() { - AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, - flags == kGlibcPthreadFlags); - -+ // The following two flags are the two important flags in any vfork-emulating -+ // clone call. EPERM any clone call that contains both of them. -+ const uint64_t kImportantCloneVforkFlags = CLONE_VFORK | CLONE_VM; -+ -+ const BoolExpr is_fork_or_clone_vfork = -+ AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0, -+ (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags); -+ - return If(IsAndroid() ? android_test : glibc_test, Allow()) -- .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM)) -+ .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) - .Else(CrashSIGSYSClone()); - } - Modified: qt5-webglplugin/trunk/PKGBUILD =================================================================== --- qt5-webglplugin/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-webglplugin/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-webglplugin -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -13,7 +13,7 @@ groups=(qt qt5) _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('b8f05ee429f3fb7d6cef789333ddb56aafdc30a83e05b04f5f9e05650146c06e') +sha256sums=('fb40c4077f0dc3954c786c47f065e8fa1816af70bd1d42359aac70bf59652b1a') prepare() { mkdir -p build Modified: qt5-websockets/trunk/PKGBUILD =================================================================== --- qt5-websockets/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-websockets/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-websockets -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -15,7 +15,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('f941dd44f6e16041a25723c1b70ce9e28910c630509da0044ecb9fdda28a6e34') +sha256sums=('f6b0583cfc5bbdccb89f68297a53cfe6c858c7a7de8e64548066cafd981c0799') prepare() { mkdir -p build Modified: qt5-webview/trunk/PKGBUILD =================================================================== --- qt5-webview/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-webview/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=qt5-webview -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('090da2f41b3ea40e73d3a7d7d873492bb911a3492376bb44daee917b459535a9') +sha256sums=('bb369f8addf573d2f984a5afef26219c97dd895764eb0bbcc7296e358530de6f') prepare() { mkdir -p build Modified: qt5-x11extras/trunk/PKGBUILD =================================================================== --- qt5-x11extras/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-x11extras/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-x11extras -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -14,7 +14,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('f33fe1cf2258bc972171f723c6f37208da47f578b09876fea47c7ba558a8f1d6') +sha256sums=('0bc59f59f8d99674d3f56df091beb1a2d6fb9c103674c0fd412ce769e9656624') prepare() { mkdir -p build Modified: qt5-xmlpatterns/trunk/PKGBUILD =================================================================== --- qt5-xmlpatterns/trunk/PKGBUILD 2019-09-05 08:33:09 UTC (rev 361634) +++ qt5-xmlpatterns/trunk/PKGBUILD 2019-09-05 08:51:27 UTC (rev 361635) @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt5-xmlpatterns -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -16,7 +16,7 @@ groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('75186ff075d9a3bd30cee145bad6bc69d491b5e555b048d11136727f050d7319') +sha256sums=('2867cc8c92164909d6117b392d1cd9102dd38d815dbdf108f3f10e630c5a748b') prepare() { mkdir -p build
