guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

187/201: gnu: Add webkitgtk-2.32.


From: guix-commits
Subject: 187/201: gnu: Add webkitgtk-2.32.
Date: Mon, 1 Nov 2021 23:19:16 -0400 (EDT)

apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit 684bdbeddee72489bc612eecaee1f076409d4ba0
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 31 02:33:50 2021 -0400

    gnu: Add webkitgtk-2.32.
    
    * gnu/packages/webkit.scm (webkitgtk-2.32): New variable.
---
 gnu/packages/webkit.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 319b8b6..ddf4e2d 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)
@@ -352,3 +354,19 @@ 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 introduces clashes
+;;; between libsoup 2 and libsoup 3.
+(define-public webkitgtk-2.32
+  (package/inherit webkitgtk
+    (version "2.32.4")
+    (source (origin
+              (inherit (package-source webkitgtk))
+              (uri (string-append "https://www.webkitgtk.org/releases/";
+                                  "webkitgtk-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0"))))
+    (propagated-inputs
+     (alist-replace "libsoup" (list libsoup-minimal-2)
+                    (package-propagated-inputs webkitgtk)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]