From cc81f1c3495e81cc738b486e1ef2b4a1dbe99e28 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Wed, 16 Aug 2017 21:49:17 +0200 Subject: gnu: freerdp: Revert to version 1.1. * gnu/packages/rdesktop.scm (freerdp) [version, source]: Revert to upstream branch 1.1. [inputs]: Use ffmpeg-2.8. * gnu/packages/gnome.scm (vinagre): Add patches required to build against freerdp branch 1.1. * gnu/packages/patches/vinagre-revert-1.patch, gnu/packages/patches/vinagre-revert-2.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b362ba5e2d..dab450acb4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2123,6 +2123,9 @@ selection and URL hints."))) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches ; We have to revert 2 commits to build against freerdp 1.1. + (search-patches "vinagre-revert-1.patch" + "vinagre-revert-2.patch")) (sha256 (base32 "10jya3jyrm18nbw3v410gbkc7677bqamax44pzgd3j15randn76d")))) -- cgit 1.4.1 From 7c94a3599eedfd53fcbad70baebbcbed3e38d0fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 13:50:22 +0200 Subject: gnu: totem-pl-parser: Update to 3.10.8. * gnu/packages/gnome.scm (totem-pl-parser): Update to 3.10.8. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dab450acb4..9ad56e00f9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2983,7 +2983,7 @@ settings, themes, mouse settings, and startup of other daemons.") (define-public totem-pl-parser (package (name "totem-pl-parser") - (version "3.10.7") + (version "3.10.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/totem-pl-parser/" @@ -2991,7 +2991,7 @@ settings, themes, mouse settings, and startup of other daemons.") "totem-pl-parser-" version ".tar.xz")) (sha256 (base32 - "17089sqyh6w6zr8ci865ihmvqshnslcsk9fbsl4s7yii66y8b0lw")))) + "0ayxg0gfs5h5jhr811ja5hxlhryklzp6jlal2ach9wym2c3hmigz")))) (build-system gnu-build-system) (arguments ;; FIXME: Tests require gvfs. -- cgit 1.4.1 From 69d0674830e0c36091fccaaca5040ae5e0a0b2cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 13:51:29 +0200 Subject: gnu: shotwell: Update to 0.26.3. * gnu/packages/gnome.scm (shotwell): Update to 0.26.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ad56e00f9..c313a5cb94 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4301,7 +4301,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.26.2") + (version "0.26.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4309,7 +4309,7 @@ metadata in photo and video files of various formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag")))) + "1r8fd63r7c5n99hwrkzv9jlrk84z4sa15q3h70pydzfjnfqf90zv")))) (build-system glib-or-gtk-build-system) (propagated-inputs `(("dconf" ,dconf))) -- cgit 1.4.1 From 9d086c075d512188879b0b5535f11500376851bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 13:52:06 +0200 Subject: gnu: gjs: Update to 1.48.6. * gnu/packages/gnome.scm (gjs): Update to 1.48.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c313a5cb94..a19ccad7aa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4469,7 +4469,7 @@ configuration program to choose applications starting on login.") (define-public gjs (package (name "gjs") - (version "1.48.3") + (version "1.48.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4477,7 +4477,7 @@ configuration program to choose applications starting on login.") name "-" version ".tar.xz")) (sha256 (base32 - "0cqgv460wfhwkw6j1h46v6bg29bycg6dfl7c5rv0lfcqmmw7v6v6")))) + "04nkig077r7xq55dxg9v46w8i7p8zkkdyja92yv81grq9fx6apz8")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit 1.4.1 From 32d00d78dc3604a5e6041ebc45ac4a062a5ad7b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 13:50:55 +0200 Subject: gnu: libgnome-games-support: Update to 1.2.2. * gnu/packages/gnome.scm (libgnome-games-support): Update to 1.2.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a19ccad7aa..2b42c1da59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3375,7 +3375,7 @@ GNOME Games, but it may be used by others.") (package (inherit libgames-support) (name "libgnome-games-support") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3383,7 +3383,7 @@ GNOME Games, but it may be used by others.") name "-" version ".tar.xz")) (sha256 (base32 - "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6")))))) + "04qbgcgmc01sinhbqdljiny8q868l01nkdawj8wrnqnd1i8czvsg")))))) (define-public gnome-klotski (package -- cgit 1.4.1 From d95d6d931edbf9718b99155adfd8e7aa7324a5ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 13:49:47 +0200 Subject: gnu: gnome-keyring: Update to 3.20.1. * gnu/packages/gnome.scm (gnome-keyring): Update to 3.20.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2b42c1da59..036d6b4ffc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -627,7 +627,7 @@ GNOME Desktop.") (define-public gnome-keyring (package (name "gnome-keyring") - (version "3.20.0") + (version "3.20.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -635,7 +635,7 @@ GNOME Desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "16gcwwcg91ipxjmiyi4c4njvnxixmv1i278p0bilc3lafk6ww5xw")))) + "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;48 of 603 tests fail because /var/lib/dbus/machine-id does -- cgit 1.4.1 From cd5db77151dfc87de952c360d65f05162ad7cbe6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 13:52:39 +0200 Subject: gnu: gnome-control-center: Update to 3.24.3. * gnu/packages/gnome.scm (gnome-control-center): Update to 3.24.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 036d6b4ffc..d8a06775a4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5218,7 +5218,7 @@ devices using the GNOME desktop.") (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.24.2") + (version "3.24.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5226,7 +5226,7 @@ devices using the GNOME desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0awga40jh6gvn335mn6kyl6yg79frap1znrsz3sw2m27yldlnaiq")))) + "18ncjqjj93a39sla2zjr9i6pw59yh87p4jla899lmvi2qajd5923")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases -- cgit 1.4.1 From 1f9c2351d7c8534cc1f9b320dba7c719aecc0789 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 13:56:32 +0200 Subject: gnu: gnome-shell: Update to 3.24.3. * gnu/packages/gnome.scm (gnome-shell): Update to 3.24.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d8a06775a4..f17db8fe13 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5289,7 +5289,7 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "3.24.2") + (version "3.24.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5297,7 +5297,7 @@ properties, screen resolution, and other GNOME parameters.") name "-" version ".tar.xz")) (sha256 (base32 - "1xp2ccmdrvzlczsrcplykwqwx2v4lbmkr0rxyylb06danlw9mivh")))) + "1f20x36ymkp1j667hb7s7byly2gqc4m0anldy3qwp38vm8437caq")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases -- cgit 1.4.1 From 865aacc9fae1a04f14ea2d7066c523192c79f027 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Aug 2017 14:13:50 +0200 Subject: gnu: Remove libgames-support. It was simply the old name (and version) of libgnome-games-support. * gnu/packages/gnome.scm (libgames-support): Remove variable. Move the inherited fields... (libgnome-games-support): ...to here. --- gnu/packages/gnome.scm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f17db8fe13..f143155933 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3335,10 +3335,10 @@ write applications that need to store structured data as well as make complex queries upon that data.") (license license:lgpl2.1+))) -(define-public libgames-support +(define-public libgnome-games-support (package - (name "libgames-support") - (version "1.0.2") + (name "libgnome-games-support") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3346,14 +3346,14 @@ queries upon that data.") name "-" version ".tar.xz")) (sha256 (base32 - "0rms2ksiv7j9944km7r87q22nh05si1fisn5xm3z4zy5vpcfi5mh")))) + "04qbgcgmc01sinhbqdljiny8q868l01nkdawj8wrnqnd1i8czvsg")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ - ;; tests require a writable HOME. + ;; Tests require a writable HOME. (setenv "HOME" (getcwd)) #t))))) (native-inputs @@ -3361,30 +3361,16 @@ queries upon that data.") ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs - ;; Required by libgames-support-1.0.pc + ;; Required by libgnome-games-support-1.0.pc `(("gtk+" ,gtk+) ("libgee" ,libgee))) (home-page "https://www.gnome.org/") (synopsis "Useful functionality shared among GNOME games") (description - "libgames-support is a small library intended for internal use by + "libgnome-games-support is a small library intended for internal use by GNOME Games, but it may be used by others.") (license license:lgpl3+))) -(define-public libgnome-games-support - (package - (inherit libgames-support) - (name "libgnome-games-support") - (version "1.2.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "04qbgcgmc01sinhbqdljiny8q868l01nkdawj8wrnqnd1i8czvsg")))))) - (define-public gnome-klotski (package (name "gnome-klotski") -- cgit 1.4.1 From 63ad9b80c76f08dbb39dceff5e8702ade3afd628 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 20 Aug 2017 11:07:53 +0200 Subject: gnu: gnome: Propagate more packages. * gnu/packages/gnome.scm (gnome): Add additional dependencies, inspired by Debian's "gnome-core" package. --- gnu/packages/gnome.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f143155933..e0e5df361c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015, 2016 Sou Bunnbu ;;; Copyright © 2015 Mathieu Lirzin -;;; Copyright © 2015 Andy Wingo +;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Mark H Weaver @@ -5687,13 +5687,19 @@ software that do not provide their own configuration interface.") ("gedit" ,gedit) ("glib-networking" ,glib-networking) ("gnome-backgrounds" ,gnome-backgrounds) + ("gnome-bluetooth" ,gnome-bluetooth) + ("gnome-calculator" ,gnome-calculator) ("gnome-control-center" ,gnome-control-center) + ("gnome-disk-utility" ,gnome-disk-utility) ("gnome-keyring" ,gnome-keyring) + ("gnome-online-accounts" ,gnome-online-accounts) ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("gnome-shell" ,gnome-shell) + ("gnome-system-monitor" ,gnome-system-monitor) ("gnome-terminal" ,gnome-terminal) ("gnome-themes-standard" ,gnome-themes-standard) + ("gucharmap" ,gucharmap) ("gvfs" ,gvfs) ("hicolor-icon-theme" ,hicolor-icon-theme) ("nautilus" ,nautilus) -- cgit 1.4.1 From a9dbefdc9d8f52cf6a1965796d1d883a7c9689bd Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 20 Aug 2017 13:08:23 +0200 Subject: gnu: gnome: Propagate font-dejavu. * gnu/packages/gnome.scm (gnome): Add font-dejavu to propagated inputs, to provide a better default for "Monospace". Otherwise the terminal looks horrible and defaults to Nimbus Mono, a Courier-like face. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e0e5df361c..6aa2e6adf2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5676,6 +5676,7 @@ software that do not provide their own configuration interface.") `(("adwaita-icon-theme" ,adwaita-icon-theme) ("baobab" ,baobab) ("font-cantarell" ,font-cantarell) + ("font-dejavu" ,font-dejavu) ("at-spi2-core" ,at-spi2-core) ("dbus" ,dbus) ("dconf" ,dconf) -- cgit 1.4.1 From 96d36f385cb1de83f95dd0404dc2166d6f877389 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 20 Aug 2017 13:09:21 +0200 Subject: gnu: Add gnome-default-applications. * gnu/packages/gnome.scm (gnome-default-applications): New public variable. (gnome): Propagate gnome-default-applications so that nautilus is associated with folders, not baobab. --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6aa2e6adf2..1712ca0013 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5663,6 +5663,37 @@ configuration system for GNOME. It allows users to configure desktop software that do not provide their own configuration interface.") (license license:lgpl2.1+))) +(define-public gnome-default-applications + (package + (name "gnome-default-applications") + (version "0") + (build-system trivial-build-system) + (source #f) + (propagated-inputs + `(("nautilus" ,nautilus))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (apps (string-append out "/share/applications"))) + (mkdir-p apps) + (call-with-output-file (string-append apps "/defaults.list") + (lambda (port) + (format port "[Default Applications]\n") + (format port "inode/directory=org.gnome.Nautilus.desktop\n"))) + #t)))) + (synopsis "Default MIME type associations for the GNOME desktop") + (description + "Given many installed packages which might handle a given MIME type, a +user running the GNOME desktop probably has some preferences: for example, +that folders be opened by default by the Nautilus file manager, not the Baobab +disk usage analyzer. This package establishes that set of default MIME type +associations for GNOME.") + (license license:gpl3+) + (home-page #f))) + (define-public gnome (package (name "gnome") @@ -5692,6 +5723,7 @@ software that do not provide their own configuration interface.") ("gnome-calculator" ,gnome-calculator) ("gnome-control-center" ,gnome-control-center) ("gnome-disk-utility" ,gnome-disk-utility) + ("gnome-default-applications" ,gnome-default-applications) ("gnome-keyring" ,gnome-keyring) ("gnome-online-accounts" ,gnome-online-accounts) ("gnome-session" ,gnome-session) -- cgit 1.4.1