diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gl.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/glib.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 116 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 22 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/ruby.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 4 |
7 files changed, 85 insertions, 82 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 40b756394e..7457809300 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -217,7 +217,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "17.0.4") + (version "17.0.6") (source (origin (method url-fetch) @@ -227,7 +227,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j")) + "17d60jjzg4ddm95gk2cqx0xz6b9anmmz6ax4majwr3gis2yg7v49")) (patches (search-patches "mesa-fix-32bit-test-failures.patch" "mesa-wayland-egl-symbols-check-mips.patch" diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 6de9cce0b7..8c334c467d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -67,7 +67,7 @@ (define dbus (package (name "dbus") - (version "1.10.16") + (version "1.10.18") (source (origin (method url-fetch) (uri (string-append @@ -75,7 +75,7 @@ version ".tar.gz")) (sha256 (base32 - "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57")) + "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments @@ -137,7 +137,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.50.3") + (version "2.52.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -145,7 +145,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "16frrwhc1yqkzx6bgh3060g94dr2biab17fb01mrni819jzr9vl2")) + "0vsqrvjwsk2x3mm2i428hpm5vgsi1b384l6xdhm7xmzj2yw2d34l")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 47dcc91dcd..d53d15894f 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))) @@ -2076,7 +2071,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 +2079,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 @@ -2762,7 +2750,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 +2759,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 +2936,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 +3514,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 +3522,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 @@ -3753,7 +3745,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 +3753,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 +3776,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 +4053,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 +4061,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 +4095,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 +4103,7 @@ such as gzip tarballs.") name "-" version ".tar.xz")) (sha256 (base32 - "1xahljysbpnc1zafm1y2lqnmmqi2jh4fx7h2y48d9ipqnknk26in")))) + "1vkfjsgks9czajivcg3y1krzlnilv2cnzzbdc7wrasrriqilji1v")))) (arguments '(#:phases (modify-phases %standard-phases @@ -4323,24 +4316,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 +4339,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 +4351,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 +4391,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 +4413,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 +4426,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 +4893,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 +4901,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 +4926,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 +4934,7 @@ devices using the GNOME desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "06h9937sjfrzjf36pxqybg4wmkc5xdhbxgdkclnkjxiiqidjjsax")))) + "0g55i4w0a8qpfkl0vnzr3ng6adx8pdxqk8vzc3kvvx6xzlcqxk1h")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases @@ -5292,7 +5286,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) @@ -5301,7 +5295,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))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dffa2baf30..9732ee4ccd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -170,7 +171,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "1.4.3") + (version "1.4.6") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -178,7 +179,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "08akv3qzwnf48xajb60dfcchkmfdjkpp65a0xd8s98w81901g343")))) + "14yj514yfy373np3gxk930a443j1zgnwg6mm0kdzzjr0rn0qp9r1")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo @@ -508,7 +509,7 @@ in the GNOME project.") (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.22.0") + (version "2.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -516,7 +517,7 @@ in the GNOME project.") name "-" version ".tar.xz")) (sha256 (base32 - "02n8ybhg8344mpjwvkhnzvr0qbvvl6ryi2q9irwhi0ri46ps6pj1")))) + "1kdgc5gkw3fsgxvwwsg7djvqijpc3xmpp9bp6k6v60yrzcag6yb1")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -673,8 +674,12 @@ application suites.") ("libxcursor" ,libxcursor) ("libxi" ,libxi) ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) ("libxdamage" ,libxdamage) - ("pango" ,pango))) + ("mesa" ,mesa) + ("pango" ,pango) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("libxml2" ,libxml2) ;; XXX: colord depends on mozjs (through polkit), which fails on @@ -700,7 +705,12 @@ application suites.") ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + "/share/gtk-doc/html") + ;; The header file <gdk/gdkwayland.h> is required + ;; by gnome-control-center + "--enable-wayland-backend" + ;; This is necessary to build both backends. + "--enable-x11-backend") #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bfe6b64ffe..9db748ebee 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2737,7 +2737,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.44") + (version "5.45") (source (origin (method url-fetch) (uri (string-append @@ -2745,7 +2745,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "11bc6pndivd0rkqr3c8a1xd9ar9bb60gx79piskycicb3wliwchc")))) + "1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 14511d0c32..1df7d60a36 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -48,8 +48,7 @@ (define-public ruby (package (name "ruby") - (version "2.3.3") - (replacement ruby-2.3.4) + (version "2.4.0") (source (origin (method url-fetch) @@ -58,7 +57,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "1p0rfk0blrbfjcnv0vb0ha4hxflgkfhv9zbzp4vvld2pi31ahkqs")) + "141nnsdk2q83c23p5kl404id8gy1ap261gin48rbjj5sbksgx1rs")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi @@ -102,11 +101,11 @@ a focus on simplicity and productivity.") (home-page "https://ruby-lang.org") (license license:ruby))) -(define ruby-2.3.4 +(define-public ruby-2.3 (package (inherit ruby) - (name "ruby") (version "2.3.4") + (replacement #f) (source (origin (method url-fetch) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 990e27d5d4..f243222fb3 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3623,7 +3623,7 @@ alternative implementations like XRandR or TwinView.") (define xkbcomp-intermediate ; used as input for xkeyboard-config (package (name "xkbcomp-intermediate") - (version "1.3.1") + (version "1.4.0") (source (origin (method url-fetch) @@ -3633,7 +3633,7 @@ alternative implementations like XRandR or TwinView.") ".tar.bz2")) (sha256 (base32 - "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103")))) + "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) |