guix-commits
[Top][All Lists]
Advanced

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

163/181: gnu: Add webkitgtk-next.


From: guix-commits
Subject: 163/181: gnu: Add webkitgtk-next.
Date: Tue, 13 Sep 2022 02:26:32 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit ad519b73e2ddb84f1122c9a438b20b47f1cab948
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Sep 11 14:55:37 2022 -0400

    gnu: Add webkitgtk-next.
    
    * gnu/packages/webkit.scm (webkitgtk-next): New variable.
---
 gnu/packages/webkit.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 85aec6bbf3..d13a8b38ca 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -124,7 +124,7 @@ the WPE-flavored port of WebKit.")
 engine that uses Wayland for graphics output.")
     (license license:bsd-2)))
 
-(define %webkit-version "2.36.7")
+(define %webkit-version "2.36.7")       ;webkit2gtk4
 
 (define-public webkitgtk
   (package
@@ -277,6 +277,44 @@ propagated by default) such as @code{gst-plugins-good} and
                    license:bsd-2
                    license:bsd-3))))
 
+(define-public webkitgtk-next
+  (package
+    (inherit webkitgtk)
+    (name "webkitgtk")
+    (version "2.37.91")                 ;webkit2gtk5
+    (source (origin
+              (inherit (package-source webkitgtk))
+              (method url-fetch)
+              (uri (string-append "https://www.webkitgtk.org/releases/";
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32 
"0r2d1dbx6s8bad011dkmx7j34gcxlz9bs14pip1qn7n1rhgxb3qi"))))
+    (build-system cmake-build-system)
+    (arguments
+     (substitute-keyword-arguments (package-arguments webkitgtk)
+       ((#:configure-flags flags)
+        #~(cons* "-DENABLE_INTROSPECTION=ON"
+                 "-DUSE_GTK4=ON"
+                 (delete "-DENABLE_GTKDOC=ON" #$flags)))
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (add-before 'build 'set-CC
+              (lambda _
+                ;; Some Perl scripts check for the CC environment variable, 
else
+                ;; use /usr/bin/gcc.
+                (setenv "CC" "gcc")))))))
+    (native-inputs
+     (modify-inputs (package-native-inputs webkitgtk)
+       (delete "docbook-xml" "gtk-doc")
+       (append gi-docgen)))
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs webkitgtk)
+       (replace "gtk+" gtk)))
+    (inputs
+     (modify-inputs (package-inputs webkitgtk)
+       (delete "gtk+-2" "libnotify")
+       (append pango-next)))))          ;TODO: remove after it's the default
+
 ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
 ;;; packages for webkit2gtk-4.0.  See also the upstream tracker for libsoup 3:
 ;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218.



reply via email to

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