From f85ca6eda044c43bd5b9b54e756c02fd90c372f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 14:21:22 +0100 Subject: gnu: Remove WebKitGTK@2.20. * gnu/packages/gnome.scm (eolie, epiphany)[native-inputs]: Remove GCC-7. [inputs]: Change WEBKITGTK-2.22 to WEBKITGTK. [arguments]: Adjust accordingly. * gnu/packages/web-browsers.scm (next-gtk-webkit): Likewise. * gnu/packages/webkit.scm (webkitgtk): Update to 2.22.6. (webkitgtk-2.22): Remove variable. --- gnu/packages/gnome.scm | 9 +++------ gnu/packages/web-browsers.scm | 10 +++------- gnu/packages/webkit.scm | 34 ++-------------------------------- 3 files changed, 8 insertions(+), 45 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a09ae373c..3a34356beb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4130,7 +4130,6 @@ work and the interface is well tested.") ;; These libraries must be on LD_LIBRARY_PATH. (libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret" "atk" "gtk+" "gsettings-desktop-schemas" - "gcc:lib" ; needed b/c webkitgtk is built with gcc-7 "gobject-introspection")) (path (string-join (map (lambda (lib) @@ -4143,8 +4142,7 @@ work and the interface is well tested.") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) #t))))) (native-inputs - `(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7 - ("intltool" ,intltool) + `(("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("python" ,python) @@ -4165,7 +4163,7 @@ work and the interface is well tested.") ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description @@ -4203,7 +4201,6 @@ a secret password store, an adblocker, and a modern UI.") `(("dconf" ,dconf))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database - ("gcc" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 ("glib:bin" ,glib "bin") ; for glib-mkenums ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) @@ -4224,7 +4221,7 @@ a secret password store, an adblocker, and a modern UI.") ("libxslt" ,libxslt) ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index c9038ed8c7..b84abd0929 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -383,10 +383,7 @@ driven and does not detract you from your daily work.") (arguments `(#:tests? #f ; no tests #:make-flags (list "gtk-webkit" - (string-append - "CC=" - (assoc-ref %build-inputs "gcc-7") - "/bin/gcc") + "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases @@ -397,10 +394,9 @@ driven and does not detract you from your daily work.") (inputs `(("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (native-inputs - `(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://next.atlas.engineer") (synopsis "Infinitely extensible web-browser (user interface only)") (description "Next is a keyboard-oriented, extensible web-browser diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 91c6c7d02a..af34052ee4 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -59,14 +59,14 @@ (define-public webkitgtk (package (name "webkitgtk") - (version "2.20.5") + (version "2.22.6") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m")))) + "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments @@ -160,33 +160,3 @@ HTML/CSS applications to full-fledged web browsers.") license:lgpl2.1+ license:bsd-2 license:bsd-3)))) - -;; This version of webkitgtk needs to be kept separate, because it requires a -;; newer version of GCC than our default compiler, and this causes problems -;; when linked with C++ libraries built using our default compiler. For now, -;; we use this newer webkitgtk only for selected packages, e.g. epiphany. -(define-public webkitgtk-2.22 - (package/inherit webkitgtk - (name "webkitgtk") - (version "2.22.6") - (source (origin - (method url-fetch) - (uri (string-append "https://www.webkitgtk.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) - (native-inputs - `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer - ,@(package-native-inputs webkitgtk))) - (arguments - (substitute-keyword-arguments (package-arguments webkitgtk) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)))))))) -- cgit v1.2.3