[arch-commits] Commit in qt6-webengine (4 files)

[Antonio Rojas]

    Date: Tuesday, July 6, 2021 @ 21:00:02
  Author: arojas
Revision: 419051

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  qt6-webengine/repos/
  qt6-webengine/repos/kde-unstable-x86_64/
  qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 419050, qt6-webengine/kde-unstable/PKGBUILD)
  qt6-webengine/repos/kde-unstable-x86_64/qt6-webengine-destdir.patch
    (from rev 419050, qt6-webengine/kde-unstable/qt6-webengine-destdir.patch)

-----------------------------+
 PKGBUILD                    |   42 +++++++++++++++++++++++++++++++++++++
 qt6-webengine-destdir.patch |   47 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

Copied: qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 419050, qt6-webengine/kde-unstable/PKGBUILD)
===================================================================
--- repos/kde-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ repos/kde-unstable-x86_64/PKGBUILD	2021-07-06 21:00:02 UTC (rev 419051)
@@ -0,0 +1,42 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at 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/qt6-webengine-destdir.patch (from rev 419050, qt6-webengine/kde-unstable/qt6-webengine-destdir.patch)
===================================================================
--- repos/kde-unstable-x86_64/qt6-webengine-destdir.patch	                        (rev 0)
+++ repos/kde-unstable-x86_64/qt6-webengine-destdir.patch	2021-07-06 21:00:02 UTC (rev 419051)
@@ -0,0 +1,47 @@
+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)