[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
130/227: gnu: webkitgtk: Use libsoup 3 and build with GCC.
From: |
guix-commits |
Subject: |
130/227: gnu: webkitgtk: Use libsoup 3 and build with GCC. |
Date: |
Thu, 11 Nov 2021 12:30:23 -0500 (EST) |
apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit 26457b40faa30d61a5cbe616ca355b5a0da41cf0
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
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 | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 688e745..b2567b2 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,15 +281,13 @@ 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)))
+ (string-append wpebackend-fdo "/lib/" all))))))
,@(if (string-prefix? "x86_64" (or (%current-target-system)
(%current-system)))
'()
@@ -302,29 +295,15 @@ acceleration in mind, leveraging common 3D graphics APIs
for best performance.")
(lambda _
(substitute* "Source/cmake/DetectSSE2.cmake"
(("CHECK_FOR_SSE2\\(\\)") ""))))))
- (add-before 'configure 'prepare-build-environment
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CC" "clang")
- (setenv "CXX" "clang++")
- ;; XXX Until we switch back to using GCC,
- ;; work around <https://bugs.gnu.org/51591>.
- ,@(if (target-x86-32?)
- '((substitute* "Source/WTF/wtf/CheckedArithmetic.h"
- (("#define USE_MUL_OVERFLOW 1")
- "#define USE_MUL_OVERFLOW 0")))
- '())
- #t))
(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)
- 120/227: gnu: mit-krb5: Absorb 1.19.2 graft., (continued)
- 120/227: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/11/11
- 138/227: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/11/11
- 141/227: gnu: librsvg: Preserve the loaders.cache file., guix-commits, 2021/11/11
- 147/227: gnu: nss: Update to 3.71., guix-commits, 2021/11/11
- 153/227: gnu: boost: Update to 1.77.0., guix-commits, 2021/11/11
- 154/227: gnu: python-dbusmock: Update to 0.24.0., guix-commits, 2021/11/11
- 158/227: gnu: gdk-pixbuf: Remove obsolete jasper support., guix-commits, 2021/11/11
- 162/227: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/11/11
- 163/227: gnu: python-numpy: Update to 1.21.3 and cleanup., guix-commits, 2021/11/11
- 128/227: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/11/11
- 130/227: gnu: webkitgtk: Use libsoup 3 and build with GCC.,
guix-commits <=
- 118/227: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/11/11
- 122/227: gnu: heimdal: Fix build., guix-commits, 2021/11/11
- 126/227: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/11/11
- 127/227: gnu: vala: Update to 0.54.2., guix-commits, 2021/11/11
- 136/227: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/11/11
- 137/227: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/11/11
- 139/227: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/11/11
- 144/227: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/11/11
- 151/227: gnu: python-hypothesis: Update to 6.23.4., guix-commits, 2021/11/11
- 146/227: gnu: nspr: Normalize inputs., guix-commits, 2021/11/11