Date: Tuesday, October 26, 2021 @ 15:05:50 Author: arojas Revision: 426586
Qt 6.2.1 Modified: qt6-3d/trunk/PKGBUILD qt6-5compat/trunk/PKGBUILD qt6-base/trunk/PKGBUILD qt6-charts/trunk/PKGBUILD qt6-connectivity/trunk/PKGBUILD qt6-datavis3d/trunk/PKGBUILD qt6-declarative/trunk/PKGBUILD qt6-doc/trunk/PKGBUILD qt6-imageformats/trunk/PKGBUILD qt6-location/trunk/PKGBUILD qt6-lottie/trunk/PKGBUILD qt6-multimedia/trunk/PKGBUILD qt6-networkauth/trunk/PKGBUILD qt6-quick3d/trunk/PKGBUILD qt6-quicktimeline/trunk/PKGBUILD qt6-remoteobjects/trunk/PKGBUILD qt6-scxml/trunk/PKGBUILD qt6-sensors/trunk/PKGBUILD qt6-serialbus/trunk/PKGBUILD qt6-serialport/trunk/PKGBUILD qt6-shadertools/trunk/PKGBUILD qt6-svg/trunk/PKGBUILD qt6-tools/trunk/PKGBUILD qt6-translations/trunk/PKGBUILD qt6-virtualkeyboard/trunk/PKGBUILD qt6-wayland/trunk/PKGBUILD qt6-webchannel/trunk/PKGBUILD qt6-webengine/trunk/PKGBUILD qt6-websockets/trunk/PKGBUILD qt6-webview/trunk/PKGBUILD Deleted: qt6-webengine/trunk/chromium-harfbuzz-3.0.0.patch qt6-webengine/trunk/skia-harfbuzz-3.0.0.patch ---------------------------------------------------+ qt6-3d/trunk/PKGBUILD | 4 qt6-5compat/trunk/PKGBUILD | 4 qt6-base/trunk/PKGBUILD | 11 -- qt6-charts/trunk/PKGBUILD | 4 qt6-connectivity/trunk/PKGBUILD | 4 qt6-datavis3d/trunk/PKGBUILD | 4 qt6-declarative/trunk/PKGBUILD | 4 qt6-doc/trunk/PKGBUILD | 4 qt6-imageformats/trunk/PKGBUILD | 4 qt6-location/trunk/PKGBUILD | 4 qt6-lottie/trunk/PKGBUILD | 4 qt6-multimedia/trunk/PKGBUILD | 4 qt6-networkauth/trunk/PKGBUILD | 4 qt6-quick3d/trunk/PKGBUILD | 4 qt6-quicktimeline/trunk/PKGBUILD | 4 qt6-remoteobjects/trunk/PKGBUILD | 4 qt6-scxml/trunk/PKGBUILD | 4 qt6-sensors/trunk/PKGBUILD | 4 qt6-serialbus/trunk/PKGBUILD | 4 qt6-serialport/trunk/PKGBUILD | 4 qt6-shadertools/trunk/PKGBUILD | 4 qt6-svg/trunk/PKGBUILD | 4 qt6-tools/trunk/PKGBUILD | 6 - qt6-translations/trunk/PKGBUILD | 4 qt6-virtualkeyboard/trunk/PKGBUILD | 6 - qt6-wayland/trunk/PKGBUILD | 4 qt6-webchannel/trunk/PKGBUILD | 4 qt6-webengine/trunk/PKGBUILD | 20 ---- qt6-webengine/trunk/chromium-harfbuzz-3.0.0.patch | 20 ---- qt6-webengine/trunk/skia-harfbuzz-3.0.0.patch | 100 -------------------- qt6-websockets/trunk/PKGBUILD | 4 qt6-webview/trunk/PKGBUILD | 4 32 files changed, 66 insertions(+), 201 deletions(-) Modified: qt6-3d/trunk/PKGBUILD =================================================================== --- qt6-3d/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-3d/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-3d -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('304352ae74fc8e7fe50a822413d69094efb25f15a2323e083a2a53dc5a43a6c6') +sha256sums=('730c0e8e1a1a59c4acbeca68e206bab14ef770f5dacb94b84103a82243cfeeb3') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-5compat/trunk/PKGBUILD =================================================================== --- qt6-5compat/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-5compat/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-5compat -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -16,7 +16,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('c2e2f058ecee36a96c1b15937badeda9b7b03eb5278fa01af4ff386c4f1854fb') +sha256sums=('3865c031450a3c2616de1e20104ca9470ac5447adf51faa918f8b01a2c425de7') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-base/trunk/PKGBUILD =================================================================== --- qt6-base/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-base/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-base -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -26,17 +26,14 @@ _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz qt6-base-cflags.patch - qt6-base-nostrip.patch - qtbug-96392.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=5c7b3db32bf383afa00050370222f39e0f3083ca) -sha256sums=('fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769' + qt6-base-nostrip.patch) +sha256sums=('2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079' 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c' - '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094' - '4c999415cf813591efa2e5bc5f692a4a7a822ad94837a01ef9c802f96c3ebd90') + '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') prepare() { patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake - patch -d $_pkgfn -p1 < qtbug-96392.patch # https://bugreports.qt.io/browse/QTBUG-96392 } build() { Modified: qt6-charts/trunk/PKGBUILD =================================================================== --- qt6-charts/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-charts/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-charts -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -14,7 +14,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('9114d4e05e63f5b9d5f07d53d72bf2fbfb22ffae283cc98d3371d73f04b6f4fc') +sha256sums=('f92ad16abd382a1488e6aafa129d88887a14300cb0f237fe37bca9173cf5a688') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-connectivity/trunk/PKGBUILD =================================================================== --- qt6-connectivity/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-connectivity/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-connectivity -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('4c689100bb43f78a7e30380296376b7f4dff356d9a02b0bba97362d6b497649c') +sha256sums=('8dcc366b0f5f124b20bf25e1b207a5ae4b75e45c62d2cc1f4dce138075c2714e') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-datavis3d/trunk/PKGBUILD =================================================================== --- qt6-datavis3d/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-datavis3d/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-datavis3d -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('e089295b8e33ded025ac27fff0b7e43ee91b2df0b8887431ab2236538e07db9e') +sha256sums=('bfcf311df531498705786d0a689ae50a26169ce7db5da10e97ab579815bfb009') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-declarative/trunk/PKGBUILD =================================================================== --- qt6-declarative/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-declarative/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-declarative -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -18,7 +18,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270') +sha256sums=('5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71') build() { cmake -B build -S $_pkgfn -G Ninja \ Modified: qt6-doc/trunk/PKGBUILD =================================================================== --- qt6-doc/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-doc/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -4,7 +4,7 @@ pkgbase=qt6-doc pkgname=(qt6-doc qt6-examples) -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="qt-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/single/$_pkgfn.tar.xz) -sha256sums=('60c2dc0ee86dd338e5c5194bd95922abfc097841e3e855693dfb4f5aaf0db4db') +sha256sums=('e03fffc5c3b5fea09dcc161444df7dfbbe24e8a8ce9377014ec21b66f48d43cd') build() { cmake -B build -S $_pkgfn -G Ninja \ Modified: qt6-imageformats/trunk/PKGBUILD =================================================================== --- qt6-imageformats/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-imageformats/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-imageformats -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('fdaa35536c3d0f8f5f313d0d52dedfbf6d8fcd81a82d6a56f473253f135072ad') +sha256sums=('df61dc1a517988bfa123117c78a7dbeda859cbb6d9cbd080ce60058277bca3df') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-location/trunk/PKGBUILD =================================================================== --- qt6-location/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-location/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-location -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('c627f85afbffe18b91e9081e9a4867b79c81a0ea24a683a2d5847c55097b5426') +sha256sums=('a99e92c762d45b17e14685cd8a3c1564a3da0ce1cfd1a68ffd5b3fd7c409dcad') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-lottie/trunk/PKGBUILD =================================================================== --- qt6-lottie/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-lottie/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-lottie -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('aa129261d409b5d935221acd6e38f56d68eac5e467a1990c96c654e81a2522ff') +sha256sums=('6f896b47aa3c9a0ea3905a3d49b8737ff42a444c2deb54d80426da80b2fabfd3') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-multimedia/trunk/PKGBUILD =================================================================== --- qt6-multimedia/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-multimedia/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-multimedia -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -19,7 +19,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('f12b96e6da2ebfe84105c0cb6e96fbc6bda012de8998ec5c96b58c85dcb40b4f') +sha256sums=('07764ad31d4d4ef679c3ceb861e762d12690b4fa899b3ccec45e5353309a90d0') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-networkauth/trunk/PKGBUILD =================================================================== --- qt6-networkauth/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-networkauth/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-networkauth -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('e71504c8d6ae4cf4d573f1d91ff756f90f441e22b0af12eae2424f7e0c01d450') +sha256sums=('8027f85095a9c56d8cada988527454f786a5f8dd4157206db4f21299016d1c9e') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-quick3d/trunk/PKGBUILD =================================================================== --- qt6-quick3d/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-quick3d/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-quick3d -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -17,7 +17,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('e8f8163237468e158ace7737d60a0a722209ffda444c57c786fc53db1af851e1') +sha256sums=('4022ce0e40a5d1c93a9593037a151cf7abe64c91a8b9882d9549f6a3c002a1b2') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-quicktimeline/trunk/PKGBUILD =================================================================== --- qt6-quicktimeline/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-quicktimeline/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-quicktimeline -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('67d644ad12df94e937bac3a1cb8a81a96213ec0102759a86c59ba7834ac90c8c') +sha256sums=('55f571ee2adcf7b12473b8df8b9e2e60d3778d8c9055c301d4c11d7c2327de63') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-remoteobjects/trunk/PKGBUILD =================================================================== --- qt6-remoteobjects/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-remoteobjects/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-remoteobjects -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('69b2ee333569bab026eaf16e4a552f912c0dc5afbe01e1609ddbb0e78b4593ca') +sha256sums=('76681b03bb63e1cafa38a1bfde23c194f232aaff4b010d5f58c065fdcc0b379f') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-scxml/trunk/PKGBUILD =================================================================== --- qt6-scxml/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-scxml/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-scxml -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('90d4af011a17f04a003cbd453c7e0720787e6cdacb8dfce7167179c2cd7dc839') +sha256sums=('cff613f68af98f4bdc1e40df0b6515b69175e10e83c551a57ee5db4359505767') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-sensors/trunk/PKGBUILD =================================================================== --- qt6-sensors/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-sensors/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-sensors -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('1a3ea1253408c91046ae1e775e28b1fe7acfbb7ee18952605379d35bb1e93678') +sha256sums=('5f55c972c52848f5c828148fded1b30de32955f7ee04867568c559991214739a') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-serialbus/trunk/PKGBUILD =================================================================== --- qt6-serialbus/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-serialbus/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-serialbus -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -14,7 +14,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('b8cfe2a5b49f8e06c76072021015c107fb35a678d1d28beaba9e629be18aac41') +sha256sums=('15e7a0a578dc9ed306ff2598edb9822081902ef1a4b52b20f1d2dd6461239f85') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-serialport/trunk/PKGBUILD =================================================================== --- qt6-serialport/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-serialport/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-serialport -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -14,7 +14,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('3fb3c0c37602e6fee8c5e386b61d14f4d7a820cf9e053c6952ad6e860ce05248') +sha256sums=('ec77f4c9d6096588f3e735315f873976103479be453985b27f27fe8994e0776a') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-shadertools/trunk/PKGBUILD =================================================================== --- qt6-shadertools/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-shadertools/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-shadertools -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('5f66d43610a3a6739fc360d836a2c045135107c0ecd40eb3ed18ce5f3dd79c42') +sha256sums=('2c8d38724181b31cd828a56e377775c2d461ee2ea0d6362ebec411c3b288067e') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-svg/trunk/PKGBUILD =================================================================== --- qt6-svg/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-svg/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-svg -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('af9eabefbb0dcb772f18fae4d2c39bcc23579a5dfff569c35ea7e497591db3d4') +sha256sums=('86e27e005c2421052ca90e619c8d13f1bd19c6bf1a7b84dd4e0f7855fc884fd7') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-tools/trunk/PKGBUILD =================================================================== --- qt6-tools/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-tools/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,9 +3,9 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-tools -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -16,7 +16,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('a903d005f8ab39545aed88a13b04f13ddbbe073da7007203a91fb8b42b890057') +sha256sums=('5a856d3d3d5fe6e15dc3f1af707a0ef1df2e687850403fc94af635edb9312bfb') build() { cmake -B build -S $_pkgfn -G Ninja \ Modified: qt6-translations/trunk/PKGBUILD =================================================================== --- qt6-translations/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-translations/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-translations -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('5b4ecb1ee35363444f03b1eb10637d79af1d19be5a5cc53657dc0925a78b2240') +sha256sums=('3f680b520da585697fc725697a52c7d2074a6a728f6830366b491a6f8b9183c7') build() { export PATH="/usr/lib/qt6/bin:$PATH" Modified: qt6-virtualkeyboard/trunk/PKGBUILD =================================================================== --- qt6-virtualkeyboard/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-virtualkeyboard/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,9 +2,9 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-virtualkeyboard -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -14,7 +14,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('1055e7fe1dfaecbfd4b69f40ec1135fda1980e6e21adbe757a8a4affbfb9bcee') +sha256sums=('61baa6be64b41f3b1e526ed11896f818a50eb50d282906d4464eb8e0fa98f0fe') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-wayland/trunk/PKGBUILD =================================================================== --- qt6-wayland/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-wayland/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-wayland -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('d6787fce74bde1a3386bcbe43c078c712471bab09f1946c40fc2327232d27d4c') +sha256sums=('051e6bd0a6fed988436fd86ad5146a556151f3a51f8bd5c4a31c99845a54efd7') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-webchannel/trunk/PKGBUILD =================================================================== --- qt6-webchannel/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-webchannel/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-webchannel -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -14,7 +14,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('518391ed74b087da3c15058c9c17760204425599ef3ffe61b1b73edc2028c171') +sha256sums=('035ba2e9a0e9de0baddd40f9d50014e6eb5f0b4ec741e9aec1b434e7c9e4e9c9') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-webengine/trunk/PKGBUILD =================================================================== --- qt6-webengine/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-webengine/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,9 +2,9 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-webengine -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -15,21 +15,9 @@ optdepends=('pipewire: WebRTC desktop sharing under Wayland') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" -source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - chromium-harfbuzz-3.0.0.patch - skia-harfbuzz-3.0.0.patch) -sha256sums=('c6e530a61bea2e7fbb50308a2b4e7fdb4f7c7b61a28797973270acffc020809d' - '7ce947944a139e66774dfc7249bf7c3069f07f83a0f1b2c1a1b14287a7e15928' - 'c9ed1dbadaf4be6097e25bc5577b91751799befc2d0376b143e1bd10def5754e') +source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) +sha256sums=('1f933cffb8671c1e71b6b2a4924cb6b3f9878388ae6298ac8d31a76c1ecffbb7') -prepare() { - cd $_pkgfn - - # Fix build with harfbuzz 3.0.0 - patch -p1 -d src/3rdparty/chromium -i "$srcdir"/chromium-harfbuzz-3.0.0.patch - patch -p1 -d src/3rdparty/chromium/third_party/skia -i "$srcdir"/skia-harfbuzz-3.0.0.patch -} - build() { cmake -B build -S $_pkgfn -G Ninja \ -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \ Deleted: qt6-webengine/trunk/chromium-harfbuzz-3.0.0.patch =================================================================== --- qt6-webengine/trunk/chromium-harfbuzz-3.0.0.patch 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-webengine/trunk/chromium-harfbuzz-3.0.0.patch 2021-10-26 15:05:50 UTC (rev 426586) @@ -1,20 +0,0 @@ -# https://github.com/chromium/chromium/commit/b289f6f3fcbc - -diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc -index 8ff0540d9a..20a7d37474 100644 ---- a/components/paint_preview/common/subset_font.cc -+++ b/components/paint_preview/common/subset_font.cc -@@ -72,9 +72,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) { - hb_set_t* glyphs = - hb_subset_input_glyph_set(input.get()); // Owned by |input|. - usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs))); -- hb_subset_input_set_retain_gids(input.get(), true); -+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS); - -- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get())); -+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get())); -+ if (!subset_face) -+ return nullptr; - HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get())); - if (!subset_blob) - return nullptr; Deleted: qt6-webengine/trunk/skia-harfbuzz-3.0.0.patch =================================================================== --- qt6-webengine/trunk/skia-harfbuzz-3.0.0.patch 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-webengine/trunk/skia-harfbuzz-3.0.0.patch 2021-10-26 15:05:50 UTC (rev 426586) @@ -1,100 +0,0 @@ -# Minimal diff for harfbuzz 3.0.0 support; based on: -# https://github.com/google/skia/commit/66684b17b382 -# https://github.com/google/skia/commit/51d83abcd24a - -diff --git a/gn/skia.gni b/gn/skia.gni -index d98fdc19ee..199335d5c4 100644 ---- a/gn/skia.gni -+++ b/gn/skia.gni -@@ -34,8 +34,6 @@ declare_args() { - skia_include_multiframe_procs = false - skia_lex = false - skia_libgifcodec_path = "third_party/externals/libgifcodec" -- skia_pdf_subset_harfbuzz = -- false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz. - skia_qt_path = getenv("QT_PATH") - skia_skqp_global_error_tolerance = 0 - skia_tools_require_resources = false -@@ -99,6 +97,10 @@ declare_args() { - skia_use_libfuzzer_defaults = true - } - -+declare_args() { -+ skia_pdf_subset_harfbuzz = skia_use_harfbuzz -+} -+ - declare_args() { - skia_compile_sksl_tests = skia_compile_processors - skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype -diff --git a/src/pdf/SkPDFSubsetFont.cpp b/src/pdf/SkPDFSubsetFont.cpp -index 81c37eef3a..2340a7937b 100644 ---- a/src/pdf/SkPDFSubsetFont.cpp -+++ b/src/pdf/SkPDFSubsetFont.cpp -@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) { - blob.release()); - } - -+template<typename...> using void_t = void; -+template<typename T, typename = void> -+struct SkPDFHarfBuzzSubset { -+ // This is the HarfBuzz 3.0 interface. -+ // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of -+ // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported. -+ static HBFace Make(T input, hb_face_t* face) { -+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -+ // If it isn't known if a font is 'tricky', retain the hints. -+ hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/); -+ return HBFace(hb_subset_or_fail(face, input)); -+ } -+}; -+template<typename T> -+struct SkPDFHarfBuzzSubset<T, void_t< -+ decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())), -+ decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())), -+ decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>())) -+ >> -+{ -+ // This is the HarfBuzz 2.0 (non-public) interface, used if it exists. -+ // This code should be removed as soon as all users are migrated to the newer API. -+ static HBFace Make(T input, hb_face_t* face) { -+ hb_subset_input_set_retain_gids(input, true); -+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -+ // If it isn't known if a font is 'tricky', retain the hints. -+ hb_subset_input_set_drop_hints(input, false); -+ return HBFace(hb_subset(face, input)); -+ } -+}; -+ - static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, - const SkPDFGlyphUse& glyphUsage, - int ttcIndex) { -@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, - hb_set_t* glyphs = hb_subset_input_glyph_set(input.get()); - glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);}); - -- hb_subset_input_set_retain_gids(input.get(), true); -- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -- // If it isn't known if a font is 'tricky', retain the hints. -- hb_subset_input_set_drop_hints(input.get(), false); -- HBFace subset(hb_subset(face.get(), input.get())); -+ HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get()); -+ if (!subset) { -+ return nullptr; -+ } - HBBlob result(hb_face_reference_blob(subset.get())); - return to_data(std::move(result)); - } -diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn -index 173830de62..4156607ef9 100644 ---- a/third_party/harfbuzz/BUILD.gn -+++ b/third_party/harfbuzz/BUILD.gn -@@ -14,6 +14,9 @@ if (skia_use_system_harfbuzz) { - "harfbuzz", - "harfbuzz-icu", - ] -+ if (skia_pdf_subset_harfbuzz) { -+ libs += [ "harfbuzz-subset" ] -+ } - } - } else { - third_party("harfbuzz") { Modified: qt6-websockets/trunk/PKGBUILD =================================================================== --- qt6-websockets/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-websockets/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-websockets -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -15,7 +15,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('4278a1aa961f4b9c752db38ee3f5319b56f1033d0e6982eabbba6eaffb14c59f') +sha256sums=('23344e21e96a839697abed7bf7931a8c08a752f08bf25edf240748501aba3816') build() { cmake -B build -S $_pkgfn -G Ninja Modified: qt6-webview/trunk/PKGBUILD =================================================================== --- qt6-webview/trunk/PKGBUILD 2021-10-26 09:58:08 UTC (rev 426585) +++ qt6-webview/trunk/PKGBUILD 2021-10-26 15:05:50 UTC (rev 426586) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-webview -_qtver=6.2.0 +_qtver=6.2.1 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -14,7 +14,7 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('75fbc1e372d4034361c16571798ac94e8c3ccfbdfbb06dca40b7c2230235708e') +sha256sums=('9aedbbbcf74ce60f250ae843b625e31f90f84613f6d6e60bcc5d98f2edda4e6a') build() { cmake -B build -S $_pkgfn -G Ninja
