GNU bug report logs - #31327
[PATCH] gnome: add workrave

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31327 in the body.
You can then email your comments to 31327 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnome: add workrave
Date: Tue, 1 May 2018 00:58:11 -0500

From 9cf33c43be147546a4e771d1790a919a467ba68f Mon Sep 17 00:00:00 2001
From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
Date: Tue, 1 May 2018 00:50:59 -0500
Subject: [PATCH] gnome: Add workrave

---
 gnu/packages/gnome.scm | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0147b20c0..beaf9aa8f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7199,3 +7199,63 @@ into audio files that a personal computer or digital audio player can play.
 It supports ripping to any audio codec supported by a GStreamer plugin, such as
 mp3, Ogg Vorbis and FLAC")
     (license license:gpl2+)))
+
+(define-public workrave
+  (let ((commit "2c43758853a862fd125fc1d53faee00a54274078"))
+    (package
+      (name "workrave")
+      (version "1.10.20")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/rcaelers/workrave.git")
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "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
+         (modify-phases %standard-phases
+           (add-after 'unpack 'autogen
+             (lambda _
+               (zero? (system* "sh" "autogen.sh")))))))
+      (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)
+                ("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)
+                       ("automake" ,automake)
+                       ("libtool" ,libtool)
+                       ("intltool" ,intltool)
+                       ("libxscrnsaver" ,libxscrnsaver)
+                       ("gobject-introspection" ,gobject-introspection)
+                       ("python2" ,python-2)))
+      (synopsis "Tool to help Repetitive Strain Injury (RSI)")
+      (description "Workrave is a program that assists in the recovery and
+ prevention of Repetitive Strain Injury (RSI).  The program frequently alerts
+ you to take micro-pauses, rest breaks and restricts you to your daily limit")
+      (home-page "http://www.workrave.org")
+      (license gpl3+))))
-- 
2.17.0

Message #10 received at 31327-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
Cc: 31327-done <at> debbugs.gnu.org
Subject: Re: [bug#31327] [PATCH] gnome: add workrave
Date: Fri, 04 May 2018 15:29:58 +0200

[Message part 1 (text/plain, inline)]

Hi Jovany,

"Jovany Leandro G.C" <bit4bit <at> riseup.net> skribis:

> From 9cf33c43be147546a4e771d1790a919a467ba68f Mon Sep 17 00:00:00 2001
> From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
> 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 ‘guix
lint’ and to follow our conventions:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?id=4e3fdeb7153c05239ea5bd38cd8f6389dfae5400

In a nutshell, I used the tag name instead of a commit ID for clarity,
and derived ‘version’ from that.  The #:modules and #:imported-modules
arguments were unnecessary so I removed them.  I also replaced ‘system*’
by ‘invoke’, which is the new way to invoking programs from Scheme.

Please let me know if I introduced mistakes in the process.

Thank you!

Ludo’.

[Message part 2 (text/x-patch, inline)]

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 © 2017 Mohammed Sadiq <sadiq <at> sadiqpk.org>
 ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley <at> openmailbox.org>
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling <at> mykolab.com>
+;;; Copyright © 2018 Jovany Leandro G.C <bit4bit <at> riseup.net>
 ;;;
 ;;; 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))
 
 (define-public brasero
@@ -7205,10 +7207,13 @@ mp3, Ogg Vorbis and FLAC")
     (license license:gpl2+)))
 
 (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 alerts
- you to take micro-pauses, rest breaks and restricts you to your daily limit")
+prevention of repetitive strain injury (RSI).  The program frequently alerts
+you to take micro-pauses, rest breaks and restricts you to your daily limit")
       (home-page "http://www.workrave.org")
-      (license gpl3+))))
+      (license license:gpl3+))))

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.