[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'staging' into core-updates |
|
Date: |
Thu, 15 Sep 2022 11:52:26 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 4920f6e634eeecb37b501bdc024dfe0aab849ed0
Merge: 513091dbd2 3d297a0017
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Sep 15 11:29:02 2022 -0400
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
NEWS | 23 +-
doc/guix.texi | 10 +-
etc/news.scm | 41 +
etc/teams.scm.in | 6 +-
gnu/build/secret-service.scm | 4 +-
gnu/home/services/shepherd.scm | 42 +-
gnu/local.mk | 16 +-
gnu/packages/admin.scm | 8 +-
gnu/packages/algebra.scm | 47 +-
gnu/packages/bash.scm | 44 +
gnu/packages/bioconductor.scm | 48 +
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/check.scm | 39 +-
gnu/packages/chromium.scm | 6 +-
gnu/packages/cmake.scm | 24 +-
gnu/packages/containers.scm | 18 +-
gnu/packages/cpp.scm | 14 +-
gnu/packages/cran.scm | 113 +
gnu/packages/crates-graphics.scm | 6 +
gnu/packages/crates-gtk.scm | 6 +
gnu/packages/dezyne.scm | 4 +-
gnu/packages/emacs-xyz.scm | 312 +-
gnu/packages/emacs.scm | 64 +-
gnu/packages/embedded.scm | 11 +-
gnu/packages/engineering.scm | 10 +-
gnu/packages/enlightenment.scm | 15 +-
gnu/packages/esolangs.scm | 20 +
gnu/packages/fcitx.scm | 80 +-
gnu/packages/finance.scm | 21 +-
gnu/packages/fonts.scm | 6 +-
gnu/packages/fontutils.scm | 31 +-
gnu/packages/freedesktop.scm | 88 +-
gnu/packages/games.scm | 153 +-
gnu/packages/gcc.scm | 53 +-
gnu/packages/geo.scm | 178 +-
gnu/packages/glib.scm | 79 +
gnu/packages/gnome-xyz.scm | 51 +-
gnu/packages/gnome.scm | 6103 +++++++++++---------
gnu/packages/gnucash.scm | 290 +-
gnu/packages/gnuzilla.scm | 4 +-
gnu/packages/gtk.scm | 391 +-
gnu/packages/haskell-xyz.scm | 35 +-
gnu/packages/ibus.scm | 273 +-
gnu/packages/image-processing.scm | 2 +-
gnu/packages/ipfs.scm | 27 +-
gnu/packages/java.scm | 42 +-
gnu/packages/linux.scm | 43 +-
gnu/packages/lisp-xyz.scm | 259 +-
gnu/packages/lisp.scm | 8 +-
gnu/packages/machine-learning.scm | 16 +-
gnu/packages/messaging.scm | 107 +-
gnu/packages/music.scm | 6 +
gnu/packages/networking.scm | 38 +-
gnu/packages/ntp.scm | 12 +-
.../patches/cmake-curl-certificates-3.24.patch | 21 +
gnu/packages/patches/cmh-support-fplll.patch | 27 -
gnu/packages/patches/emacs-kv-fix-tests.patch | 30 +
.../patches/emacs-yasnippet-fix-tests.patch | 30 +-
.../patches/eog-update-libportal-usage.patch | 40 -
gnu/packages/patches/gdm-default-session.patch | 65 +-
gnu/packages/patches/gdm-elogind-support.patch | 21 +-
.../patches/gdm-pass-gdk-pixbuf-loader-env.patch | 13 +-
.../gdm-remove-hardcoded-xwayland-path.patch | 36 +-
.../gdm-wayland-session-wrapper-from-env.patch | 13 +-
gnu/packages/patches/geoclue-config.patch | 28 +-
.../patches/gnome-boxes-add-guix-logo.patch | 32 -
.../patches/gnome-builder-update-libportal.patch | 93 -
.../patches/gnome-screenshot-meson-0.60.patch | 39 -
...ct-introspection-absolute-shlib-path-1.72.patch | 173 +
.../patches/gobject-introspection-cc-1.72.patch | 15 +
gnu/packages/patches/gpaste-fix-paths.patch | 29 +-
gnu/packages/patches/gspell-dash-test.patch | 22 -
gnu/packages/patches/hedgewars-network-bsd.patch | 150 -
gnu/packages/patches/libgda-cve-2021-39359.patch | 33 +
gnu/packages/patches/libgda-fix-build.patch | 131 +
.../libgda-fix-missing-initialization.patch | 26 +
.../patches/libgda-skip-postgresql-tests.patch | 91 +
.../patches/nautilus-add-libportal-gtk3.patch | 61 -
.../patches/network-manager-plugin-path.patch | 38 +-
gnu/packages/patchutils.scm | 38 +
gnu/packages/pdf.scm | 19 +
gnu/packages/pkg-config.scm | 24 +
gnu/packages/python-science.scm | 13 +-
gnu/packages/python-web.scm | 7 +-
gnu/packages/python-xyz.scm | 58 +-
gnu/packages/qt.scm | 8 +-
gnu/packages/rsync.scm | 10 +-
gnu/packages/rust.scm | 34 +-
gnu/packages/sdl.scm | 45 +-
gnu/packages/search.scm | 6 +-
gnu/packages/shellutils.scm | 33 +
gnu/packages/sphinx.scm | 35 +-
gnu/packages/tex.scm | 3 +-
gnu/packages/textutils.scm | 20 +
gnu/packages/uml.scm | 5 +-
gnu/packages/version-control.scm | 11 +-
gnu/packages/video.scm | 4 +-
gnu/packages/virtualization.scm | 11 +-
gnu/packages/web.scm | 10 +-
gnu/packages/webkit.scm | 47 +-
gnu/packages/wm.scm | 34 +-
gnu/packages/xdisorg.scm | 85 +-
gnu/packages/xorg.scm | 110 +-
gnu/services/security.scm | 25 +-
gnu/services/shepherd.scm | 27 +-
gnu/services/virtualization.scm | 1 +
gnu/services/web.scm | 66 +-
guix/build/emacs-build-system.scm | 20 +-
guix/build/emacs-utils.scm | 39 +-
guix/import/gnome.scm | 37 +-
nix/libstore/misc.cc | 8 -
nix/libstore/misc.hh | 4 -
nix/libstore/store-api.cc | 17 -
nix/libstore/store-api.hh | 12 -
114 files changed, 6700 insertions(+), 4834 deletions(-)
diff --cc gnu/local.mk
index f7fcc8902f,d05f9ff557..bad2714cf0
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1216,8 -1219,11 +1213,10 @@@ dist_patch_DATA =
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
%D%/packages/patches/gnutls-cross.patch \
- %D%/packages/patches/gnutls-guile-eintr-eagain.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
+ %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
+ %D%/packages/patches/gobject-introspection-cc-1.72.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
%D%/packages/patches/go-fix-script-tests.patch \
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
@@@ -1518,7 -1527,7 +1519,6 @@@
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \
- %D%/packages/patches/nautilus-add-libportal-gtk3.patch \
- %D%/packages/patches/m4-gnulib-libio.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \
%D%/packages/patches/netcdf-date-time.patch \
diff --cc gnu/packages/freedesktop.scm
index 45188222fc,97d8bc3dbc..2551c88761
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -1736,14 -1777,24 +1778,22 @@@ share connections to real-time communic
"/releases/" name "-" version ".tar.xz"))
(sha256
(base32
- "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"))))
- (build-system gnu-build-system)
- (arguments '(#:tests? #f)) ; require the colord system service
+ "1l61ydb0zv2ffilwpapgz5mm3bznr28zl16xqbxnz6kdsrb6cimr"))))
+ (build-system meson-build-system)
+ (arguments '(#:tests? #f ;require the colord system service
+ ;; Building documentation fails with: "Cannot build man pages
+ ;; without docbook-xsl-ns".
+ #:configure-flags (list "-Ddocs=false" "-Dman=false")))
(native-inputs
- (list gobject-introspection intltool pkg-config vala))
+ (list gettext-minimal
+ gobject-introspection
+ pkg-config
+ vala))
+ (inputs
- ;; TODO: remove pango-next after it's the default.
- (list gtk+
- pango-next))
++ (list gtk+))
(propagated-inputs
;; colord-gtk.pc refers to all these.
- (list colord gtk+))
+ (list colord gtk))
(synopsis "GTK integration for libcolord")
(home-page "https://www.freedesktop.org/software/colord/";)
(description
diff --cc gnu/packages/geo.scm
index 9734ae66fe,7789564c84..d210cd63b5
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@@ -261,77 -262,56 +262,55 @@@ topology functions."
name "-" version ".tar.xz"))
(sha256
(base32
- "1cb9s2zz1zib3f33c035lmgshpl679isbzdd3alrx4yclw61nvay"))))
+ "16a3j896fwxgnvrmx27jnrvhxzh3v22paaq87ad57yp8wkq946il"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-gtk-update-icon-cache
- ;; Don't create 'icon-theme.cache'.
- (lambda _
- (substitute* "meson_post_install.py"
- (("gtk-update-icon-cache") "true"))))
- (add-after 'unpack 'patch-dbus-service
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "data/org.gnome.Maps.service.in"
- (("@pkgdatadir@/org.gnome.Maps")
- (string-append (assoc-ref outputs "out")
- "/bin/gnome-maps")))))
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (geocode-glib-path (string-append
- (assoc-ref inputs "geocode-glib")
- "/lib"))
- (goa-path (string-append
- (assoc-ref inputs "gnome-online-accounts:lib")
- "/lib"))
- (gdk-pixbuf-path (string-append
- (assoc-ref inputs "gdk-pixbuf")
- "/lib"))
- (webkitgtk-path (string-append
- (assoc-ref inputs "webkitgtk")
- "/lib")))
- (wrap-program (string-append out "/bin/gnome-maps")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
-
- ;; There seems to be no way to embed the path of
- ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37,
- ;; libgdk_pixbuf-2.0.so, libjavascriptcoregtk-4.0.so.18, and
- ;; libgeocode-glib.so.0
- `("LD_LIBRARY_PATH" ":" prefix (,goa-path
- ,webkitgtk-path
- ,gdk-pixbuf-path
- ,geocode-glib-path)))
- #t))))))
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ ;; Don't create 'icon-theme.cache'.
+ (lambda _
+ (substitute* "meson_post_install.py"
+ (("gtk-update-icon-cache") "true"))))
+ (add-after 'unpack 'patch-dbus-service
+ (lambda _
+ (substitute* "data/org.gnome.Maps.service.in"
+ (("@pkgdatadir@/org.gnome.Maps")
+ (string-append #$output "/bin/gnome-maps")))))
+ (add-after 'install 'wrap
+ (lambda _
+ (wrap-program (string-append #$output "/bin/gnome-maps")
+ `("GI_TYPELIB_PATH" ":" prefix (,(getenv
"GI_TYPELIB_PATH")))))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
+ (list gettext-minimal
+ `(,glib "bin")
+ gobject-introspection
+ pkg-config))
(inputs
- `(("evolution-data-server" ,evolution-data-server)
- ("folks" ,folks)
- ("libchamplain" ,libchamplain)
- ("libgee" ,libgee)
- ("libhandy" ,libhandy)
- ("libsecret" ,libsecret)
- ("libsoup" ,libsoup-minimal-2)
- ("libgweather" ,libgweather4)
- ("libxml2" ,libxml2)
- ("librsvg" ,librsvg)
- ("glib-networking" ,glib-networking)
- ("geoclue" ,geoclue)
- ("geocode-glib" ,geocode-glib)
- ("gfbgraph" ,gfbgraph)
- ("gjs" ,gjs)
- ("glib" ,glib)
- ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtk+" ,gtk+)
- ("rest" ,rest)
- ("webkitgtk" ,webkitgtk-with-libsoup2)))
+ (list folks
+ evolution-data-server
+ geoclue
+ geocode-glib
+ gfbgraph
+ gjs
+ glib
+ glib-networking
+ gnome-online-accounts
+ gsettings-desktop-schemas
+ gtk+
+ libadwaita
+ libgee
+ libgweather4
+ libhandy
+ librsvg
+ libsecret
+ libshumate
+ libsoup
+ libxml2
- pango-next ;TODO: remove when it's the default
+ rest-next
+ webkitgtk))
(synopsis "Graphical map viewer and wayfinding program")
(description "GNOME Maps is a graphical map viewer. It uses map data from
the OpenStreetMap project. It can provide directions for walking, bicycling,
diff --cc gnu/packages/gnome.scm
index d01e6cf35e,670f12fed9..c80c7fe921
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -7091,26 -7456,28 +7363,27 @@@ metadata in photo and video files of va
(propagated-inputs
(list dconf))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("itstool" ,itstool)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("vala" ,vala)))
+ (list gettext-minimal
+ `(,glib "bin")
+ itstool
+ pkg-config
- python
- vala-next))
++ python))
(inputs
- `(("gcr" ,gcr)
- ("gexiv2" ,gexiv2)
- ("gst-plugins-base" ,gst-plugins-base)
- ("gstreamer" ,gstreamer)
- ("json-glib" ,json-glib)
- ("libgdata" ,libgdata)
- ("libgee" ,libgee)
- ("libgphoto2" ,libgphoto2)
- ("libgudev" ,libgudev)
- ("libraw" ,libraw)
- ("libxml2" ,libxml2)
- ("sqlite" ,sqlite)
- ("webkitgtk" ,webkitgtk-with-libsoup2)))
+ (list gcr
+ gexiv2
+ gst-plugins-base
+ gstreamer
+ json-glib
+ libgdata
+ libgee
+ libgphoto2
+ libgudev
+ libraw
+ libsecret
+ libwebp
+ libxml2
+ sqlite
+ webkitgtk))
(home-page "https://wiki.gnome.org/Apps/Shotwell";)
(synopsis "Photo manager for GNOME 3")
(description
@@@ -7423,32 -7771,32 +7678,32 @@@ to display dialog boxes from the comman
#~(list
;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath="
- #$output "/lib:"
- #$output "/lib/mutter-9")
+ #$output "/lib,-rpath="
+ #$output "/lib/mutter-10")
;; Disable systemd support.
"-Dsystemd=false"
+ ;; Don't install tests.
+ "-Dinstalled_tests=false"
;; The following flags are needed for the bundled clutter
(string-append "-Dxwayland_path="
- (search-input-file %build-inputs "/bin/Xwayland"))
+ (search-input-file %build-inputs "bin/Xwayland"))
;; the remaining flags are needed for the bundled cogl
(string-append "-Dopengl_libname="
- (search-input-file %build-inputs "/lib/libGL.so"))
+ (search-input-file %build-inputs "lib/libGL.so"))
(string-append "-Dgles2_libname="
- (search-input-file %build-inputs "/lib/libGLESv2.so"))
+ (search-input-file %build-inputs "lib/libGLESv2.so"))
"-Degl_device=true" ;false by default
"-Dwayland_eglstream=true") ;false by default
- #:test-options ''("--verbose")
+ #:test-options '(list "--verbose")
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'adjust-runpath-linker-directives
+ (add-after 'unpack 'use-RUNPATH-instead-of-RPATH
(lambda _
- ;; By default Mutter uses RPATH instead of RUNPATH, which our
- ;; customized linker script makes use of. Some libraries are
- ;; also installed under lib/mutter-10 and need to be added to
- ;; the RUNPATH.
+ ;; The build system disables RUNPATH in favor of RPATH to work
+ ;; around a peculiarity of their CI system. Ignore that.
(substitute* "meson.build"
- (("'-Wl,--disable-new-dtags'")
- (string-append "'-Wl,-rpath=" #$output "/lib/mutter-10'")))))
+ (("disable-new-dtags")
+ "enable-new-dtags"))))
(add-after 'unpack 'patch-dlopen-calls
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/wayland/meta-wayland-egl-stream.c"
@@@ -7665,75 -8032,81 +7939,80 @@@ Microsoft Exchange, Last.fm, IMAP/SMTP
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0a7my8spwcaf2i2fz8ndddi1drv6l9gxq0qblmnkxzyhfwm7zrp6"))))
+ (base32 "1zjg9b77qmfin9m16rqa6cpqp1rh63pg3bcnkh25vmklslwhvq7a"))))
(build-system cmake-build-system)
(arguments
- '(#:configure-flags
- (let* ((lib (string-append (assoc-ref %outputs "out") "/lib"))
- (runpaths (map (lambda (s)
- (string-append lib "/evolution-data-server/"
s))
- '("addressbook-backends" "calendar-backends"
- "camel-providers" "credential-modules"
- "registry-modules"))))
- (list "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support
- "-DENABLE_VALA_BINDINGS=ON"
- (string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
- (string-append lib "/evolution-data-server;")
- (string-join runpaths ";"))
- "-DENABLE_INTROSPECTION=ON" ;required for Vala bindings
- "-DWITH_PHONENUMBER=ON"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- (lambda _
- ;; tests/book-migration/test-migration.c:160:test_fetch_contacts:
- ;; assertion failed (g_slist_length (contacts) == 20): (0 == 20)
- (delete-file-recursively "tests/book-migration")
- (substitute* "tests/CMakeLists.txt"
- (("add_subdirectory\\(book-migration\\)") ""))))
- (add-after 'unpack 'patch-paths
- (lambda _
- (substitute* '("tests/test-server-utils/e-test-server-utils.c"
- "tests/libedata-book/data-test-utils.c"
- "tests/libedata-book/test-book-cache-utils.c"
- "tests/libedata-cal/test-cal-cache-utils.c")
- (("/bin/rm") (which "rm")))))
- (add-before 'configure 'dont-override-rpath
- (lambda _
- (substitute* "CMakeLists.txt"
- ;; CMakeLists.txt hard-codes runpath to just the libdir.
- ;; Remove it so the configure flag is respected.
- (("SET\\(CMAKE_INSTALL_RPATH .*") "")))))))
+ (list
+ #:configure-flags
+ #~(let* ((lib (string-append #$output "/lib"))
+ (runpaths (map (lambda (s)
+ (string-append lib "/evolution-data-server/"
s))
+ '("addressbook-backends" "calendar-backends"
+ "camel-providers" "credential-modules"
+ "registry-modules"))))
+ (list "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support
+ "-DENABLE_VALA_BINDINGS=ON"
+ (string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
+ (string-append lib "/evolution-data-server;")
+ (string-join runpaths ";"))
+ "-DENABLE_INTROSPECTION=ON" ;required for Vala bindings
+ "-DENABLE_OAUTH2_WEBKITGTK4=OFF" ;requires webkitgtk-next
+ "-DWITH_PHONENUMBER=ON"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ ;;
tests/book-migration/test-migration.c:160:test_fetch_contacts:
+ ;; assertion failed (g_slist_length (contacts) == 20): (0 == 20)
+ (delete-file-recursively "tests/book-migration")
+ (substitute* "tests/CMakeLists.txt"
+ (("add_subdirectory\\(book-migration\\)") ""))))
+ (add-after 'unpack 'patch-paths
+ (lambda _
+ (substitute* '("tests/test-server-utils/e-test-server-utils.c"
+ "tests/libedata-book/data-test-utils.c"
+ "tests/libedata-book/test-book-cache-utils.c"
+ "tests/libedata-cal/test-cal-cache-utils.c")
+ (("/bin/rm") (which "rm")))))
+ (add-before 'configure 'dont-override-rpath
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ ;; CMakeLists.txt hard-codes runpath to just the libdir.
+ ;; Remove it so the configure flag is respected.
+ (("SET\\(CMAKE_INSTALL_RPATH .*") "")))))))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
- ("gobject-introspection" ,gobject-introspection)
- ("gperf" ,gperf)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
- ("protobuf" ,protobuf)
- ("vala" ,vala)
- ("python" ,python-wrapper)))
+ (list `(,glib "bin") ; for glib-mkenums, etc.
+ gobject-introspection
+ gperf
+ gsettings-desktop-schemas
+ intltool
+ pkg-config
+ protobuf
+ python-wrapper
+ vala))
(propagated-inputs
;; These are all in the Requires field of .pc files.
- `(("gtk+" ,gtk+)
- ("libical" ,libical)
- ("libsecret" ,libsecret)
- ("libsoup" ,libsoup-minimal-2)
- ("nss" ,nss)
- ("sqlite" ,sqlite)))
+ (list glib
+ gtk
+ gtk+
+ json-glib
+ libical
+ libsecret
+ libsoup
+ nss
+ sqlite))
(inputs
- `(("bdb" ,bdb)
- ("boost" ,boost)
- ("gcr" ,gcr)
- ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
- ("json-glib" ,json-glib)
- ("libcanberra" ,libcanberra)
- ("libgweather" ,libgweather)
- ("libphonenumber" ,libphonenumber)
- ("mit-krb5" ,mit-krb5)
- ("openldap" ,openldap)
- ("webkitgtk" ,webkitgtk-with-libsoup2)))
+ (list bdb
+ boost
+ gcr
+ gnome-online-accounts
+ json-glib
+ libcanberra
+ libgweather4
+ libphonenumber
+ mit-krb5
+ openldap
- pango-next ;remove after it's the default
+ webkitgtk))
(synopsis "Store address books and calendars")
(home-page "https://wiki.gnome.org/Apps/Evolution";)
(description
@@@ -7976,35 -8370,42 +8276,41 @@@ services."
"/NetworkManager-openvpn-" version ".tar.xz"))
(sha256
(base32
- "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"))))
+ "00fiyjbp42pdv5h2vdkzxd2rw32ikcinjgxrzdxak61kgw8d8iap"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'patch-path
- (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
- (let* ((ovpn (search-input-file inputs "/sbin/openvpn"))
- (modprobe (search-input-file inputs "/bin/modprobe"))
- (pretty-ovpn (string-append "\"" ovpn "\"")))
- (for-each
- (lambda (file)
- (substitute* file
- (("\"/usr/local/sbin/openvpn\"") pretty-ovpn)
- (("\"/usr/sbin/openvpn\"") pretty-ovpn)
- (("\"/sbin/openvpn\"") pretty-ovpn)
- (("/sbin/modprobe") modprobe)))
- '("src/nm-openvpn-service.c"
"properties/nm-openvpn-editor.c")))
- #t)))))
+ (list
+ #:configure-flags #~(list "--enable-absolute-paths"
+ "--localstatedir=/var"
+ "--with-gtk4=yes")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'configure 'patch-path
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (let* ((ovpn (search-input-file inputs "/sbin/openvpn"))
+ (modprobe (search-input-file inputs "/bin/modprobe"))
+ (pretty-ovpn (string-append "\"" ovpn "\"")))
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("\"/usr/local/sbin/openvpn\"") pretty-ovpn)
+ (("\"/usr/sbin/openvpn\"") pretty-ovpn)
+ (("\"/sbin/openvpn\"") pretty-ovpn)
+ (("/sbin/modprobe") modprobe)))
+ '("src/nm-openvpn-service.c"
+ "properties/nm-openvpn-editor.c"))))))))
(native-inputs
- (list pkg-config intltool))
+ (list intltool
+ `(,glib "bin")
+ pkg-config))
(inputs
(list gtk+
+ gtk
kmod
- openvpn
- network-manager
libnma
- libsecret))
+ libsecret
+ network-manager
- openvpn
- pango-next)) ;remove after it's the default
++ openvpn))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN";)
(synopsis "OpenVPN plug-in for NetworkManager")
(description
@@@ -8054,7 -8455,8 +8360,7 @@@ to virtual private networks (VPNs) via
vpnc
network-manager
libnma
- libsecret))
- libsecret
- pango-next)) ;TODO: remove after it's the default
++ libsecret)) ;TODO: remove after it's the default
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN";)
(synopsis "VPNC plug-in for NetworkManager")
(description
@@@ -8503,24 -8920,29 +8823,27 @@@ usage and information about running pro
"gnome-bluetooth-" version ".tar.xz"))
(sha256
(base32
- "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"))))
+ "1p5wq3rh9p7fhka57qcds6lvphd26yyc18ilncx95jbcvcfcyvqx"))))
(build-system meson-build-system)
- (arguments
- (list #:meson meson-0.60))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
- ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
- ("gobject-introspection" ,gobject-introspection)
- ("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("python-dbus" ,python-dbus)
- ("xmllint" ,libxml2)))
+ (list gettext-minimal
+ gobject-introspection
+ `(,glib "bin") ;for gdbus-codegen, etc.
+ libxml2
+ pkg-config
+ python
+ python-dbus))
(propagated-inputs
- ;; gnome-bluetooth-1.0.pc refers to all these.
- (list glib gtk+))
+ ;; These are all required by the gnome-bluetooth .pc file.
+ (list glib
+ gtk
+ libadwaita))
(inputs
- (list eudev libcanberra libnotify python-dbus))
+ (list eudev
+ gsound
+ libnotify
- ;; TODO: Delete pango-next after it's the default.
- pango-next
+ python-dbus
+ upower))
(synopsis "GNOME Bluetooth subsystem")
(home-page "https://wiki.gnome.org/Projects/GnomeBluetooth";)
(description
@@@ -9226,17 -9647,20 +9548,19 @@@ files."
(arguments
'(#:glib-or-gtk? #t))
(native-inputs
- `(("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("desktop-file-utils" ,desktop-file-utils) ; for
update-desktop-database
- ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache
- ("itstool" ,itstool)
- ("xmllint" ,libxml2)
- ("glib" ,glib "bin")
- ("vala" ,vala)))
+ (list desktop-file-utils ;for update-desktop-database
+ gettext-minimal
+ `(,glib "bin")
+ `(,gtk+ "bin") ;for gtk-update-icon-cache
+ itstool
+ libxml2
+ pkg-config
+ python
+ vala))
(inputs
- (list gtk+ libhandy))
- (list gtk libadwaita libhandy
- ;; XXX: Ensure pango-next is used instead of the equally propagated
- ;; 'pango'.
- pango-next))
++ (list gtk
++ libadwaita
++ libhandy))
(synopsis "Disk usage analyzer for GNOME")
(description
"Baobab (Disk Usage Analyzer) is a graphical application to analyse disk
@@@ -9754,24 -10189,25 +10089,24 @@@ Microsoft SkyDrive and Hotmail, using t
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
- (substitute* "build-aux/post-install.py"
- (("gtk-update-icon-cache") "true")))))))
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")))))))
(native-inputs
- `(("vala" ,vala)
- ("pkg-config" ,pkg-config)
- ("glib" ,glib "bin") ; for glib-compile-resources
- ("desktop-file-utils" ,desktop-file-utils)
- ("gettext" ,gettext-minimal)
- ("itstool" ,itstool)))
+ (list desktop-file-utils
+ gettext-minimal
+ `(,glib "bin") ; for glib-compile-resources
+ itstool
- pkg-config
- vala-next))
++ pkg-config))
(inputs
- (list glib
- gtk+
+ (list geoclue
+ geocode-glib-with-libsoup2
+ glib
+ gnome-desktop
gsound
- geoclue
- geocode-glib
- libgweather
- libhandy
- gnome-desktop))
+ gtk
+ libadwaita
+ libgweather4-with-libsoup2))
(home-page "https://wiki.gnome.org/Apps/Clocks";)
(synopsis "GNOME's clock application")
(description
@@@ -9803,23 -10235,26 +10134,24 @@@ desktop. It supports world clock, sto
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
- (substitute* "build-aux/meson/meson_post_install.py"
- (("gtk-update-icon-cache") "true"))
- #t)))))
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib-bin" ,glib "bin") ; For glib-compile-schemas
- ("pkg-config" ,pkg-config)))
+ (list gettext-minimal
+ `(,glib "bin") ; For glib-compile-schemas
+ pkg-config))
(inputs
- `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("libdazzle" ,libdazzle)
- ("libedataserverui" ,evolution-data-server)
- ("libgweather" ,libgweather)
- ("libhandy" ,libhandy)
- ("geoclue" ,geoclue)))
- (propagated-inputs
- (list evolution-data-server))
+ ;; Note: not propagating evolution-data-server-3.44 to keep profiles
+ ;; clean from libsoup2.
+ (list evolution-data-server-3.44
+ geoclue
+ geocode-glib-with-libsoup2
+ gnome-online-accounts-3.44
+ gsettings-desktop-schemas
+ libadwaita
+ libdazzle
- libgweather4-with-libsoup2
- ;; Remove pango-next when it's the default.
- pango-next))
++ libgweather4-with-libsoup2))
(home-page "https://wiki.gnome.org/Apps/Calendar";)
(synopsis "GNOME's calendar application")
(description
@@@ -11698,8 -12171,10 +12068,10 @@@ integrate seamlessly with the GNOME des
gsettings-desktop-schemas
gtk+
gtk-vnc
- gtksourceview
+ gtksourceview-4
json-glib
+ libarchive
+ libgudev
libhandy
libosinfo
libsecret
@@@ -12582,36 -13036,35 +12933,35 @@@ your data."
name "-" version ".tar.xz"))
(sha256
(base32
- "0d48nc11z0m91scy21ah56ysxns82zvswx8lglvlkig1vqvblgpc"))))
+ "0fzi48s3wz9mf6c1ndpkby83bgshgn2116nqjq31n1j3wszvqrra"))))
(build-system meson-build-system)
- (inputs
- `(("json-glib" ,json-glib)
- ("jsonrpc-glib" ,jsonrpc-glib)
- ("gettext" ,gettext-minimal)
- ("glib" ,glib)
- ("gtk+" ,gtk+)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gspell" ,gspell)
- ("libdazzle" ,libdazzle)
- ("libgda" ,libgda)
- ("libhandy" ,libhandy)
- ("libsoup" ,libsoup-minimal-2)))
+ (arguments
+ (list #:build-type "release" ;otherwise it tries to fetch stuff via git
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ (lambda _
+ (substitute* "build-aux/meson/meson_post_install.py"
+ (("gtk-update-icon-cache") (which "true"))))))))
(native-inputs
- `(("glib:bin" ,glib "bin")
- ("itstool" ,itstool)
- ("pkg-config" ,pkg-config)))
+ (list `(,glib-next "bin")
+ gettext-minimal
+ itstool
+ pkg-config))
+ (inputs
+ (list json-glib
+ jsonrpc-glib
+ gettext-minimal
+ glib-next
+ gsettings-desktop-schemas
+ gspell
+ libgda
+ libhandy
+ libsoup
- pango-next))
++ pango))
(propagated-inputs
- (list gtksourceview-4)) ; required for source view
- (arguments
- `(#:build-type "release"
- #:glib-or-gtk? #t
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-gtk-update-icon-cache
- (lambda _
- (substitute* "build-aux/meson/meson_post_install.py"
- (("gtk-update-icon-cache") (which "true")))
- #t)))))
+ (list gtksourceview-4)) ; required for source view
(home-page "https://wiki.gnome.org/Apps/Gtranslator";)
(synopsis "Translation making program")
(description
diff --cc gnu/packages/gtk.scm
index 932deba3ad,61e271ab19..590b56ea6a
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -567,109 -611,101 +567,100 @@@ printing and other features typical of
(home-page "https://developer.gnome.org/gtksourceview/";)))
(define-public gtksourceview
- (package
- (name "gtksourceview")
- (version "5.4.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/gtksourceview/"
- (version-major+minor version) "/"
- "gtksourceview-" version ".tar.xz"))
- (sha256
- (base32
- "1rwxnzq2vvck5ni5zsfnmnx2kgasi3a2n29w93g106c4xc3hw55d"))))
- (build-system meson-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-build
+ (package
+ (name "gtksourceview")
+ (version "5.5.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/gtksourceview/"
+ (version-major+minor version) "/"
+ "gtksourceview-" version ".tar.xz"))
+ (sha256
+ (base32
+ "068dqhacvs65gnmrryahm6qs0q050admlpqqi1gy8wgh2p6qrraa"))))
+ (build-system meson-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-gtk-update-icon-cache
(lambda _
(substitute* "meson.build"
- (("gnome.post_install" all)
- (string-append "# " all)))))
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false"))))
(add-before 'check 'pre-check
- (lambda* (#:key inputs native-inputs #:allow-other-kgeys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((Xvfb (search-input-file (or native-inputs inputs)
- "/bin/Xvfb")))
+ "bin/Xvfb")))
;; Tests require a running X server.
- (system (format #f "~a :1 &" Xvfb))
+ (system (string-append Xvfb " :1 &"))
(setenv "DISPLAY" ":1")
;; For the missing /etc/machine-id.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t))))))
- (native-inputs
- (list `(,glib "bin") ; for glib-genmarshal, etc.
- intltool
- itstool
- gobject-introspection
- pkg-config
- vala
- ;; For testing.
- xorg-server-for-tests
- shared-mime-info))
- (propagated-inputs
- ;; gtksourceview-5.0.pc refers to all these.
- (list glib gtk libxml2 pcre2))
- (home-page "https://wiki.gnome.org/Projects/GtkSourceView";)
- (synopsis "GNOME source code widget")
- (description "GtkSourceView is a text widget that extends the standard
+ (setenv "DBUS_FATAL_WARNINGS" "0")))))))
+ (native-inputs
+ (list `(,glib "bin") ; for glib-genmarshal, etc.
+ gettext-minimal
+ gi-docgen
+ gobject-introspection-next
+ pkg-config
+ vala
+ ;; For testing.
+ xorg-server-for-tests
+ shared-mime-info))
+ (propagated-inputs
+ ;; gtksourceview-5.pc refers to all these.
+ (list fontconfig
+ fribidi
+ glib-next
+ gtk
+ libxml2
- pcre2
- pango-next))
++ pango
++ pcre2))
+ (home-page "https://wiki.gnome.org/Projects/GtkSourceView";)
+ (synopsis "GNOME source code widget")
+ (description "GtkSourceView is a text widget that extends the standard
GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
highlighting and other features typical of a source code editor.")
- (license license:lgpl2.1+)))
+ (license license:lgpl2.1+)))
+ ;;; This older version is used by tepl.
(define-public gtksourceview-4
- (package
- (inherit gtksourceview)
- (version "4.2.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/gtksourceview/"
- (version-major+minor version) "/"
- "gtksourceview-" version ".tar.xz"))
- (sha256
- (base32
- "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"))))
- (build-system gnu-build-system)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-before
- 'check 'pre-check
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xorg-server (assoc-ref inputs "xorg-server")))
- ;; Tests require a running X server.
- (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
- (setenv "DISPLAY" ":1")
- ;; For the missing /etc/machine-id.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t))))))
- (native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.
- ("intltool" ,intltool)
- ("itstool" ,itstool)
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)
- ("vala" ,vala)
- ;; For testing.
- ("xorg-server" ,xorg-server-for-tests)
- ("shared-mime-info" ,shared-mime-info)))
- (propagated-inputs
- ;; gtksourceview-3.0.pc refers to all these.
- (list glib gtk+ libxml2))))
+ (package
+ (inherit gtksourceview)
+ (version "4.8.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/gtksourceview/"
+ (version-major+minor version) "/"
+ "gtksourceview-" version ".tar.xz"))
+ (sha256
+ (base32
+ "10n61sa0g447nx73yapb00z57shp48gfvk1lv1s29ji0cd81j063"))))
+ (native-inputs
+ (modify-inputs (package-native-inputs gtksourceview)
+ (replace "gobject-introspection" gobject-introspection)))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs gtksourceview)
+ (replace "gtk" gtk+)
- (replace "pango-next" pango)
+ (replace "glib" glib)))))
(define-public gtksourceview-3
- (package (inherit gtksourceview-4)
- (name "gtksourceview")
- (version "3.24.10")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"))))))
+ (package
+ (inherit gtksourceview-4)
+ (name "gtksourceview")
+ (version "3.24.11")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"))))
+ (build-system gnu-build-system)
+ (arguments (substitute-keyword-arguments (package-arguments gtksourceview)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'disable-gtk-update-icon-cache)))))))
(define-public gdk-pixbuf
(package
@@@ -992,9 -1067,9 +983,7 @@@ application suites."
fribidi
fontconfig
freetype
-- (if (target-x86-64?)
- librsvg
- librsvg-2.40)
- librsvg-bootstrap
- librsvg-2.40)
++ (librsvg-for-system)
glib
libcloudproviders-minimal
libepoxy
@@@ -1251,10 -1330,8 +1241,9 @@@
iso-codes
json-glib
libcloudproviders ;for cloud-providers support
+ libgudev ;for gstreamer-gl
libjpeg-turbo
libpng
- librsvg
libtiff
python
rest
@@@ -1263,7 -1340,7 +1252,7 @@@
;; Following dependencies are referenced in .pc files.
(list cairo
fontconfig
- librsvg
- librsvg-bootstrap
++ (librsvg-for-system)
glib
graphene
libepoxy
diff --cc gnu/packages/webkit.scm
index 89cd7ebd6b,58e8314292..aa7f7aafe8
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -279,11 -279,47 +279,46 @@@ propagated by default) such as @code{gs
license:bsd-2
license:bsd-3))))
- ;;; Required by gnome-online-accounts as webkitgtk propagates libsoup 3, which
- ;;; causes the build to fail. Also 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
+ (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
++ (delete "gtk+-2" "libnotify")))))
+
+ ;;; 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.
(define-public webkitgtk-with-libsoup2
(package/inherit webkitgtk
(name "webkitgtk-with-libsoup2")