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.
This commit is contained in:
parent
66679ab978
commit
f85ca6eda0
|
@ -4130,7 +4130,6 @@ work and the interface is well tested.")
|
||||||
;; These libraries must be on LD_LIBRARY_PATH.
|
;; These libraries must be on LD_LIBRARY_PATH.
|
||||||
(libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret"
|
(libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret"
|
||||||
"atk" "gtk+" "gsettings-desktop-schemas"
|
"atk" "gtk+" "gsettings-desktop-schemas"
|
||||||
"gcc:lib" ; needed b/c webkitgtk is built with gcc-7
|
|
||||||
"gobject-introspection"))
|
"gobject-introspection"))
|
||||||
(path (string-join
|
(path (string-join
|
||||||
(map (lambda (lib)
|
(map (lambda (lib)
|
||||||
|
@ -4143,8 +4142,7 @@ work and the interface is well tested.")
|
||||||
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
|
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7
|
`(("intltool" ,intltool)
|
||||||
("intltool" ,intltool)
|
|
||||||
("itstool" ,itstool)
|
("itstool" ,itstool)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("python" ,python)
|
("python" ,python)
|
||||||
|
@ -4165,7 +4163,7 @@ work and the interface is well tested.")
|
||||||
("libsecret" ,libsecret)
|
("libsecret" ,libsecret)
|
||||||
("gtkspell3" ,gtkspell3)
|
("gtkspell3" ,gtkspell3)
|
||||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||||
("webkitgtk" ,webkitgtk-2.22)))
|
("webkitgtk" ,webkitgtk)))
|
||||||
(home-page "https://wiki.gnome.org/Apps/Eolie")
|
(home-page "https://wiki.gnome.org/Apps/Eolie")
|
||||||
(synopsis "Web browser for GNOME")
|
(synopsis "Web browser for GNOME")
|
||||||
(description
|
(description
|
||||||
|
@ -4203,7 +4201,6 @@ a secret password store, an adblocker, and a modern UI.")
|
||||||
`(("dconf" ,dconf)))
|
`(("dconf" ,dconf)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
|
`(("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
|
("glib:bin" ,glib "bin") ; for glib-mkenums
|
||||||
("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
|
("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
|
||||||
("intltool" ,intltool)
|
("intltool" ,intltool)
|
||||||
|
@ -4224,7 +4221,7 @@ a secret password store, an adblocker, and a modern UI.")
|
||||||
("libxslt" ,libxslt)
|
("libxslt" ,libxslt)
|
||||||
("nettle" ,nettle) ; for hogweed
|
("nettle" ,nettle) ; for hogweed
|
||||||
("sqlite" ,sqlite)
|
("sqlite" ,sqlite)
|
||||||
("webkitgtk" ,webkitgtk-2.22)))
|
("webkitgtk" ,webkitgtk)))
|
||||||
(home-page "https://wiki.gnome.org/Apps/Web")
|
(home-page "https://wiki.gnome.org/Apps/Web")
|
||||||
(synopsis "GNOME web browser")
|
(synopsis "GNOME web browser")
|
||||||
(description
|
(description
|
||||||
|
|
|
@ -383,10 +383,7 @@ driven and does not detract you from your daily work.")
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; no tests
|
`(#:tests? #f ; no tests
|
||||||
#:make-flags (list "gtk-webkit"
|
#:make-flags (list "gtk-webkit"
|
||||||
(string-append
|
"CC=gcc"
|
||||||
"CC="
|
|
||||||
(assoc-ref %build-inputs "gcc-7")
|
|
||||||
"/bin/gcc")
|
|
||||||
(string-append "PREFIX=" %output))
|
(string-append "PREFIX=" %output))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
|
@ -397,10 +394,9 @@ driven and does not detract you from your daily work.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("glib-networking" ,glib-networking)
|
`(("glib-networking" ,glib-networking)
|
||||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||||
("webkitgtk" ,webkitgtk-2.22)))
|
("webkitgtk" ,webkitgtk)))
|
||||||
(native-inputs
|
(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")
|
(home-page "https://next.atlas.engineer")
|
||||||
(synopsis "Infinitely extensible web-browser (user interface only)")
|
(synopsis "Infinitely extensible web-browser (user interface only)")
|
||||||
(description "Next is a keyboard-oriented, extensible web-browser
|
(description "Next is a keyboard-oriented, extensible web-browser
|
||||||
|
|
|
@ -59,14 +59,14 @@
|
||||||
(define-public webkitgtk
|
(define-public webkitgtk
|
||||||
(package
|
(package
|
||||||
(name "webkitgtk")
|
(name "webkitgtk")
|
||||||
(version "2.20.5")
|
(version "2.22.6")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.webkitgtk.org/releases/"
|
(uri (string-append "https://www.webkitgtk.org/releases/"
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
|
"0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -160,33 +160,3 @@ HTML/CSS applications to full-fledged web browsers.")
|
||||||
license:lgpl2.1+
|
license:lgpl2.1+
|
||||||
license:bsd-2
|
license:bsd-2
|
||||||
license:bsd-3))))
|
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
|
|
||||||
;; <https://bugs.gnu.org/30756>).
|
|
||||||
(lambda _
|
|
||||||
(unsetenv "C_INCLUDE_PATH")
|
|
||||||
(unsetenv "CPLUS_INCLUDE_PATH")
|
|
||||||
#t))))))))
|
|
||||||
|
|
Loading…
Reference in New Issue