From fb8fe1e8d98f94812b54537649ee3b08fd2d6dae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Sep 2019 02:05:48 +0200 Subject: gnu: glib-networking: Don't use NAME in source URI. * gnu/packages/gnome.scm (glib-networking)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index efe5206e53..9ee652c304 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2629,7 +2629,7 @@ library.") (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "glib-networking-" version ".tar.xz")) (sha256 (base32 "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")) -- cgit 1.4.1 From 0ada4e298762526b9de7fa96429e70c2ba792db6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Sep 2019 01:51:11 +0200 Subject: gnu: libsecret: Don't use NAME in source URI. * gnu/packages/gnome.scm (libsecret)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ee652c304..dbc3ed6793 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2813,7 +2813,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (uri (string-append "mirror://gnome/sources/libsecret/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libsecret-" version ".tar.xz")) (sha256 (base32 "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv")))) -- cgit 1.4.1 From b243d2f7d3f76073dd3631c85b91e7e589a02774 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Sep 2019 01:50:58 +0200 Subject: gnu: libsecret: Update to 0.19.1. * gnu/packages/gnome.scm (libsecret): Update to 0.19.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 dbc3ed6793..a572075ea0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2807,7 +2807,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (define-public libsecret (package (name "libsecret") - (version "0.18.8") + (version "0.19.1") (source (origin (method url-fetch) (uri (string-append @@ -2816,7 +2816,7 @@ and the GLib main loop, to integrate well with GNOME applications.") "libsecret-" version ".tar.xz")) (sha256 (base32 - "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv")))) + "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit 1.4.1 From 36ed9b4678ee9366b4ec40501928ccbb149c6db7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Sep 2019 00:39:35 +0200 Subject: gnu: aisleriot: Update to 3.22.9. * gnu/packages/gnome.scm (aisleriot): Update to 3.22.9. --- 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 a572075ea0..d40919693a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3360,7 +3360,7 @@ playlists in a variety of formats.") (define-public aisleriot (package (name "aisleriot") - (version "3.22.8") + (version "3.22.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/aisleriot/" @@ -3368,7 +3368,7 @@ playlists in a variety of formats.") "aisleriot-" version ".tar.xz")) (sha256 (base32 - "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815")))) + "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit 1.4.1 From 1d68eb321ffee0ca6c450f785cc17a735493df0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Sep 2019 23:50:27 +0200 Subject: gnu: gvfs: Don't use NAME in source URI. * gnu/packages/gnome.scm (gvfs)[source]: Hard-code NAME. --- 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 d40919693a..4d7ed45f77 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4182,9 +4182,9 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (version "1.36.2") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/gvfs/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "gvfs-" version ".tar.xz")) (sha256 (base32 "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4")))) -- cgit 1.4.1 From b5b0fd23548ac06e5c5ce3f890218579605ef024 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Sep 2019 00:08:37 +0200 Subject: gnu: tracker: Don't use NAME in source URI. * gnu/packages/gnome.scm (tracker)[source]: Hard-code NAME. --- 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 4d7ed45f77..f002ff17b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6299,9 +6299,9 @@ easy, safe, and automatic.") (version "2.0.4") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/tracker/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "tracker-" version ".tar.xz")) (sha256 (base32 "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf")))) -- cgit 1.4.1 From c1b79b36524d38b80f7ed7e139a231dbb928833f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Sep 2019 00:11:24 +0200 Subject: gnu: libsoup: Don't use NAME in source URI. * gnu/packages/gnome.scm (libsoup)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f002ff17b7..562f2981e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2701,7 +2701,7 @@ libxml to ease remote use of the RESTful API.") (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libsoup-" version ".tar.xz")) (sha256 (base32 "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx")))) -- cgit 1.4.1 From aa51d92cdb68a825e6d18d0c340f9b9d160866cd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 9 Sep 2019 11:05:57 +0900 Subject: gnu: workrave: Update to version 1.10.34. * gnu/packages/gnome.scm (workrave): Update version and hash strings. [inputs]: Remove python-cheetah. [native-inputs]: Add boost, python-3 and python-jinja2; remove the "bin" output of glib. --- gnu/packages/gnome.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 562f2981e9..60e39bee32 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +66,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) @@ -7992,7 +7994,7 @@ configurable file renaming. ") (define-public workrave (package (name "workrave") - (version "1.10.23") + (version "1.10.34") (source (origin (method git-fetch) @@ -8003,7 +8005,7 @@ configurable file renaming. ") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1qhlwfhwk5agv4904d6bsf83k9k89q7bms6agg967vsca4905vcw")))) + (base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf")))) (build-system glib-or-gtk-build-system) (propagated-inputs `(("glib" ,glib) ("gtk+" ,gtk+) @@ -8014,9 +8016,8 @@ configurable file renaming. ") ("libxtst" ,libxtst) ("dconf" ,dconf) ("libice" ,libice))) - (inputs `(("libsm" ,libsm) - ("python-cheetah" ,python2-cheetah))) - (native-inputs `(("glib" ,glib "bin") + (inputs `(("libsm" ,libsm))) + (native-inputs `(("boost" ,boost) ("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext) ("autoconf" ,autoconf) @@ -8026,7 +8027,8 @@ configurable file renaming. ") ("intltool" ,intltool) ("libxscrnsaver" ,libxscrnsaver) ("gobject-introspection" ,gobject-introspection) - ("python2" ,python-2))) + ("python3" ,python-3) + ("python-jinja2" ,python-jinja2))) (synopsis "Tool to help prevent repetitive strain injury (RSI)") (description "Workrave is a program that assists in the recovery and prevention of -- cgit 1.4.1 From d1c9684753ff3a6adf1bb9ab397a73a5c23010c1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 10 Sep 2019 21:10:03 +0900 Subject: gnu: workrave: Correct the types of inputs used. * gnu/packages/gnome.scm (workrave)[propagated-inputs]: Move them all to... [inputs]: ...here. [native-inputs]: Move libxscrnsaver to the 'inputs' field. --- gnu/packages/gnome.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 60e39bee32..8341bd6802 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8007,16 +8007,17 @@ configurable file renaming. ") (sha256 (base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf")))) (build-system glib-or-gtk-build-system) - (propagated-inputs `(("glib" ,glib) - ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gtkmm" ,gtkmm) - ("glibmm" ,glibmm) - ("libx11" ,libx11) - ("libxtst" ,libxtst) - ("dconf" ,dconf) - ("libice" ,libice))) - (inputs `(("libsm" ,libsm))) + (inputs `(("glib" ,glib) + ("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtkmm" ,gtkmm) + ("glibmm" ,glibmm) + ("libx11" ,libx11) + ("libxtst" ,libxtst) + ("dconf" ,dconf) + ("libice" ,libice) + ("libsm" ,libsm) + ("libxscrnsaver" ,libxscrnsaver))) (native-inputs `(("boost" ,boost) ("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext) @@ -8025,7 +8026,6 @@ configurable file renaming. ") ("automake" ,automake) ("libtool" ,libtool) ("intltool" ,intltool) - ("libxscrnsaver" ,libxscrnsaver) ("gobject-introspection" ,gobject-introspection) ("python3" ,python-3) ("python-jinja2" ,python-jinja2))) -- cgit 1.4.1 From 237d4cf73c0a4b7b25653c01a6003e1db3da1716 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Sep 2019 01:30:13 +0200 Subject: gnu: gfbgraph: Don't use NAME in source URI. * gnu/packages/gnome.scm (gfbgraph)[source]: Hard-code NAME. --- 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 8341bd6802..5dc18b3bb5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7231,9 +7231,9 @@ compiled.") (source (origin (method url-fetch) (uri (string-append - "mirror://gnome/sources/" name "/" + "mirror://gnome/sources/gfbgraph/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "gfbgraph-" version ".tar.xz")) (sha256 (base32 "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs")))) -- cgit 1.4.1 From ad6e168b3f29576d92b00725dedbb38cd5f05e46 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Fri, 6 Sep 2019 06:35:34 -0400 Subject: gnu: evolution: Wrap with required path variables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/gnome.scm (evolution)[arguments]: Add a ‘wrap-program’ phase. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnome.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5dc18b3bb5..f2edf92bd1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -8122,11 +8123,21 @@ generic enough to work for everyone.") (build-system cmake-build-system) (arguments `(#:configure-flags - (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged - "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release - ; in four years and cannot be built. + (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged + "-DENABLE_LIBCRYPTUI=OFF") ; libcryptui hasn't seen a release + ; in four years and cannot be built + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/evolution") + `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))) + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append out "/share/glib-2.0/schemas"))))) + #t))))) (native-inputs - `(("glib" ,glib "bin") ; glib-mkenums + `(("glib" ,glib "bin") ; glib-mkenums ("pkg-config" ,pkg-config) ("intltool" ,intltool) ("itstool" ,itstool))) @@ -8134,6 +8145,7 @@ generic enough to work for everyone.") `(("enchant" ,enchant) ("evolution-data-server" ,evolution-data-server) ; must be the same version ("gcr" ,gcr) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gnome-autoar" ,gnome-autoar) ("gnome-desktop" ,gnome-desktop) ("gtkspell3" ,gtkspell3) -- cgit 1.4.1 From 59487fc29ae4119bdf5d270f29176cbf4b300012 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Sep 2019 23:28:58 +0200 Subject: gnu: libgtop: Don't use NAME in source URI. * gnu/packages/gnome.scm (libgtop)[source]: Hard-code NAME. --- 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 f2edf92bd1..0cac850eb4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5915,9 +5915,9 @@ providing graphical log-ins and managing local and remote displays.") (version "2.38.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/libgtop/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libgtop-" version ".tar.xz")) (sha256 (base32 "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g")))) -- cgit 1.4.1 From 015fc036116d2275a92cccd6e878d625d8903330 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Sep 2019 23:29:08 +0200 Subject: gnu: libgtop: Update to 2.40.0. * gnu/packages/gnome.scm (libgtop): Update to 2.40.0. --- 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 0cac850eb4..31ff2ab972 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5912,7 +5912,7 @@ providing graphical log-ins and managing local and remote displays.") (define-public libgtop (package (name "libgtop") - (version "2.38.0") + (version "2.40.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgtop/" @@ -5920,7 +5920,7 @@ providing graphical log-ins and managing local and remote displays.") "libgtop-" version ".tar.xz")) (sha256 (base32 - "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g")))) + "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit 1.4.1