vagrantc pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 2ff4344019991170a5a56a28cce3d42b76c2fd95 Author: Maxim Cournoyer <[email protected]> AuthorDate: Sat Oct 16 02:26:49 2021 -0400 gnu: webkitgtk: Use libsoup 3 and build with GCC. Clang is not needed when building with libsoup 3. * gnu/packages/webkit.scm (webkitgtk): Delete trailing #t. [configure-flags]: Remove -DUSE_SOUP2. [phases]{prepare-build-environment}: Remove phase. [native-inputs]: Remove clang. --- gnu/packages/webkit.scm | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index e54b680..8866ca3 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -253,10 +253,6 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (string-append ; uses lib64 by default "-DLIB_INSTALL_DIR=" (assoc-ref %outputs "out") "/lib") - - ;; XXX TODO: Use libsoup@3. - "-DUSE_SOUP2=ON" - ;; XXX Adding GStreamer GL support would apparently ;; require adding gst-plugins-bad to the inputs, ;; which might entail a security risk as a result of @@ -277,8 +273,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (let ((store-directory (%store-directory))) (substitute* "Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp" - (("@storedir@") store-directory)) - #t))) + (("@storedir@") store-directory))))) (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (file) @@ -286,31 +281,22 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";) (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/docbookx.dtd")))) - (find-files "Source" "\\.sgml$")) - #t)) + (find-files "Source" "\\.sgml$")))) (add-after 'unpack 'embed-absolute-wpebackend-reference (lambda* (#:key inputs #:allow-other-keys) (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) (substitute* "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) - (string-append wpebackend-fdo "/lib/" all))) - #t))) - (add-before 'configure 'prepare-build-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" "clang") - (setenv "CXX" "clang++") - #t)) + (string-append wpebackend-fdo "/lib/" all)))))) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (doc (assoc-ref outputs "doc"))) (mkdir-p (string-append doc "/share")) (rename-file (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t)))))) + (string-append doc "/share/gtk-doc")))))))) (native-inputs - `(("clang" ,clang-11) - ("bison" ,bison) + `(("bison" ,bison) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection)
