diff options
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 179 |
1 files changed, 83 insertions, 96 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 68183eb553..8d30975cac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -262,7 +262,7 @@ commonly used macros.") (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.22.2") + (version "3.24.1") (source (origin (method url-fetch) @@ -271,7 +271,7 @@ commonly used macros.") name "-" version ".tar.xz")) (sha256 (base32 - "074yjz4g9gii045v2pl1ad34hcg92ci04ynxqcabwnf3lvvypmsi")))) + "1as5ri52n6wphvhqnxa813q15jri0x47hxsjikjcmb2big9vf2fy")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) @@ -521,7 +521,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.22.1") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -529,15 +529,10 @@ forgotten when the session ends.") name "-" version ".tar.xz")) (sha256 (base32 - "0713mcrym5ykhl5smqxi6m9578gz3nkibmkmc794amss7gdkkm7k")))) + "13yw0i68dgqp9alyliy3zifszh7rikkpi1xbz5binvxxgfpraf04")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") - - ;; FIXME: Tests fail with: - ;; ImportError: No module named gi.repository - ;; Where should that module come from? - #:tests? #f #:phases (modify-phases %standard-phases (add-before 'install 'skip-gtk-update-icon-cache @@ -593,7 +588,7 @@ on the GNOME Desktop with a single simple application.") (define-public gsettings-desktop-schemas (package (name "gsettings-desktop-schemas") - (version "3.22.0") + (version "3.24.0") (source (origin (method url-fetch) @@ -602,7 +597,7 @@ on the GNOME Desktop with a single simple application.") name "-" version ".tar.xz")) (sha256 (base32 - "1qgalzqwg0fl0n22vslqcsnsmj9kc54qj25ib16rxaf36jxcf1hg")))) + "145vpcljy4660cnk8zk91qf7ywa7hqfl5hhw025gy8hxcqzklmzn")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) @@ -954,16 +949,18 @@ the GNOME desktop environment.") (define-public libcroco (package (name "libcroco") - (replacement libcroco/fixed) - (version "0.6.11") + (version "0.6.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches + (search-patches "libcroco-CVE-2017-7960.patch" + "libcroco-CVE-2017-7961.patch")) (sha256 (base32 - "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk")))) + "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -982,19 +979,6 @@ XML/CSS rendering engine.") ;; LGPLv2.1-only. (license license:lgpl2.1))) -(define libcroco/fixed - (package - (inherit libcroco) - (replacement #f) - (source - (origin - (inherit (package-source libcroco)) - (patches - (append - (origin-patches (package-source libcroco)) - (search-patches "libcroco-CVE-2017-7960.patch" - "libcroco-CVE-2017-7961.patch"))))))) - (define-public libgsf (package (name "libgsf") @@ -1829,7 +1813,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.34.4") + (version "0.36.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1837,7 +1821,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "10vbd74jazc3vhfagzx8v197bshrg61hnjzna6y3wmhljhrvs5vb")))) + "0706izk9prxqclm7gv4f63diwnlc1llvfl5sc9ghqbgn076lx2mc")))) (build-system gnu-build-system) (arguments '(#:phases @@ -2076,7 +2060,7 @@ configuration storage systems.") (define-public json-glib (package (name "json-glib") - (version "1.2.2") + (version "1.2.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2084,14 +2068,7 @@ configuration storage systems.") name "-" version ".tar.xz")) (sha256 (base32 - "08d6449sgnwfh92x8rhwsm03g8frv0mvp3s4wl3cskw25asql4pa")) - (modules '((guix build utils))) - (snippet - ;; Don't duplicate test names. - ;; <https://bugzilla.gnome.org/show_bug.cgi?id=755977>. - '(substitute* "json-glib/tests/builder.c" - (("\"/builder/complex\", test_builder_empty") - "\"/builder/empty\", test_builder_empty"))))) + "02pl0wl3mf47c038bgv2r4pa6pr6y3shjhxn1l7s3rrrgl1sjmgx")))) (build-system gnu-build-system) (native-inputs `(("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal @@ -2265,7 +2242,7 @@ libxml to ease remote use of the RESTful API.") (define-public libsoup (package (name "libsoup") - (version "2.56.0") + (version "2.58.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2273,14 +2250,17 @@ libxml to ease remote use of the RESTful API.") name "-" version ".tar.xz")) (sha256 (base32 - "1r8zz270qdg92gbsvy61d51y1cj7hp059h2f4xpvqiw2vrqnn8fq")))) + "1fggmshk2mfsyfvml6paki65xj9rv1s5p7ds41xmnx6yazsnkik2")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments `(#:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + "/share/gtk-doc/html") + (string-append "--with-apache-module-dir=" + (assoc-ref %build-inputs "httpd") + "/modules")) #:phases (modify-phases %standard-phases (add-before 'configure 'disable-unconnected-socket-test @@ -2298,6 +2278,9 @@ libxml to ease remote use of the RESTful API.") ;; The ca-certificates.crt is not available in the build ;; environment. (setenv "SSL_CERT_FILE" "/dev/null") + ;; HTTPD in Guix uses mod_event and does not build prefork. + (substitute* "tests/httpd.conf" + (("^LoadModule mpm_prefork_module.*$") "\n")) #t)) (replace 'install (lambda _ @@ -2762,7 +2745,7 @@ services for numerous locations.") (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.22.1") + (version "3.24.1") (source (origin (method url-fetch) @@ -2771,7 +2754,7 @@ services for numerous locations.") name "-" version ".tar.xz")) (sha256 (base32 - "1finsr7yqvix6n3rdwclv4fpgagmz6xyrk3qzapkn9ljv76rfzdm")))) + "02vm0jwhs9rdi3dphxw7dxharx7ng0l12j6hfdmn3vjc7v3ds50v")))) (build-system glib-or-gtk-build-system) (arguments `(;; Color management test can't reach the colord system service. @@ -2948,9 +2931,13 @@ throughout GNOME for API documentation).") ("cairo" ,cairo) ("pango" ,pango) ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base))) + ("gst-plugins-base" ,gst-plugins-base) + ("wayland" ,wayland))) (arguments `(#:configure-flags (list "--enable-cogl-gst" + "--enable-wayland-egl-platform" + "--enable-wayland-egl-server" + ;; Arrange to pass an absolute file name to ;; dlopen for libGL.so. (string-append "--with-gl-libname=" @@ -3522,7 +3509,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (define-public eog (package (name "eog") - (version "3.20.5") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3530,7 +3517,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") name "-" version ".tar.xz")) (sha256 (base32 - "0fqvfc4y1lbv0awh8dbx9khfha0hdkmnj1lzw5jq0l7jmahwbrz6")))) + "1rr7zy8afqgl15j1zz8l37svyv6bw4r3l04yf70zlnf1w8bf27pm")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -3600,7 +3587,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.30.3") + (version "1.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3608,7 +3595,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") name "-" version ".tar.xz")) (sha256 (base32 - "0xgis1kgglnazy1vm66xiqyz8yvvmiad3h0g3agg7ryai6aa495q")))) + "1pkahczniar1yyas7awcqpkb4ca8l7qa4msn6mr29m89mgnwkdnh")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; XXX: requiring `pidof' @@ -3753,7 +3740,7 @@ work and the interface is well tested.") (define-public epiphany (package (name "epiphany") - (version "3.22.7") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3761,7 +3748,7 @@ work and the interface is well tested.") name "-" version ".tar.xz")) (sha256 (base32 - "1167x5s0kawkqngjnzml0a11ib18raxqc4p11kacivj4jv0pwnx1")))) + "1p499ncsrbpfjna9h5v1cafr7fv1zb4cmihz05pgr07bb625y991")))) (build-system glib-or-gtk-build-system) (arguments ;; FIXME: tests run under Xvfb, but fail with: @@ -3784,6 +3771,7 @@ work and the interface is well tested.") ("glib-networking" ,glib-networking) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("json-glib" ,json-glib) ("iso-codes" ,iso-codes) ("libnotify" ,libnotify) ("libsecret" ,libsecret) @@ -4060,7 +4048,7 @@ share them with others via social networking and more.") (define-public file-roller (package (name "file-roller") - (version "3.22.2") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4068,7 +4056,7 @@ share them with others via social networking and more.") name "-" version ".tar.xz")) (sha256 (base32 - "1yaxd0lqhajszilblkidqfkaffhzml10l7ib64023y36qgf8q597")))) + "0fkz9h9a6149crmf6311fsqlmv9wyrxk86470vxib941ppl4a581")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases @@ -4102,7 +4090,7 @@ such as gzip tarballs.") (define-public gnome-session (package (name "gnome-session") - (version "3.22.2") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4110,7 +4098,7 @@ such as gzip tarballs.") name "-" version ".tar.xz")) (sha256 (base32 - "1xahljysbpnc1zafm1y2lqnmmqi2jh4fx7h2y48d9ipqnknk26in")))) + "1vkfjsgks9czajivcg3y1krzlnilv2cnzzbdc7wrasrriqilji1v")))) (arguments '(#:phases (modify-phases %standard-phases @@ -4181,7 +4169,7 @@ configuration program to choose applications starting on login.") (define-public gjs (package (name "gjs") - (version "1.46.0") + (version "1.48.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4189,10 +4177,7 @@ configuration program to choose applications starting on login.") name "-" version ".tar.xz")) (sha256 (base32 - "1m2ssa6qsipbp8lz4xbhf0nhadhv0xkdpmz1jcvl9187lwgmk0r2")) - (modules '((guix build utils))) - (snippet '(substitute* "test/run-with-dbus" - (("/bin/rm") "rm"))))) + "0cqgv460wfhwkw6j1h46v6bg29bycg6dfl7c5rv0lfcqmmw7v6v6")))) (build-system gnu-build-system) (arguments '(#:phases @@ -4207,11 +4192,11 @@ configuration program to choose applications starting on login.") ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0") - ;; XXX: fails with: - ;; Failed to convert UTF-8 string to JS string: ... - ;; TODO: actually fix it. - (substitute* "installed-tests/js/testEverythingBasic.js" - ((".*test_utf8_inout.*") "")) + ;; Our mozjs-38 package does not compile the required Intl API + ;; support for these failing tests. + (substitute* "installed-tests/js/testLocale.js" + ((".*toBeDefined.*") "") + ((".*expect\\(datestr\\).*") "")) #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources @@ -4223,8 +4208,9 @@ configuration program to choose applications starting on login.") ("xvfb" ,xorg-server))) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. - `(("gobject-introspection" ,gobject-introspection) - ("mozjs" ,mozjs-24))) + `(("cairo" ,cairo) + ("gobject-introspection" ,gobject-introspection) + ("mozjs" ,mozjs-38))) (inputs `(("gtk+" ,gtk+) ("readline" ,readline))) @@ -4323,24 +4309,21 @@ to display dialog boxes from the commandline and shell scripts.") (license license:lgpl2.0+))) (define-public mutter - ;; Uses the gnome 3.22 branch that only contains bug fixes. - (let ((commit "23c315ea7121e9bd108e2837d0b4beeba53c5e18")) (package (name "mutter") - (version (git-version "3.22.2" "1" commit)) + (version "3.24.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.gnome.org/mutter") - (commit commit))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 (base32 - "1v1f9xyzjr1ihmfwpq9kzlv2lyr9qn63ck8zny699mbp5hsi11mb")))) - ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked - ;; versions of cogl and clutter. As a result, many of the inputs, - ;; propagated-inputs, and configure flags used in cogl and clutter are - ;; needed here as well. + "093ax3ng7fv28qfkxpbvcx67mfiizwj5b4s17m5cmijwf3wpgamc")))) + ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked + ;; versions of cogl and clutter. As a result, many of the inputs, + ;; propagated-inputs, and configure flags used in cogl and clutter are + ;; needed here as well. (build-system gnu-build-system) (arguments '(#:configure-flags @@ -4349,8 +4332,7 @@ to display dialog boxes from the commandline and shell scripts.") ;; implicit declaration of function ?roundf? (list "--enable-compile-warnings=minimum" - "--disable-wayland" ; TODO enable wayland - ;; "--enable-native-backend" ; TODO enable the native backend + "--enable-native-backend" ;; The following flags are needed for the bundled clutter "--enable-x11-backend=yes" @@ -4362,9 +4344,14 @@ to display dialog boxes from the commandline and shell scripts.") "/lib/libGL.so")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + ;; Replace references to systemd libraries to elogind references. + (add-before 'configure 'use-elogind + (lambda _ + (substitute* (list "configure" + "src/backends/native/meta-launcher.c" + "src/core/main.c") + (("systemd") "elogind")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("gobject-introspection" ,gobject-introspection) @@ -4397,17 +4384,17 @@ to display dialog boxes from the commandline and shell scripts.") ("mesa" ,mesa) ("pango" ,pango) ("udev" ,eudev) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("xinput" ,xinput))) (inputs - `(("gnome-desktop" ,gnome-desktop) + `(("elogind" ,elogind) + ("gnome-desktop" ,gnome-desktop) ("libcanberra-gtk" ,libcanberra) ("libgudev" ,libgudev) ("libice" ,libice) ("libsm" ,libsm) ("libxkbfile" ,libxkbfile) ("libxrandr" ,libxrandr) + ("libxtst" ,libxtst) ("startup-notification" ,startup-notification) ("upower-glib" ,upower) ("xkeyboard-config" ,xkeyboard-config) @@ -4419,12 +4406,12 @@ to display dialog boxes from the commandline and shell scripts.") desktop via OpenGL. Mutter combines a sophisticated display engine using the Clutter toolkit with solid window-management logic inherited from the Metacity window manager.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.22.3") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4432,7 +4419,7 @@ window manager.") name "-" version ".tar.xz")) (sha256 (base32 - "13wvnfh3hnasdnb6fhjssybj2327qihd32kpdjjb3r1qiyc8dvqb")))) + "0yy10znqj278lnhdiqjcqxrwwv5c1jdjd0ncjbbdyh8n0q77hbwy")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. @@ -4899,7 +4886,7 @@ usage and information about running processes.") (define-public gnome-bluetooth (package (name "gnome-bluetooth") - (version "3.20.0") + (version "3.20.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4907,7 +4894,7 @@ usage and information about running processes.") name "-" version ".tar.xz")) (sha256 (base32 - "0lzbwk2kn7kp39sv5bf4ja92mfkxkc27gxxk8k86i8a8ncbcmcwk")))) + "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. @@ -4932,7 +4919,7 @@ devices using the GNOME desktop.") (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.22.1") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4940,7 +4927,7 @@ devices using the GNOME desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "06h9937sjfrzjf36pxqybg4wmkc5xdhbxgdkclnkjxiiqidjjsax")))) + "0g55i4w0a8qpfkl0vnzr3ng6adx8pdxqk8vzc3kvvx6xzlcqxk1h")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases @@ -5293,7 +5280,7 @@ is complete it provides a graphical representation of each selected folder.") (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.22.1") + (version "3.24.0") (source (origin (method url-fetch) @@ -5302,7 +5289,7 @@ is complete it provides a graphical representation of each selected folder.") name "-" version ".tar.xz")) (sha256 (base32 - "09gfdrm1kaz2knyghhjb0ka1kklgbcbnqgy4c90bg0v3n899ij5z")))) + "1jkikis9k3psp6rb8axnqy86awdyg5rzfbcp9gx40a99b4hlrnnb")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool))) |