[arch-commits] Commit in qt6-webengine/repos/kde-unstable-x86_64 (3 files)
Antonio Rojas
arojas at gemini.archlinux.org
Mon Mar 28 16:51:53 UTC 2022
Date: Monday, March 28, 2022 @ 16:51:52
Author: arojas
Revision: 440785
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
(from rev 440784, qt6-webengine/kde-unstable/PKGBUILD)
qt6-webengine/repos/kde-unstable-x86_64/system-icu.patch
(from rev 440784, qt6-webengine/kde-unstable/system-icu.patch)
Deleted:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
------------------+
PKGBUILD | 92 ++++++++++++++++++++++++++---------------------------
system-icu.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 46 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-28 16:51:34 UTC (rev 440784)
+++ PKGBUILD 2022-03-28 16:51:52 UTC (rev 440785)
@@ -1,46 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=qt6-webengine
-_qtver=6.3.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-positioning libxcomposite libxrandr libxkbfile
- libevent snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font pciutils)
-makedepends=(cmake ninja python-html5lib gperf jsoncpp qt6-tools pipewire nodejs qt6-websockets)
-optdepends=('pipewire: WebRTC desktop sharing under Wayland')
-groups=(qt6)
-options=(debug)
-_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
-source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- qt6-webengine-ffmpeg5.patch::https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=b5afc89e)
-sha256sums=('847495f1415646327ff3656375730336c5cc08226eaef21cb961a513569ec449'
- '415d7867de841f72fd4308c41ba0d506058ea46e8b5f36a99cd4382721fd376c')
-
-prepare() {
- patch -d $_pkgfn/src/3rdparty -p1 < qt6-webengine-ffmpeg5.patch # Fix build with ffmpeg 5
-}
-
-build() {
- 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=OFF \
- -DQT_FEATURE_webengine_system_libevent=ON \
- -DQT_FEATURE_webengine_system_libxslt=ON \
- -DQT_FEATURE_webengine_proprietary_codecs=ON \
- -DQT_FEATURE_webengine_kerberos=ON \
- -DQT_FEATURE_webengine_webrtc_pipewire=ON \
- -DQT_FEATURE_webengine_full_debug_info=ON
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
- 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 440784, qt6-webengine/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-28 16:51:52 UTC (rev 440785)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=qt6-webengine
+_qtver=6.3.0-rc
+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-positioning libxcomposite libxrandr libxkbfile
+ libevent snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font pciutils)
+makedepends=(cmake ninja python-html5lib gperf jsoncpp qt6-tools pipewire nodejs qt6-websockets)
+optdepends=('pipewire: WebRTC desktop sharing under Wayland')
+groups=(qt6)
+options=(debug)
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
+ system-icu.patch)
+sha256sums=('448b8b408c2959718bb220f3edd660806892d9939a43dbf118aa325cd95ea7f8'
+ '469ca3f2da107dd28736f827cb20e5658455cb70bd277e101c50f80d00931944')
+
+prepare() {
+ patch -d $_pkgfn -p1 < system-icu.patch # Fix build with system ICU
+}
+
+build() {
+ 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 \
+ -DQT_FEATURE_webengine_system_libevent=ON \
+ -DQT_FEATURE_webengine_system_libxslt=ON \
+ -DQT_FEATURE_webengine_proprietary_codecs=ON \
+ -DQT_FEATURE_webengine_kerberos=ON \
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON \
+ -DQT_FEATURE_webengine_full_debug_info=ON
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ install -Dm644 "$srcdir"/${_pkgfn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
+}
Copied: qt6-webengine/repos/kde-unstable-x86_64/system-icu.patch (from rev 440784, qt6-webengine/kde-unstable/system-icu.patch)
===================================================================
--- system-icu.patch (rev 0)
+++ system-icu.patch 2022-03-28 16:51:52 UTC (rev 440785)
@@ -0,0 +1,84 @@
+From 4c3fb4070214ed28b1208aab55d7f5e3bcc9608f Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at qt.io>
+Date: Mon, 28 Mar 2022 11:30:14 +0200
+Subject: [PATCH] Support system ICU>=70
+
+Fixes: QTBUG-100495
+Change-Id: I243308ffd4ea274e1c2c9e3c24b9a17355abac7c
+---
+
+diff --git a/configure.cmake b/configure.cmake
+index 7d92341..b77a7a8 100644
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -41,6 +41,7 @@
+ pkg_check_modules(ZLIB zlib)
+ pkg_check_modules(RE2 re2 IMPORTED_TARGET)
+ pkg_check_modules(ICU icu-uc>=68 icu-i18n>=68)
++ pkg_check_modules(ICU70P icu-uc>=70 icu-i18n>=70)
+ pkg_check_modules(WEBP libwebp libwebpmux libwebpdemux)
+ pkg_check_modules(LCMS2 lcms2)
+ pkg_check_modules(FREETYPE freetype2 IMPORTED_TARGET)
+@@ -276,6 +277,10 @@
+ AUTODETECT FALSE
+ CONDITION ICU_FOUND
+ )
++qt_feature("webengine-system-icu70plus" PRIVATE
++ LABEL "icu>=70"
++ CONDITION ICU70P_FOUND AND QT_FEATURE_webengine_system_icu
++)
+ qt_feature("webengine-system-libwebp" PRIVATE
+ LABEL "libwebp, libwebpmux and libwebpdemux"
+ CONDITION UNIX AND WEBP_FOUND
+@@ -565,6 +570,7 @@
+ qt_configure_add_summary_section(NAME "Optional system libraries")
+ qt_configure_add_summary_entry(ARGS "webengine-system-re2")
+ qt_configure_add_summary_entry(ARGS "webengine-system-icu")
++ qt_configure_add_summary_entry(ARGS "webengine-system-icu70plus")
+ qt_configure_add_summary_entry(ARGS "webengine-system-libwebp")
+ qt_configure_add_summary_entry(ARGS "webengine-system-opus")
+ qt_configure_add_summary_entry(ARGS "webengine-system-ffmpeg")
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index e745207..1f8ee8d 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -402,6 +402,10 @@
+ CONDITION QT_FEATURE_webengine_system_pulseaudio
+ )
+ extend_gn_list(gnArgArg
++ ARGS use_system_icu70plus
++ CONDITION QT_FEATURE_webengine_system_icu70plus
++ )
++ extend_gn_list(gnArgArg
+ ARGS ozone_platform_x11 use_xkbcommon
+ CONDITION QT_FEATURE_webengine_ozone_x11
+ )
+diff --git a/src/3rdparty/chromium/third_party/icu/BUILD.gn b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+index d5b1361..2ef484e 100644
+--- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+@@ -11,6 +11,7 @@
+
+ declare_args() {
+ use_system_icu = false
++ use_system_icu70plus = false
+ }
+
+ if (is_android) {
+@@ -411,10 +412,12 @@
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
+
+- if (is_win) {
+- defines += [ "UCHAR_TYPE=wchar_t" ]
+- } else {
+- defines += [ "UCHAR_TYPE=uint16_t" ]
++ if (!use_system_icu70plus) {
++ if (is_win) {
++ defines += [ "UCHAR_TYPE=wchar_t" ]
++ } else {
++ defines += [ "UCHAR_TYPE=uint16_t" ]
++ }
+ }
+ }
+
More information about the arch-commits
mailing list