From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEani-0007CB-0H for guix-patches@gnu.org; Fri, 04 May 2018 09:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEane-0003XL-Qv for guix-patches@gnu.org; Fri, 04 May 2018 09:31:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEane-0003X4-Kf for guix-patches@gnu.org; Fri, 04 May 2018 09:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fEane-0003ig-CO for guix-patches@gnu.org; Fri, 04 May 2018 09:31:02 -0400 Subject: bug#31327: [PATCH] gnome: add workrave Resent-To: guix-patches@gnu.org Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180501005811.3cf72280@riseup.net> Date: Fri, 04 May 2018 15:29:58 +0200 In-Reply-To: <20180501005811.3cf72280@riseup.net> (Jovany Leandro G. C.'s message of "Tue, 1 May 2018 00:58:11 -0500") Message-ID: <87in83tup5.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: "Jovany Leandro G.C" Cc: 31327-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Jovany, "Jovany Leandro G.C" skribis: > From 9cf33c43be147546a4e771d1790a919a467ba68f Mon Sep 17 00:00:00 2001 > From: "Jovany Leandro G.C" > Date: Tue, 1 May 2018 00:50:59 -0500 > Subject: [PATCH] gnome: Add workrave > > --- > gnu/packages/gnome.scm | 60 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) I applied your patch with the changes below, mostly to placate =E2=80=98guix lint=E2=80=99 and to follow our conventions: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D4e3fdeb7153c05239= ea5bd38cd8f6389dfae5400 In a nutshell, I used the tag name instead of a commit ID for clarity, and derived =E2=80=98version=E2=80=99 from that. The #:modules and #:impor= ted-modules arguments were unnecessary so I removed them. I also replaced =E2=80=98sys= tem*=E2=80=99 by =E2=80=98invoke=E2=80=99, which is the new way to invoking programs from= Scheme. Please let me know if I introduced mistakes in the process. Thank you! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d8e95ec27..b8beda365 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2017 Mohammed Sadiq ;;; Copyright =C2=A9 2017 Brendan Tildesley ;;; Copyright =C2=A9 2017, 2018 Rutger Helling +;;; Copyright =C2=A9 2018 Jovany Leandro G.C ;;; ;;; This file is part of GNU Guix. ;;; @@ -146,6 +147,7 @@ #:use-module (gnu packages virtualization) #:use-module (gnu packages vpn) #:use-module (gnu packages xorg) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) =20 (define-public brasero @@ -7205,10 +7207,13 @@ mp3, Ogg Vorbis and FLAC") (license license:gpl2+))) =20 (define-public workrave - (let ((commit "2c43758853a862fd125fc1d53faee00a54274078")) + (let ((commit "v1_10_20")) (package (name "workrave") - (version "1.10.20") + (version (string-map (match-lambda + (#\_ #\.) + (chr chr)) + (string-drop commit 1))) (source (origin (method git-fetch) (uri (git-reference @@ -7220,19 +7225,12 @@ mp3, Ogg Vorbis and FLAC") "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941"))= )) (build-system glib-or-gtk-build-system) (arguments - `(#:modules ( - (guix build gnu-build-system) - (guix build python-build-system) - (guix build glib-or-gtk-build-system) - (guix build utils)) - #:imported-modules ( - (guix build python-build-system) - ,@%glib-or-gtk-build-system-modules) - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'autogen (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh") + #t))))) (propagated-inputs `(("glib" ,glib) ("gtk+" ,gtk+) ("gdk-pixbuf" ,gdk-pixbuf) @@ -7242,12 +7240,10 @@ mp3, Ogg Vorbis and FLAC") ("libxtst" ,libxtst) ("dconf" ,dconf) ("libice" ,libice))) - (inputs `( - ("libsm", libsm) + (inputs `(("libsm", libsm) ("python-cheetah" ,python2-cheetah))) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ("python-setuptools-scm" ,python2-setuptools) ("gettext" ,gnu-gettext) ("autoconf" ,autoconf) ("autoconf-archive" , autoconf-archive) @@ -7257,9 +7253,9 @@ mp3, Ogg Vorbis and FLAC") ("libxscrnsaver" ,libxscrnsaver) ("gobject-introspection" ,gobject-introspection) ("python2" ,python-2))) - (synopsis "Tool to help Repetitive Strain Injury (RSI)") + (synopsis "Tool to help prevent repetitive strain injury (RSI)") (description "Workrave is a program that assists in the recovery and - prevention of Repetitive Strain Injury (RSI). The program frequently ale= rts - you to take micro-pauses, rest breaks and restricts you to your daily lim= it") +prevention of repetitive strain injury (RSI). The program frequently aler= ts +you to take micro-pauses, rest breaks and restricts you to your daily limi= t") (home-page "http://www.workrave.org") - (license gpl3+)))) + (license license:gpl3+)))) --=-=-=--