From 3889c76536b25d4e3c1e3bddd626f59a0a876217 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Tue, 10 Oct 2023 21:25:32 +0200
Subject: [PATCH] qt6-webengine: 6.5.3 -> 6.6.0

---
 qt6-webengine/.signature |  6 +++---
 qt6-webengine/Pkgfile    | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/qt6-webengine/.signature b/qt6-webengine/.signature
index e9c166e6e..65f0e03ea 100644
--- a/qt6-webengine/.signature
+++ b/qt6-webengine/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VWnqGm0Kfzeei11C3UiDeTx0BHKMAcGXMp2M3UCJtqeQLwju+L6im9PmlgsXaLsdI/7YxOEkXjZMfmh5JU/EAk=
-SHA256 (Pkgfile) = 368ef4cc36b0f070a794208ebc7023cfde83a46bcf60bbd914bfff146f2273d2
+RWSE3ohX2g5d/dfv0SQa0ZZ9E4vP2vXRK74Kov+OvPsdtKMEskUDk3ikGuMIqRNnGhXpGNDMp0quNBileeKmAkT552jSlvZSYwQ=
+SHA256 (Pkgfile) = 94070cef31d61fdaa67b6e1290aab31009ce2903189e5a3db97d7cdbddb10de7
 SHA256 (.footprint) = 1d22a6d0f842c84e82260d3c0a4a03fe27e7bebfcbc958a10a3cd3921b59855e
-SHA256 (qtwebengine-everywhere-src-6.5.3.tar.xz) = 2314ce9b0dd5f75f629077daad5a5781bac164d508ecff2ebad56ff2bc8745e5
+SHA256 (qtwebengine-everywhere-src-6.6.0.tar.xz) = d5dc9ff05a2c57adbf99cbf0c7cb6f19527f67216caf627b0cc160a1d253b780
diff --git a/qt6-webengine/Pkgfile b/qt6-webengine/Pkgfile
index a671d5f51..657e58f33 100644
--- a/qt6-webengine/Pkgfile
+++ b/qt6-webengine/Pkgfile
@@ -5,19 +5,28 @@
 # Optional: dav1d fdk-aac gnutls graphite2 keyutils krb5 lame lcms2 libpcre2 libvdpau numactl pipewire x264 x265
 
 name=qt6-webengine
-version=6.5.3
+version=6.6.0
 release=1
 source=(https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtwebengine-everywhere-src-$version.tar.xz)
 
 build() {
+  if [[ ! -e /usr/include/xkbcommon/xkbcommon-x11.h ]]; then
+    printf '\e[31m%s\e[m\n' "libxkbcommon is not built with x11 support!"
+    printf '\e[31m%s\e[m\n' "Therefor, qt6-base is not built with x11-support!"
+    printf '\e[33m%s\e[m\n' "This build will fail because x11 is needed, else it will fail"
+    printf '\e[31m%s\e[m\n' "Rebuild libxkbcommon with x11 support, then rebuild qt6-base"
+    printf '\e[31m%s\e[m\n' "Rebuild libxkbcommon with x11 support, then rebuild qt6-base"
+    exit 1
+  fi
+
   prt-get isinst krb5 && PKGMK_QT6+=' -D QT_FEATURE_webengine_kerberos=ON'
   prt-get isinst pipewire && PKGMK_QT6+=' -D QT_FEATURE_webengine_webrtc_pipewire=ON'
 
   # use ccache if found on system and in PATH, else use sccache if found on system
   prt-get isinst ccache && echo "${PATH}" | grep '/usr/lib/ccache' && \
-    PKGMK_QT6+=' -D QT_USE_CCACHE=ON' && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
+  PKGMK_QT6+=' -D QT_USE_CCACHE=ON' && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
   prt-get isinst sccache && echo "${PATH}" | grep --invert-match '/usr/lib/ccache' && \
-    PKGMK_QT6+=' -D CMAKE_C_COMPILER_LAUNCHER=sccache -D CMAKE_CXX_COMPILER_LAUNCHER=sccache'
+  PKGMK_QT6+=' -D CMAKE_C_COMPILER_LAUNCHER=sccache -D CMAKE_CXX_COMPILER_LAUNCHER=sccache'
 
   PYTHON=/usr/bin/python3 \
   cmake -S qtwebengine-everywhere-src-$version -B build -G Ninja $PKGMK_QT6 \
@@ -30,6 +39,7 @@ build() {
     -D QT_FEATURE_webengine_system_libevent=ON \
     -D QT_FEATURE_webengine_proprietary_codecs=ON \
     -D QT_FEATURE_webengine_system_re2=OFF \
+    -D QT_FEATURE_webengine_ozone_x11=ON \
     -Wno-dev
   cmake --build build
   DESTDIR=$PKG cmake --install build