[arch-commits] Commit in qt6-webengine/repos/kde-unstable-x86_64 (6 files)
Antonio Rojas
arojas at gemini.archlinux.org
Mon Aug 30 19:22:51 UTC 2021
Date: Monday, August 30, 2021 @ 19:22:51
Author: arojas
Revision: 422680
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
(from rev 422679, qt6-webengine/kde-unstable/PKGBUILD)
qt6-webengine/repos/kde-unstable-x86_64/chromium-freetype-2.11.patch
(from rev 422679, qt6-webengine/kde-unstable/chromium-freetype-2.11.patch)
qt6-webengine/repos/kde-unstable-x86_64/qt6-webengine-destdir.patch
(from rev 422679, qt6-webengine/kde-unstable/qt6-webengine-destdir.patch)
Deleted:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
qt6-webengine/repos/kde-unstable-x86_64/chromium-freetype-2.11.patch
qt6-webengine/repos/kde-unstable-x86_64/qt6-webengine-destdir.patch
------------------------------+
PKGBUILD | 98 ++++++++++++++++++++---------------------
chromium-freetype-2.11.patch | 56 +++++++++++------------
qt6-webengine-destdir.patch | 24 +++++-----
3 files changed, 89 insertions(+), 89 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-30 19:22:39 UTC (rev 422679)
+++ PKGBUILD 2021-08-30 19:22:51 UTC (rev 422680)
@@ -1,49 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at 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/PKGBUILD (from rev 422679, qt6-webengine/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-30 19:22:51 UTC (rev 422680)
@@ -0,0 +1,49 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=qt6-webengine
+_qtver=6.2.0-beta3
+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=('e7bdb1b44251826442a92c6e91ef1f1bc462964e1e89c41c9e5b7969f27c6024'
+ '1611f5c4c6913837fa692b9612302f0abcdd7954b0d6cff236cb13f1ca3ec235'
+ 'd7b5b4ae37b3ec8a416942e02f60aeda0e8ff3d9769699029f3af3465b1b892b')
+
+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 \
+ -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
+}
Deleted: chromium-freetype-2.11.patch
===================================================================
--- chromium-freetype-2.11.patch 2021-08-30 19:22:39 UTC (rev 422679)
+++ chromium-freetype-2.11.patch 2021-08-30 19:22:51 UTC (rev 422680)
@@ -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:
Copied: qt6-webengine/repos/kde-unstable-x86_64/chromium-freetype-2.11.patch (from rev 422679, qt6-webengine/kde-unstable/chromium-freetype-2.11.patch)
===================================================================
--- chromium-freetype-2.11.patch (rev 0)
+++ chromium-freetype-2.11.patch 2021-08-30 19:22:51 UTC (rev 422680)
@@ -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-08-30 19:22:39 UTC (rev 422679)
+++ qt6-webengine-destdir.patch 2021-08-30 19:22:51 UTC (rev 422680)
@@ -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,
Copied: qt6-webengine/repos/kde-unstable-x86_64/qt6-webengine-destdir.patch (from rev 422679, qt6-webengine/kde-unstable/qt6-webengine-destdir.patch)
===================================================================
--- qt6-webengine-destdir.patch (rev 0)
+++ qt6-webengine-destdir.patch 2021-08-30 19:22:51 UTC (rev 422680)
@@ -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,
More information about the arch-commits
mailing list