On Wed, 11 May 2016 12:03:28 +0200 Ricardo Wurmus <rek...@elephly.net> wrote:
> Kei Yamashita <k...@openmailbox.org> writes:
>
> > Orage also works with the libical patch.
>
> > From 207b943d41f9f1de5e553e46b57210b0f76321a6 Mon Sep 17 00:00:00
> > 2001 From: Kei Yamashita <k...@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 <k...@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(+)
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+)))
--
2.7.4
pgpp9xs4rg_b9.pgp
Description: OpenPGP digital signature
