[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
188/227: gnu: Add webkitgtk-with-libsoup2
From: |
guix-commits |
Subject: |
188/227: gnu: Add webkitgtk-with-libsoup2 |
Date: |
Thu, 11 Nov 2021 12:30:43 -0500 (EST) |
apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit 62a83908eb0400e2551374d6dcfe8fe1ed6c19d0
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 31 02:33:50 2021 -0400
gnu: Add webkitgtk-with-libsoup2
* gnu/packages/webkit.scm (webkitgtk-with-libsoup2): New variable.
---
gnu/packages/webkit.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index f7558e6..5230129 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,6 +28,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
+ #:use-module (guix build utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
@@ -359,3 +361,15 @@ HTML/CSS applications to full-fledged web browsers.")
license:lgpl2.1+
license:bsd-2
license:bsd-3))))
+
+;;; Required by gnome-online-accounts; as webkitgtk 2.34 propagates libsoup 3,
+;;; which causes the build to fail.
+(define-public webkitgtk-with-libsoup2
+ (package/inherit webkitgtk
+ (name "webkitgtk-with-libsoup2")
+ (arguments (substitute-keyword-arguments (package-arguments webkitgtk)
+ ((#:configure-flags flags)
+ `(cons "-DUSE_SOUP2=ON" ,flags))))
+ (propagated-inputs
+ (alist-replace "libsoup" (list libsoup-minimal-2)
+ (package-propagated-inputs webkitgtk)))))
- 160/227: gnu: mesa: Replace obsolete vulkan-overlay-layer build option., (continued)
- 160/227: gnu: mesa: Replace obsolete vulkan-overlay-layer build option., guix-commits, 2021/11/11
- 165/227: gnu: ldc: Update to 1.27.1., guix-commits, 2021/11/11
- 168/227: gnu: Add cling., guix-commits, 2021/11/11
- 170/227: gnu: gtkmm-3: Update to 3.24.5., guix-commits, 2021/11/11
- 173/227: gnu: tracker: Use libsoup-minimal-2 to fix build., guix-commits, 2021/11/11
- 174/227: gnu: xkeyboard-config: Update to 2.34., guix-commits, 2021/11/11
- 184/227: gnu: jami-gnome: Fix build with webkitgtk 2.34.1., guix-commits, 2021/11/11
- 190/227: gnu: Remove references to a removed patch., guix-commits, 2021/11/11
- 189/227: gnu: gnome-online-accounts: Update to 3.43.1., guix-commits, 2021/11/11
- 182/227: gnu: accountsservice: Use meson 0.59.4 to work around a bug in 0.60.0., guix-commits, 2021/11/11
- 188/227: gnu: Add webkitgtk-with-libsoup2,
guix-commits <=
- 186/227: gnu: uhttpmock: Use libsoup 2., guix-commits, 2021/11/11
- 199/227: gnu: libgdata: Use libsoup 2 to fix build., guix-commits, 2021/11/11
- 198/227: gnu: ansible: Update to 4.7.0., guix-commits, 2021/11/11
- 216/227: gnu: gnome-bluetooth: Use meson-0.59., guix-commits, 2021/11/11
- 205/227: gnu: Add python-pypika-tortoise., guix-commits, 2021/11/11
- 210/227: gnu: python-aiomysql: Update to 0.17.8., guix-commits, 2021/11/11
- 221/227: gnu: libgweather: Use libsoup 2., guix-commits, 2021/11/11
- 223/227: gnu: openblas: Add support for older x86 processors., guix-commits, 2021/11/11
- 227/227: gnu: kexec-tools: Fix build on i686-linux., guix-commits, 2021/11/11
- 161/227: gnu: mesa: Enable support for OpenGL ES 1.1 and 2.0., guix-commits, 2021/11/11