Patchwork gnu: Add orage.

login
register
mail settings
Submitter Kei Yamashita
Date May 11, 2016, 3:34 p.m.
Message ID <20160511113452.27bc3704@openmailbox.org>
Download mbox | patch
Permalink /patch/12204/
State New
Headers show

Comments

Kei Yamashita - May 11, 2016, 3:34 p.m.
On Wed, 11 May 2016 12:03:28 +0200
Ricardo Wurmus <rekado@elephly.net> wrote:

> Kei Yamashita <kei@openmailbox.org> writes:
> 
> > Orage also works with the libical patch.  
> 
> > From 207b943d41f9f1de5e553e46b57210b0f76321a6 Mon Sep 17 00:00:00
> > 2001 From: Kei Yamashita <kei@openmailbox.org>
> > Date: Tue, 10 May 2016 01:04:01 -0400
> > Subject: [PATCH] gnu: Add orage.  
> 
> > * gnu/packages/xfce.scm (orage): New variable.
> > ---
> >  gnu/packages/xfce.scm | 38 +++++++++++++++++++++++++++++++++++++-
> >  1 file changed, 37 insertions(+), 1 deletion(-)  
> 
> > diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> > index c164c66..c82ceff 100644
> > --- a/gnu/packages/xfce.scm
> > +++ b/gnu/packages/xfce.scm
> > @@ -28,6 +28,7 @@
> >    #:use-module (guix build-system gnu)
> >    #:use-module (guix build-system trivial)
> >    #:use-module (gnu packages)
> > +  #:use-module (gnu packages calendar)
> >    #:use-module (gnu packages pkg-config)
> >    #:use-module (gnu packages glib)
> >    #:use-module (gnu packages gtk)
> > @@ -43,6 +44,7 @@
> >    #:use-module (gnu packages linux)
> >    #:use-module (gnu packages photo)
> >    #:use-module (gnu packages pcre)
> > +  #:use-module (gnu packages popt)
> >    #:use-module (gnu packages pulseaudio))  
>  
> >  (define-public gtk-xfce-engine
> > @@ -803,15 +805,49 @@
> >                 (base32
> >                  "1jwywmkkkmz7406m1jq40w6apiav25cznafhigbgpjv6z5hv27if"))))
> >      (build-system gnu-build-system)
> > +    (arguments
> > +     '(#:configure-flags '("--enable-gtk3")))
> >      (native-inputs
> >       `(("intltool" ,intltool)
> >         ("pkg-config" ,pkg-config)))
> >      (inputs
> >       `(("libwnck" ,libwnck-2)
> > -       ("gtk+" ,gtk+-2)))
> > +       ("gtk+" ,gtk+)))
> >      (home-page
> > "http://goodies.xfce.org/projects/applications/xfce4-taskmanager")
> > (synopsis "Easy to use task manager") (description
> >       "This is a task manager for the Xfce desktop.  It displays
> > the CPU and memory usage graphically, and it can display processes
> > as a tree.") (license gpl2+)))  
> 
> The patch adding “orage” should not include the above changes to the
> xfce4-taskmanager.
> 
> > +
> > +(define-public orage
> > +  (package
> > +    (name "orage")
> > +    (version "4.12.1")
> > +    (source (origin
> > +              (method url-fetch)
> > +              (uri (string-append
> > "http://archive.xfce.org/src/apps/"
> > +                                  name "/" (version-major+minor
> > version) "/"
> > +                                  name "-" version ".tar.bz2"))
> > +              (sha256
> > +               (base32
> > +
> > "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"))))
> > +    (build-system gnu-build-system)
> > +    (native-inputs
> > +     `(("intltool" ,intltool)
> > +       ("pkg-config" ,pkg-config)))
> > +    (inputs
> > +     `(("gtk+" ,gtk+-2)
> > +       ("libical" ,libical)
> > +       ("libnotify" ,libnotify)
> > +       ("popt" ,popt)
> > +       ("xfce4-panel" ,xfce4-panel)))
> > +    (home-page "http://www.xfce.org/projects/")
> > +    (synopsis "Simple calendar application with reminders")
> > +    (description
> > +     "This is a simple calendar application for the Xfce desktop.
> > Orage has +alarms and uses the iCalendar format, making it
> > compatible with many other +calendar applications.  It also
> > includes a panel clock plugin and an +international clock
> > application capable of simultaneously showing clocks from +several
> > different time zones.")
> > +    (license gpl2+)))
> > 2.7.4  
> 
> This looks good to me.  Thanks!
> 
> ~~ Ricardo
> 

Here's an updated patch.
From 68960221c70cd42165c2a4a42a1bf78e93d92035 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>

Date: Wed, 11 May 2016 11:31:14 -0400
Subject: [PATCH] gnu: Add orage.

* gnu/packages/xfce.scm (orage) : New variable.
---
 gnu/packages/xfce.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

-- 
2.7.4
Leo Famulari - May 23, 2016, 2:34 a.m.
On Wed, May 11, 2016 at 11:34:52AM -0400, Kei Yamashita wrote:
> Here's an updated patch.

> From 68960221c70cd42165c2a4a42a1bf78e93d92035 Mon Sep 17 00:00:00 2001
> From: Kei Yamashita <kei@openmailbox.org>
> Date: Wed, 11 May 2016 11:31:14 -0400
> Subject: [PATCH] gnu: Add orage.
> 
> * gnu/packages/xfce.scm (orage) : New variable.

Cool!

It does make sense to put it in xfce.scm, but calendar.scm could also be
appropriate. I leave it up to you.

I don't know what the feature is supposed to do, but I clicked on View >
Show Globaltime, and got only this message in the console:

** (orage:30779): WARNING **: 22:32:24 Orage: start of globaltime
failed: Failed to execute child process "globaltime" (No such file or
directory)
Kei Yamashita - May 23, 2016, 10:07 p.m.
On Sun, 22 May 2016 22:34:07 -0400
Leo Famulari <leo@famulari.name> wrote:

> On Wed, May 11, 2016 at 11:34:52AM -0400, Kei Yamashita wrote:
> > Here's an updated patch.  
> 
> > From 68960221c70cd42165c2a4a42a1bf78e93d92035 Mon Sep 17 00:00:00
> > 2001 From: Kei Yamashita <kei@openmailbox.org>
> > Date: Wed, 11 May 2016 11:31:14 -0400
> > Subject: [PATCH] gnu: Add orage.
> > 
> > * gnu/packages/xfce.scm (orage) : New variable.  
> 
> Cool!
> 
> It does make sense to put it in xfce.scm, but calendar.scm could also
> be appropriate. I leave it up to you.

I prefer xfce.scm, just because it is in the Xfce repos for now.

> I don't know what the feature is supposed to do, but I clicked on
> View > Show Globaltime, and got only this message in the console:
> 
> ** (orage:30779): WARNING **: 22:32:24 Orage: start of globaltime
> failed: Failed to execute child process "globaltime" (No such file or
> directory)

I am not quite sure either, but I can try to find more information on
this "globaltime" program and package it. If it isn't in Xfce repos,
then I can place it in calendar.scm.
Leo Famulari - June 25, 2016, 5:39 p.m.
On Mon, May 23, 2016 at 06:07:28PM -0400, Kei Kebreau wrote:
> On Sun, 22 May 2016 22:34:07 -0400
> Leo Famulari <leo@famulari.name> wrote:
> 
> > On Wed, May 11, 2016 at 11:34:52AM -0400, Kei Yamashita wrote:
> > > Here's an updated patch.  
> > 
> > > From 68960221c70cd42165c2a4a42a1bf78e93d92035 Mon Sep 17 00:00:00
> > > 2001 From: Kei Yamashita <kei@openmailbox.org>
> > > Date: Wed, 11 May 2016 11:31:14 -0400
> > > Subject: [PATCH] gnu: Add orage.
> > > 
> > > * gnu/packages/xfce.scm (orage) : New variable.  
> > 
> > Cool!
> > 
> > It does make sense to put it in xfce.scm, but calendar.scm could also
> > be appropriate. I leave it up to you.
> 
> I prefer xfce.scm, just because it is in the Xfce repos for now.
> 
> > I don't know what the feature is supposed to do, but I clicked on
> > View > Show Globaltime, and got only this message in the console:
> > 
> > ** (orage:30779): WARNING **: 22:32:24 Orage: start of globaltime
> > failed: Failed to execute child process "globaltime" (No such file or
> > directory)
> 
> I am not quite sure either, but I can try to find more information on
> this "globaltime" program and package it. If it isn't in Xfce repos,
> then I can place it in calendar.scm.

If this issue doesn't break the primary use case of Orage, or cause
problems besides the failure of 'View > Globaltime', then this issue
should not block packaging, in my opinion.
Kei Yamashita - June 26, 2016, 7:14 p.m.
Leo Famulari <leo@famulari.name> writes:

> On Mon, May 23, 2016 at 06:07:28PM -0400, Kei Kebreau wrote:
>> On Sun, 22 May 2016 22:34:07 -0400
>> Leo Famulari <leo@famulari.name> wrote:
>> 
>> > On Wed, May 11, 2016 at 11:34:52AM -0400, Kei Yamashita wrote:
>> > > Here's an updated patch.  
>> > 
>> > > From 68960221c70cd42165c2a4a42a1bf78e93d92035 Mon Sep 17 00:00:00
>> > > 2001 From: Kei Yamashita <kei@openmailbox.org>
>> > > Date: Wed, 11 May 2016 11:31:14 -0400
>> > > Subject: [PATCH] gnu: Add orage.
>> > > 
>> > > * gnu/packages/xfce.scm (orage) : New variable.  
>> > 
>> > Cool!
>> > 
>> > It does make sense to put it in xfce.scm, but calendar.scm could also
>> > be appropriate. I leave it up to you.
>> 
>> I prefer xfce.scm, just because it is in the Xfce repos for now.
>> 
>> > I don't know what the feature is supposed to do, but I clicked on
>> > View > Show Globaltime, and got only this message in the console:
>> > 
>> > ** (orage:30779): WARNING **: 22:32:24 Orage: start of globaltime
>> > failed: Failed to execute child process "globaltime" (No such file or
>> > directory)
>> 
>> I am not quite sure either, but I can try to find more information on
>> this "globaltime" program and package it. If it isn't in Xfce repos,
>> then I can place it in calendar.scm.
>
> If this issue doesn't break the primary use case of Orage, or cause
> problems besides the failure of 'View > Globaltime', then this issue
> should not block packaging, in my opinion.

So I can push Orage and figure out the issue with globaltime later?
Leo Famulari - June 27, 2016, 3:46 p.m.
On Sun, Jun 26, 2016 at 03:14:06PM -0400, Kei Kebreau wrote:
> Leo Famulari <leo@famulari.name> writes:
> > If this issue doesn't break the primary use case of Orage, or cause
> > problems besides the failure of 'View > Globaltime', then this issue
> > should not block packaging, in my opinion.
> 
> So I can push Orage and figure out the issue with globaltime later?

I think so, if it meets the conditions above.

Of course it would be best if it worked. I didn't find the globaltime
source but according to [0] it is part of Orage. Maybe it would be
helpful to run Orage with strace and see how it's failing.

[0]
http://linux.die.net/man/1/globaltime
Kei Yamashita - June 27, 2016, 4:45 p.m.
Leo Famulari <leo@famulari.name> writes:

> On Sun, Jun 26, 2016 at 03:14:06PM -0400, Kei Kebreau wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> > If this issue doesn't break the primary use case of Orage, or cause
>> > problems besides the failure of 'View > Globaltime', then this issue
>> > should not block packaging, in my opinion.
>> 
>> So I can push Orage and figure out the issue with globaltime later?
>
> I think so, if it meets the conditions above.
>
> Of course it would be best if it worked. I didn't find the globaltime
> source but according to [0] it is part of Orage. Maybe it would be
> helpful to run Orage with strace and see how it's failing.
>
> [0]
> http://linux.die.net/man/1/globaltime

Interestingly enough, I just built orage on my machine and globaltime
works fine. I'll rebuild it a few more times to make sure that it is
reproducible. If so, it will be pushed later on.

Thank you!

Patch

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm

index c164c66..0a7910c 100644

--- a/gnu/packages/xfce.scm

+++ b/gnu/packages/xfce.scm

@@ -28,6 +28,7 @@ 

   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
+  #:use-module (gnu packages calendar)

   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -43,6 +44,7 @@ 

   #:use-module (gnu packages linux)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages popt)

   #:use-module (gnu packages pulseaudio))
 
 (define-public gtk-xfce-engine
@@ -815,3 +817,35 @@  the desktop wallpaper.")

      "This is a task manager for the Xfce desktop.  It displays the CPU and
 memory usage graphically, and it can display processes as a tree.")
     (license gpl2+)))
+

+(define-public orage

+  (package

+    (name "orage")

+    (version "4.12.1")

+    (source (origin

+              (method url-fetch)

+              (uri (string-append "http://archive.xfce.org/src/apps/"

+                                  name "/" (version-major+minor version) "/"

+                                  name "-" version ".tar.bz2"))

+              (sha256

+               (base32

+                "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"))))

+    (build-system gnu-build-system)

+    (native-inputs

+     `(("intltool" ,intltool)

+       ("pkg-config" ,pkg-config)))

+    (inputs

+     `(("gtk+" ,gtk+-2)

+       ("libical" ,libical)

+       ("libnotify" ,libnotify)

+       ("popt" ,popt)

+       ("xfce4-panel" ,xfce4-panel)))

+    (home-page "http://www.xfce.org/projects/")

+    (synopsis "Simple calendar application with reminders")

+    (description

+     "This is a simple calendar application for the Xfce desktop.  Orage has

+alarms and uses the iCalendar format, making it compatible with many other

+calendar applications.  It also includes a panel clock plugin and an

+international clock application capable of simultaneously showing clocks from

+several different time zones.")

+    (license gpl2+)))