Subject: [bug#72835] [PATCH qt-team 29/38] gnu: qtwebengine: Update to 6.7.2.

From: Maxim Cournoyer <[email-masked]>
Date: Sat, 14 Sep 2024 00:34:09 +0900

Hi,

Zheng Junjie <[email-masked]> writes:

> * gnu/packages/qt.scm (qtwebengine): Update to 6.7.2.
> [source]: Adjust preserved-third-party-files.
> [inputs]: replace icu4c and re2 with icu4c-75 and re2-next. add fxdiv, fp16.
> [arguments]<#:configuration-flags>: Set -DQT_FEATURE_webenginedriver=OFF.
> Change-Id: Idbfe2c0b180947c41dabbb55548bbc3aaf217d05
>
> Change-Id: Ib1a9445ca815e2cc065716d408e0d1c5211694c7

[...]

> @@ -3643,6 +3647,10 @@ (define-public qtwebengine
>                "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine
>                "-DQT_FEATURE_system_ffmpeg=ON"
>
> +              ;; when enable, will "RUNPATH validation failed" on
> +              ;; lib/qt6/libexec/webenginedriver
> +              "-DQT_FEATURE_webenginedriver=OFF"
> +

I'd word it more clearly like:

  ;; The webenginedriver feature is disabled, otherwise the RUNPATH
  ;; validation phase fails.

But! Usually this simply requires augmenting the RUNPATH to look not
only under /lib but also e.g. under /lib/qt6/libexec/webenginedriver;
see for example the 'qt-creator' package, which adds an extra rpath to
lib/qtcreator via the CMAKE_SHARED_LINKER_FLAGS CMake option.

>                ;; Do not artificially limit codec support; video decoding is
>                ;; done by ffmpeg.
>                "-DQT_FEATURE_webengine_proprietary_codecs=ON"
> @@ -3720,9 +3728,9 @@ (define-public qtwebengine
>              (lambda _
>                (invoke "cmake" "--install" ".")))
>            (add-after 'install 'delete-installed-tests
> -                 (lambda _
> -                   (delete-file-recursively
> -                    (string-append #$output "/tests")))))))
> +            (lambda _
> +              (delete-file-recursively
> +               (string-append #$output "/tests")))))))
>      (native-inputs
>       (modify-inputs (package-native-inputs qtwebengine-5)
>         (delete "python2" "python2-six")
> @@ -3734,8 +3742,10 @@ (define-public qtwebengine
>                 python-html5lib)))
>      (inputs
>       (modify-inputs (package-inputs qtwebengine-5)
> +       (replace "icu4c" icu4c-75)
> +       (replace "re2" re2-next)
>         (replace "qtmultimedia" qtmultimedia)
> -       (append libxkbfile xkeyboard-config)))
> +       (append libxkbfile xkeyboard-config fxdiv fp16)))

Please keep the input sorted alphabetically, so

> +       (append fp16 fxdiv libxkbfile xkeyboard-config)))

-- 
Thanks,
Maxim