Date: Thursday, July 29, 2021 @ 10:04:59 Author: arojas Revision: 420652
archrelease: copy kde-unstable to kde-unstable-x86_64 Added: qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 420651, qt6-webengine/kde-unstable/PKGBUILD) qt6-webengine/repos/kde-unstable-x86_64/chromium-freetype-2.11.patch (from rev 420651, qt6-webengine/kde-unstable/chromium-freetype-2.11.patch) qt6-webengine/repos/kde-unstable-x86_64/qt6-webengine-destdir.patch (from rev 420651, qt6-webengine/kde-unstable/qt6-webengine-destdir.patch) Deleted: qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD qt6-webengine/repos/kde-unstable-x86_64/qt6-webengine-destdir.patch ------------------------------+ PKGBUILD | 91 ++++++++++++++++++++++------------------- chromium-freetype-2.11.patch | 28 ++++++++++++ qt6-webengine-destdir.patch | 59 +++++--------------------- 3 files changed, 89 insertions(+), 89 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-07-29 10:04:49 UTC (rev 420651) +++ PKGBUILD 2021-07-29 10:04:59 UTC (rev 420652) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=qt6-webengine -_qtver=6.2.0-beta1 -pkgver=${_qtver/-/} -pkgrel=1 -arch=(x86_64) -url='https://www.qt.io' -license=(GPL3 LGPL3 FDL custom) -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 libpipewire02 nodejs protobuf) -optdepends=('libpipewire02: 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) -sha256sums=('0c69e748d5411ca9329da091e26f27bc7457b4434790f7f151e6756e5d4b4e64' - '4055da08726d4172eb54ebd28ccec0c3b272ad9ed07f5153a4cb1b12402eb135') - -prepare() { - patch -d $_pkgfn -p1 < qt6-webengine-destdir.patch # Don't install externalvprojects to root filesystem -} - -build() { - cmake -B build -S $_pkgfn \ - -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \ - -DQT_FEATURE_webengine_system_ffmpeg=ON \ - -DQT_FEATURE_webengine_system_icu=ON \ - -DQT_FEATURE_webengine_proprietary_codecs=ON \ - -DQT_FEATURE_webengine_kerberos=ON \ - -DQT_FEATURE_webengine_webrtc_pipewire=ON - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build/src - - install -Dm644 "$srcdir"/${_pkgfn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium -} Copied: qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 420651, qt6-webengine/kde-unstable/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-07-29 10:04:59 UTC (rev 420652) @@ -0,0 +1,49 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=qt6-webengine +_qtver=6.2.0-beta2 +pkgver=${_qtver/-/} +pkgrel=1 +arch=(x86_64) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +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) +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=('0c7def833a33b8dfa28cf64a7b9169b5dc6c2b28089997dd90d77523bafd11dc' + '1611f5c4c6913837fa692b9612302f0abcdd7954b0d6cff236cb13f1ca3ec235' + 'd7b5b4ae37b3ec8a416942e02f60aeda0e8ff3d9769699029f3af3465b1b892b') + +prepare() { + patch -d $_pkgfn -p1 < qt6-webengine-destdir.patch # Don't install externalvprojects 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 \ + -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \ + -DQT_FEATURE_webengine_system_ffmpeg=ON \ + -DQT_FEATURE_webengine_system_icu=ON \ + -DQT_FEATURE_webengine_proprietary_codecs=ON \ + -DQT_FEATURE_webengine_kerberos=ON \ + -DQT_FEATURE_webengine_webrtc_pipewire=ON + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build/src + +# 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 +} Copied: qt6-webengine/repos/kde-unstable-x86_64/chromium-freetype-2.11.patch (from rev 420651, qt6-webengine/kde-unstable/chromium-freetype-2.11.patch) =================================================================== --- chromium-freetype-2.11.patch (rev 0) +++ chromium-freetype-2.11.patch 2021-07-29 10:04:59 UTC (rev 420652) @@ -0,0 +1,28 @@ +--- 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-destdir.patch =================================================================== --- qt6-webengine-destdir.patch 2021-07-29 10:04:49 UTC (rev 420651) +++ qt6-webengine-destdir.patch 2021-07-29 10:04:59 UTC (rev 420652) @@ -1,47 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a3ff75c..14ca95a4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -149,6 +149,7 @@ externalproject_add(libs - # and this leftover file gets sucked instead of install or src/mkspecs, - # simply remove it, we need to implment a dry run in qt base to fix it. - COMMAND ${CMAKE_COMMAND} -E remove_directory ../mkspecs -+ INSTALL_COMMAND "" - ) - - # Ensure the libs project is reconfigured if the root project is reconfigured, so that the -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index fd935fe1..f37ad3f6 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -674,28 +674,11 @@ if(QT_FEATURE_framework) - ) - else() - install(FILES ${localeFiles} -- DESTINATION translations/qtwebengine_locales -+ DESTINATION ${INSTALL_DATADIR}/translations/qtwebengine_locales - CONFIGURATIONS ${config} - ) - install(FILES ${resourceFiles} -- DESTINATION resources -- CONFIGURATIONS ${config} -- ) -- install(FILES ${icuFiles} -- DESTINATION resources -- CONFIGURATIONS ${config} -- ) --# install (again) for superbuild -- install(FILES ${localeFiles} -- DESTINATION ${WEBENGINE_ROOT_BUILD_DIR}/translations/qtwebengine_locales -- CONFIGURATIONS ${config} -- ) -- install(FILES ${resourceFiles} -- DESTINATION ${WEBENGINE_ROOT_BUILD_DIR}/resources -- CONFIGURATIONS ${config} -- ) -- install(FILES ${icuFiles} -- DESTINATION ${WEBENGINE_ROOT_BUILD_DIR}/resources -+ DESTINATION ${INSTALL_DATADIR}/resources - CONFIGURATIONS ${config} - ) - if(NOT QT_WILL_INSTALL) Copied: qt6-webengine/repos/kde-unstable-x86_64/qt6-webengine-destdir.patch (from rev 420651, qt6-webengine/kde-unstable/qt6-webengine-destdir.patch) =================================================================== --- qt6-webengine-destdir.patch (rev 0) +++ qt6-webengine-destdir.patch 2021-07-29 10:04:59 UTC (rev 420652) @@ -0,0 +1,12 @@ +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,