Date: Thursday, September 9, 2021 @ 11:04:29 Author: arojas Revision: 423633
Qt 6.2 beta 4 Modified: qt6-3d/kde-unstable/PKGBUILD qt6-5compat/kde-unstable/PKGBUILD qt6-base/kde-unstable/PKGBUILD qt6-charts/kde-unstable/PKGBUILD qt6-connectivity/kde-unstable/PKGBUILD qt6-datavis3d/kde-unstable/PKGBUILD qt6-declarative/kde-unstable/PKGBUILD qt6-doc/kde-unstable/PKGBUILD qt6-imageformats/kde-unstable/PKGBUILD qt6-location/kde-unstable/PKGBUILD qt6-lottie/kde-unstable/PKGBUILD qt6-multimedia/kde-unstable/PKGBUILD qt6-networkauth/kde-unstable/PKGBUILD qt6-quick3d/kde-unstable/PKGBUILD qt6-quicktimeline/kde-unstable/PKGBUILD qt6-remoteobjects/kde-unstable/PKGBUILD qt6-scxml/kde-unstable/PKGBUILD qt6-sensors/kde-unstable/PKGBUILD qt6-serialbus/kde-unstable/PKGBUILD qt6-serialport/kde-unstable/PKGBUILD qt6-shadertools/kde-unstable/PKGBUILD qt6-svg/kde-unstable/PKGBUILD qt6-tools/kde-unstable/PKGBUILD qt6-translations/kde-unstable/PKGBUILD qt6-virtualkeyboard/kde-unstable/PKGBUILD qt6-wayland/kde-unstable/PKGBUILD qt6-webchannel/kde-unstable/PKGBUILD qt6-webengine/kde-unstable/PKGBUILD qt6-websockets/kde-unstable/PKGBUILD qt6-webview/kde-unstable/PKGBUILD Deleted: qt6-webengine/kde-unstable/chromium-freetype-2.11.patch qt6-webengine/kde-unstable/qt6-webengine-destdir.patch ---------------------------------------------------------+ qt6-3d/kde-unstable/PKGBUILD | 8 ++-- qt6-5compat/kde-unstable/PKGBUILD | 8 ++-- qt6-base/kde-unstable/PKGBUILD | 8 ++-- qt6-charts/kde-unstable/PKGBUILD | 8 ++-- qt6-connectivity/kde-unstable/PKGBUILD | 8 ++-- qt6-datavis3d/kde-unstable/PKGBUILD | 8 ++-- qt6-declarative/kde-unstable/PKGBUILD | 10 ++--- qt6-doc/kde-unstable/PKGBUILD | 8 ++-- qt6-imageformats/kde-unstable/PKGBUILD | 8 ++-- qt6-location/kde-unstable/PKGBUILD | 8 ++-- qt6-lottie/kde-unstable/PKGBUILD | 8 ++-- qt6-multimedia/kde-unstable/PKGBUILD | 8 ++-- qt6-networkauth/kde-unstable/PKGBUILD | 8 ++-- qt6-quick3d/kde-unstable/PKGBUILD | 8 ++-- qt6-quicktimeline/kde-unstable/PKGBUILD | 8 ++-- qt6-remoteobjects/kde-unstable/PKGBUILD | 8 ++-- qt6-scxml/kde-unstable/PKGBUILD | 8 ++-- qt6-sensors/kde-unstable/PKGBUILD | 8 ++-- qt6-serialbus/kde-unstable/PKGBUILD | 8 ++-- qt6-serialport/kde-unstable/PKGBUILD | 8 ++-- qt6-shadertools/kde-unstable/PKGBUILD | 8 ++-- qt6-svg/kde-unstable/PKGBUILD | 8 ++-- qt6-tools/kde-unstable/PKGBUILD | 8 ++-- qt6-translations/kde-unstable/PKGBUILD | 8 ++-- qt6-virtualkeyboard/kde-unstable/PKGBUILD | 8 ++-- qt6-wayland/kde-unstable/PKGBUILD | 8 ++-- qt6-webchannel/kde-unstable/PKGBUILD | 8 ++-- qt6-webengine/kde-unstable/PKGBUILD | 25 +++--------- qt6-webengine/kde-unstable/chromium-freetype-2.11.patch | 28 -------------- qt6-webengine/kde-unstable/qt6-webengine-destdir.patch | 12 ------ qt6-websockets/kde-unstable/PKGBUILD | 8 ++-- qt6-webview/kde-unstable/PKGBUILD | 8 ++-- 32 files changed, 123 insertions(+), 176 deletions(-) Modified: qt6-3d/kde-unstable/PKGBUILD =================================================================== --- qt6-3d/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-3d/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-3d -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,15 +11,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics' depends=(qt6-base) -makedepends=(cmake qt6-declarative qt6-shadertools) # assimp +makedepends=(cmake ninja qt6-declarative qt6-shadertools) # assimp optdepends=('qt6-shadertools: RHI renderer' 'qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('99df821a8ec7abc57b5f43c1516917506b60fbfe7c40757ea70b9a196c8a3577') +sha256sums=('5e385eccf30bd001cf117491ea0bc59497417ef4c589408044b7e9a2d559220b') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-5compat/kde-unstable/PKGBUILD =================================================================== --- qt6-5compat/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-5compat/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-5compat -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,15 +11,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Module that contains unsupported Qt 5 APIs' depends=(qt6-base) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: for QtGraphicalEffects') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('a88a6e0ed4c542bc50fc6cd0134a2ed9a4a612f5f4aa7a8f78ee6919ed42e054') +sha256sums=('af9196015d2bb8cce587a3475fb0f3bbaa8c74d8ddb4b8468de688df0f72f485') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-base/kde-unstable/PKGBUILD =================================================================== --- qt6-base/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-base/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-base -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -13,7 +13,7 @@ depends=(libjpeg-turbo xcb-util-keysyms xcb-util-cursor libgl fontconfig xdg-utils shared-mime-info xcb-util-wm libxrender libxi sqlite mesa vulkan-headers tslib libinput libxkbcommon-x11 libproxy libcups double-conversion brotli libb2 md4c) -makedepends=(cmake libfbclient mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs +makedepends=(cmake ninja libfbclient mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs gtk3 libpulse cups freetds xmlstarlet) optdepends=('postgresql-libs: PostgreSQL driver' 'mariadb-libs: MariaDB driver' @@ -27,7 +27,7 @@ source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz qt6-base-cflags.patch qt6-base-nostrip.patch) -sha256sums=('ab831dd629a32c25bc039150e2e4b8c8cd6abf57b29743c0d6900eed9518b579' +sha256sums=('2a80b83c05dd394384ba33bdc79616b275f97211062d58d2345fa891ef6a2875' 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c' '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') @@ -37,7 +37,7 @@ } build() { - cmake -B build -S $_pkgfn \ + cmake -B build -S $_pkgfn -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_BINDIR=lib/qt6/bin \ -DINSTALL_PUBLICBINDIR=usr/bin \ Modified: qt6-charts/kde-unstable/PKGBUILD =================================================================== --- qt6-charts/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-charts/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-charts -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,14 +10,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides a set of easy to use chart components' depends=(qt6-declarative) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('3b10006a6c411baa27deb8b9366af9607e0065a3cfe8bc15b4abf18a0d2014d9') +sha256sums=('eef4b39cf785b3e41c807a8fedf9ecbfd98bdafcfaa3931e45f3fc8671c469f8') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-connectivity/kde-unstable/PKGBUILD =================================================================== --- qt6-connectivity/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-connectivity/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-connectivity -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to Bluetooth hardware' depends=(qt6-base bluez-libs) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('04354ed125b7aced509f320657fe28710c5a4b9911a34a58d0762c9e95cf2d06') +sha256sums=('457b89d61de90b0e53daa25ce47bb380eba02d1b0212e7a197f12aea0e4e8155') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-datavis3d/kde-unstable/PKGBUILD =================================================================== --- qt6-datavis3d/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-datavis3d/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-datavis3d -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt6 Data Visualization module' depends=(qt6-base) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('5de26d232fa438fda87e9cb89408cca728dbc7e421ba368b54a19e1a4c062aa0') +sha256sums=('15d49598496fce959b4d034197e247ea02f9a01bfe162a12e2a16f8bc28bb470') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-declarative/kde-unstable/PKGBUILD =================================================================== --- qt6-declarative/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-declarative/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,15 +3,15 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-declarative -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for QML and JavaScript languages' depends=(qt6-base) -makedepends=(cmake python at-spi2-core qt6-shadertools) +makedepends=(cmake ninja python at-spi2-core qt6-shadertools) conflicts=(qt6-quickcontrols2) provides=(qt6-quickcontrols2) replaces=(qt6-quickcontrols2) @@ -18,10 +18,10 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('03b4372b009dba886e700b4969a381e9a03d19bc371540ed89a8bcfb60cbe2cd') +sha256sums=('8c483d14109e337b10cec145d7f056f803ed44cac1e1f0b24edc9d8f1c159872') build() { - cmake -B build -S $_pkgfn \ + cmake -B build -S $_pkgfn -G Ninja \ -DINSTALL_PUBLICBINDIR=usr/bin cmake --build build } Modified: qt6-doc/kde-unstable/PKGBUILD =================================================================== --- qt6-doc/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-doc/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -4,21 +4,21 @@ pkgbase=qt6-doc pkgname=(qt6-doc qt6-examples) -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=('any') url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) -makedepends=(cmake mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs +makedepends=(cmake ninja mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs gtk3 libpulse cups freetds vulkan-headers clang python llvm qt6-tools) groups=(qt6) _pkgfn="qt-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/single/$_pkgfn.tar.xz) -sha256sums=('46a854be462126a66cc42c60f0423ba10115e9cc67f3d826f095df9439309d3f') +sha256sums=('194f5df8a97cdf5528789a83100602616cd0b5ab30d7803ff383eb6fc19ce882') build() { - cmake -B build -S $_pkgfn \ + cmake -B build -S $_pkgfn -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DQT_HOST_PATH=/usr \ -DINSTALL_BINDIR=lib/qt6/bin \ Modified: qt6-imageformats/kde-unstable/PKGBUILD =================================================================== --- qt6-imageformats/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-imageformats/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-imageformats -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,14 +11,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP' depends=(qt6-base jasper libwebp libmng) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('9b0f2806dce9b27cd95d876c571f97648d1e6c62c12caa36d4476c1d49c93e3b') +sha256sums=('73324dd7344dd3a19699ea651cefd4608a9adb722fc1a777b888a3a43c19a577') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-location/kde-unstable/PKGBUILD =================================================================== --- qt6-location/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-location/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-location -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to position, satellite and area monitoring classes' depends=(qt6-base) -makedepends=(cmake qt6-declarative qt6-serialport) +makedepends=(cmake ninja qt6-declarative qt6-serialport) optdepends=('qt6-declarative: QML bindings' 'qt6-serialport: NMEA plugin') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('c3e686c56af62a250392ca5ca15cfee7dfa8674f4fb8f8652f52331357722e9e') +sha256sums=('14e455b383c9cb3ab015b4539f0447a284966d6acd8e00cf05e10b318347d222') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-lottie/kde-unstable/PKGBUILD =================================================================== --- qt6-lottie/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-lottie/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-lottie -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ 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=(qt6-base) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('f782e60db4301e9d303676587bb24845750a70918910f56698308dfc73f9fe90') +sha256sums=('e3adf788bedff70e6dc99eed1a0d0dfb9e2302af1402c50197bb960336b3ead4') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-multimedia/kde-unstable/PKGBUILD =================================================================== --- qt6-multimedia/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-multimedia/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-multimedia -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,7 +10,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for audio, video, radio and camera functionality' depends=(qt6-base gst-plugins-base) -makedepends=(cmake qt6-declarative qt6-shadertools) +makedepends=(cmake ninja qt6-declarative qt6-shadertools) optdepends=('qt6-declarative: QML bindings' 'gst-plugins-good: camera support, additional plugins' 'gst-plugins-bad: camera support, additional plugins' @@ -19,10 +19,10 @@ groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('4d79dd937c1ccc5f5d4201787a25c193e91ab3ab8bc178957c0476df5e17e958') +sha256sums=('819ee34291b0612bf5e383caa38a0728e01b614d106808f93fd9204c25ebfbf2') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-networkauth/kde-unstable/PKGBUILD =================================================================== --- qt6-networkauth/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-networkauth/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-networkauth -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,14 +11,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Network authentication module' depends=(qt6-base) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('3022cdb3828a6e25120583ba873f299f9570429f9a7bd8c5e3d7e6bdb689ec77') +sha256sums=('32e8e8565278265b5738b5097f05c515bac928fe8ed926abcb75ba8edb1aa227') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-quick3d/kde-unstable/PKGBUILD =================================================================== --- qt6-quick3d/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-quick3d/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-quick3d -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,16 +11,16 @@ license=(GPL3) pkgdesc='Qt module and API for defining 3D content in Qt Quick' depends=(qt6-declarative) -makedepends=(cmake qt6-shadertools) +makedepends=(cmake ninja qt6-shadertools) # TODO: use system assimp again when a new version is released optdepends=('qt6-shadertools: for shadergen') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('ab6ad6039f2dfaf85d55959af4c72e396e39324bcb9c91fcd11749be008430c8') +sha256sums=('2bde4a44d52d82da425285ad4af6c33cc12a771294af52136c977235abf834bc') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-quicktimeline/kde-unstable/PKGBUILD =================================================================== --- qt6-quicktimeline/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-quicktimeline/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-quicktimeline -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,14 +11,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module for keyframe-based timeline construction' depends=(qt6-declarative) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('405e8fbf0259ac4f69049bf519a9bf421aeb839b8a31af98957fa3b1e47b4265') +sha256sums=('f72df262920460076ac90a883345d5baaa1247d7f8a18714abbe9b95321577b7') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-remoteobjects/kde-unstable/PKGBUILD =================================================================== --- qt6-remoteobjects/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-remoteobjects/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-remoteobjects -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Inter-process communication (IPC) module developed for Qt' depends=(qt6-base) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('f6514b547dc92b5d1ce0d726bccc19b2dcf592e6cd35fc6b65411fb3e2203d5b') +sha256sums=('f19c0e3d28e9ada7332873fe6e2efb5da92eef0329db56d20635a8aba66e2191') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-scxml/kde-unstable/PKGBUILD =================================================================== --- qt6-scxml/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-scxml/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-scxml -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Static and runtime integration of SCXML models into Qt6 code' depends=(qt6-base) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('ad1f70b3f60c0b170444a764ceff093d4b2efde7c7e7d4578bb68ac8437486b1') +sha256sums=('6d74721e9aa44eb590d5dac5b710668b03d33b7a69ba87da252d43a651167817') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-sensors/kde-unstable/PKGBUILD =================================================================== --- qt6-sensors/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-sensors/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-sensors -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to sensor hardware and motion gesture recognition' depends=(qt6-connectivity) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('fe826c0a2b81fc80c91084c8a0ec34399a5eb297be751dfc8d12a960e01fc4c5') +sha256sums=('3b9c8a82ffd7f5a2959982d309fad5f7dadfc104f135770d674f2ba9b441b987') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-serialbus/kde-unstable/PKGBUILD =================================================================== --- qt6-serialbus/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-serialbus/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-serialbus -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,14 +10,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module for general purpose serial bus access' depends=(qt6-serialport) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('56fd677026a41b312d9d927fcd407baee0412f224c34846cdd18db4cccd8b664') +sha256sums=('4b6b2d521f3acef6ee0a62b31257f2172a0fa63f2d8f477c295fe8e43a9ce360') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-serialport/kde-unstable/PKGBUILD =================================================================== --- qt6-serialport/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-serialport/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-serialport -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,14 +10,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to hardware and virtual serial ports' depends=(qt6-base) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('958181c96e632fbb91fe52e1c0ff45a2622c12c55187a88fe630cfd7ea065baf') +sha256sums=('ba6ee91ea4ec2539bdd92698199052e3c42d56f05a973a8bd550248db37e9712') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-shadertools/kde-unstable/PKGBUILD =================================================================== --- qt6-shadertools/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-shadertools/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-shadertools -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,14 +11,14 @@ license=(GPL3) pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer' depends=(qt6-base) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('855c87bd010ebd9f90065be0f67041ec5192d39d6c4a6aa2375975dbc07f2715') +sha256sums=('12872cabf24b4b8051a7ee3b75d753a97935c6ba81426b26fc335d9da147c8b1') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-svg/kde-unstable/PKGBUILD =================================================================== --- qt6-svg/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-svg/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-svg -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,14 +11,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for displaying the contents of SVG files' depends=(qt6-base) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('a10008f565d7594282ec37a9da7bbf507b938365df573a54f6207886a134c511') +sha256sums=('2e6a0bf518ee0566375be267ed2c1a9eb69fefb54d20b0d97e1bfee458745d4e') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-tools/kde-unstable/PKGBUILD =================================================================== --- qt6-tools/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-tools/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-tools -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,15 +11,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' depends=(qt6-base) -makedepends=(cmake qt6-declarative clang llvm) +makedepends=(cmake ninja qt6-declarative clang llvm) optdepends=('clang: for qdoc and lupdate') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('c6f50e9da469b2de2df480e2b4cdba50162045b13a100ca585ce4302a555c253') +sha256sums=('324967044be6a1a3e3a5bbbdc6c5e2461baad38b98cafde6c4faec9b777b076b') build() { - cmake -B build -S $_pkgfn \ + cmake -B build -S $_pkgfn -G Ninja \ -DINSTALL_PUBLICBINDIR=usr/bin cmake --build build } Modified: qt6-translations/kde-unstable/PKGBUILD =================================================================== --- qt6-translations/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-translations/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-translations -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -11,15 +11,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='A cross-platform application and UI framework (Translations)' depends=(qt6-base) -makedepends=(cmake qt6-tools) +makedepends=(cmake ninja qt6-tools) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('59f1790b7998b8e5b1c07a615eb22fffd0cbb66d8400e9757c695daf9fe757c2') +sha256sums=('04856dc5bf4dce9f970218c8310038acbc1d0d177d4eb915d55f0eb0469bd9c6') build() { export PATH="/usr/lib/qt6/bin:$PATH" - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build -j1 } Modified: qt6-virtualkeyboard/kde-unstable/PKGBUILD =================================================================== --- qt6-virtualkeyboard/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-virtualkeyboard/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-virtualkeyboard -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,14 +10,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Virtual keyboard framework' depends=(qt6-declarative qt6-svg hunspell) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('1055aea265d804f020942117679223a9b8e46419eff3788c6f08392d9e7d4e3f') +sha256sums=('08a0a70141b0c8a0c2b88f7accffe5da181f0df656863eae56da33ec45b4c925') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-wayland/kde-unstable/PKGBUILD =================================================================== --- qt6-wayland/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-wayland/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=qt6-wayland -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,14 +11,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides APIs for Wayland' depends=(qt6-declarative libxcomposite) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('aad683a3a65037eefe8f019f832824626de800a112d74801f0b6c18c4c630d46') +sha256sums=('4e76297acaea3bab1dd7ff03e1beec92adac7036f977fdd69dc1799f0c053df5') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-webchannel/kde-unstable/PKGBUILD =================================================================== --- qt6-webchannel/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-webchannel/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-webchannel -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,14 +10,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients' depends=(qt6-declarative) -makedepends=(cmake qt6-websockets) +makedepends=(cmake ninja qt6-websockets) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('00420fd9c0b3f3fd79e73a6025dcc212cefde618ea2e22140dcfeb93b47cf062') +sha256sums=('786276e1e54c9824366b983d0069c894c8d37a5b1e40463d480cacc3a90f0489') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-webengine/kde-unstable/PKGBUILD =================================================================== --- qt6-webengine/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-webengine/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-webengine -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -11,24 +11,15 @@ pkgdesc='Provides support for web applications using the Chromium browser project' depends=(qt6-webchannel qt6-location libxcomposite libxrandr pciutils libxss libxkbfile libevent snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font) -makedepends=(cmake python2 python gperf jsoncpp ninja qt6-tools pipewire nodejs protobuf) +makedepends=(cmake ninja python2 python gperf jsoncpp qt6-tools pipewire nodejs protobuf) optdepends=('pipewire: WebRTC desktop sharing under Wayland') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" -source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - qt6-webengine-destdir.patch - chromium-freetype-2.11.patch) -sha256sums=('e7bdb1b44251826442a92c6e91ef1f1bc462964e1e89c41c9e5b7969f27c6024' - '1611f5c4c6913837fa692b9612302f0abcdd7954b0d6cff236cb13f1ca3ec235' - 'd7b5b4ae37b3ec8a416942e02f60aeda0e8ff3d9769699029f3af3465b1b892b') +source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) +sha256sums=('0fc904e6c9b36096382ec340b5b3989e08b33dca6530052c7611c76bb75e6e1e') -prepare() { - patch -d $_pkgfn -p1 < qt6-webengine-destdir.patch # Don't attempt to install external projects to root filesystem - patch -d $_pkgfn/src/3rdparty/chromium -p1 < chromium-freetype-2.11.patch # Fix build with freetype 2.11 -} - build() { - cmake -B build -S $_pkgfn \ + cmake -B build -S $_pkgfn -G Ninja \ -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \ -DQT_FEATURE_webengine_system_ffmpeg=ON \ -DQT_FEATURE_webengine_system_icu=ON \ @@ -39,11 +30,7 @@ } package() { - DESTDIR="$pkgdir" cmake --install build/src + DESTDIR="$pkgdir" cmake --install build -# Fix broken install - rm -r "$pkgdir"/build - mv "$pkgdir"/usr/{translations,resources} "$pkgdir"/usr/share/qt6 - install -Dm644 "$srcdir"/${_pkgfn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium } Deleted: qt6-webengine/kde-unstable/chromium-freetype-2.11.patch =================================================================== --- qt6-webengine/kde-unstable/chromium-freetype-2.11.patch 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-webengine/kde-unstable/chromium-freetype-2.11.patch 2021-09-09 11:04:29 UTC (rev 423633) @@ -1,28 +0,0 @@ ---- chromium/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-07-28 17:20:09.046807474 +0000 -+++ chromium/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp 2021-07-28 17:26:25.932899591 +0000 -@@ -665,8 +665,8 @@ - canvas->drawPaint(paint); - break; - } -- case FT_COLR_PAINTFORMAT_TRANSFORMED: { -- SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); -+ case FT_COLR_PAINTFORMAT_TRANSFORM: { -+ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine); - - canvas->concat(transform); - break; -@@ -760,12 +760,12 @@ - traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID, - FT_COLOR_NO_ROOT_TRANSFORM); - break; -- case FT_COLR_PAINTFORMAT_TRANSFORMED: -+ case FT_COLR_PAINTFORMAT_TRANSFORM: - canvas->saveLayer(nullptr, nullptr); - // Traverse / draw operation will apply transform. - colrv1_draw_paint(canvas, palette, face, paint); - traverse_result = -- colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); -+ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint); - canvas->restore(); - break; - case FT_COLR_PAINTFORMAT_ROTATE: Deleted: qt6-webengine/kde-unstable/qt6-webengine-destdir.patch =================================================================== --- qt6-webengine/kde-unstable/qt6-webengine-destdir.patch 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-webengine/kde-unstable/qt6-webengine-destdir.patch 2021-09-09 11:04:29 UTC (rev 423633) @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9939167a..0fa5cd13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,6 +166,7 @@ externalproject_add(qtwebengine - BUILD_ALWAYS TRUE - CMAKE_ARGS ${libsCmakeArgs} - BUILD_COMMAND ${CMAKE_COMMAND} -E echo "Starting $<CONFIG> build" -+ INSTALL_COMMAND "" - ${coinBug699} - COMMAND ${CMAKE_COMMAND} -E echo "$<CONFIG> build complete" - # TODO: this is aworkaround for broken qt_lib_webengine*.pri files, Modified: qt6-websockets/kde-unstable/PKGBUILD =================================================================== --- qt6-websockets/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-websockets/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-websockets -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,15 +10,15 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides WebSocket communication compliant with RFC 6455' depends=(qt6-base) -makedepends=(cmake qt6-declarative) +makedepends=(cmake ninja qt6-declarative) optdepends=('qt6-declarative: QML bindings') groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('b723d181e7c7139c814e70fbbdde81f5d7c3a1c198ee531cf9b0a593d96e64e5') +sha256sums=('b4f407df46bbd66cf930aeffdf58ec7ac5704325fb1fe30bfa43b56c56b56e46') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build } Modified: qt6-webview/kde-unstable/PKGBUILD =================================================================== --- qt6-webview/kde-unstable/PKGBUILD 2021-09-09 10:31:50 UTC (rev 423632) +++ qt6-webview/kde-unstable/PKGBUILD 2021-09-09 11:04:29 UTC (rev 423633) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=qt6-webview -_qtver=6.2.0-beta3 +_qtver=6.2.0-beta4 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -10,14 +10,14 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides a way to display web content in a QML application' depends=(qt6-webengine) -makedepends=(cmake) +makedepends=(cmake ninja) groups=(qt6) _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz) -sha256sums=('23c876fef031f33dda74736fe2d4a9a2757d2ef6a051c53856c28fdcfa04e29d') +sha256sums=('262a5776ca68cde52ca8be5d33a406e2acf7248b20486e8c230b03a46e9c783f') build() { - cmake -B build -S $_pkgfn + cmake -B build -S $_pkgfn -G Ninja cmake --build build }
