From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Yamashita Subject: Re: [PATCH] gnu: Add orage. Date: Wed, 11 May 2016 11:34:52 -0400 Message-ID: <20160511113452.27bc3704@openmailbox.org> References: <20160510010952.075f9416@openmailbox.org> <87a8jwrjwv.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/rDn_Y2Q_OxTpHD3Zsv4D/WW"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0WAd-0001Sr-1Y for guix-devel@gnu.org; Wed, 11 May 2016 11:35:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0WAV-0001wE-8K for guix-devel@gnu.org; Wed, 11 May 2016 11:35:29 -0400 Received: from mail2.openmailbox.org ([62.4.1.33]:36991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0WAU-0001sr-F6 for guix-devel@gnu.org; Wed, 11 May 2016 11:35:23 -0400 In-Reply-To: <87a8jwrjwv.fsf@elephly.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ricardo Wurmus Cc: guix-devel@gnu.org --Sig_/rDn_Y2Q_OxTpHD3Zsv4D/WW Content-Type: multipart/mixed; boundary="MP_/Qv/5ja3S86dNGPstoi4xmru" --MP_/Qv/5ja3S86dNGPstoi4xmru Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Wed, 11 May 2016 12:03:28 +0200 Ricardo Wurmus wrote: > Kei Yamashita writes: >=20 > > Orage also works with the libical patch. =20 >=20 > > From 207b943d41f9f1de5e553e46b57210b0f76321a6 Mon Sep 17 00:00:00 > > 2001 From: Kei Yamashita > > Date: Tue, 10 May 2016 01:04:01 -0400 > > Subject: [PATCH] gnu: Add orage. =20 >=20 > > * gnu/packages/xfce.scm (orage): New variable. > > --- > > gnu/packages/xfce.scm | 38 +++++++++++++++++++++++++++++++++++++- > > 1 file changed, 37 insertions(+), 1 deletion(-) =20 >=20 > > 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)) =20 > =20 > > (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+))) =20 >=20 > The patch adding =E2=80=9Corage=E2=80=9D should not include the above cha= nges to the > xfce4-taskmanager. >=20 > > + > > +(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 =20 >=20 > This looks good to me. Thanks! >=20 > ~~ Ricardo >=20 Here's an updated patch. --MP_/Qv/5ja3S86dNGPstoi4xmru Content-Type: text/plain Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-Add-orage.patch RnJvbSA2ODk2MDIyMWM3MGNkNDIxNjVjMmE0YTQyYTFiZjc4ZTkzZDkyMDM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogS2VpIFlhbWFzaGl0YSA8a2VpQG9wZW5tYWlsYm94Lm9yZz4N CkRhdGU6IFdlZCwgMTEgTWF5IDIwMTYgMTE6MzE6MTQgLTA0MDANClN1YmplY3Q6IFtQQVRDSF0g Z251OiBBZGQgb3JhZ2UuDQoNCiogZ251L3BhY2thZ2VzL3hmY2Uuc2NtIChvcmFnZSkgOiBOZXcg dmFyaWFibGUuDQotLS0NCiBnbnUvcGFja2FnZXMveGZjZS5zY20gfCAzNCArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrDQogMSBmaWxlIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKykN Cg0KZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy94ZmNlLnNjbSBiL2dudS9wYWNrYWdlcy94ZmNl LnNjbQ0KaW5kZXggYzE2NGM2Ni4uMGE3OTEwYyAxMDA2NDQNCi0tLSBhL2dudS9wYWNrYWdlcy94 ZmNlLnNjbQ0KKysrIGIvZ251L3BhY2thZ2VzL3hmY2Uuc2NtDQpAQCAtMjgsNiArMjgsNyBAQA0K ICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBnbnUpDQogICAjOnVzZS1tb2R1bGUg KGd1aXggYnVpbGQtc3lzdGVtIHRyaXZpYWwpDQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cykNCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNhbGVuZGFyKQ0KICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgcGtnLWNvbmZpZykNCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGdsaWIpDQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBndGspDQpAQCAtNDMsNiAr NDQsNyBAQA0KICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbGludXgpDQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBwaG90bykNCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2Vz IHBjcmUpDQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwb3B0KQ0KICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgcHVsc2VhdWRpbykpDQogDQogKGRlZmluZS1wdWJsaWMgZ3RrLXhm Y2UtZW5naW5lDQpAQCAtODE1LDMgKzgxNywzNSBAQCB0aGUgZGVza3RvcCB3YWxscGFwZXIuIikN CiAgICAgICJUaGlzIGlzIGEgdGFzayBtYW5hZ2VyIGZvciB0aGUgWGZjZSBkZXNrdG9wLiAgSXQg ZGlzcGxheXMgdGhlIENQVSBhbmQNCiBtZW1vcnkgdXNhZ2UgZ3JhcGhpY2FsbHksIGFuZCBpdCBj YW4gZGlzcGxheSBwcm9jZXNzZXMgYXMgYSB0cmVlLiIpDQogICAgIChsaWNlbnNlIGdwbDIrKSkp DQorDQorKGRlZmluZS1wdWJsaWMgb3JhZ2UNCisgIChwYWNrYWdlDQorICAgIChuYW1lICJvcmFn ZSIpDQorICAgICh2ZXJzaW9uICI0LjEyLjEiKQ0KKyAgICAoc291cmNlIChvcmlnaW4NCisgICAg ICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQ0KKyAgICAgICAgICAgICAgKHVyaSAoc3RyaW5n LWFwcGVuZCAiaHR0cDovL2FyY2hpdmUueGZjZS5vcmcvc3JjL2FwcHMvIg0KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBuYW1lICIvIiAodmVyc2lvbi1tYWpvcittaW5vciB2ZXJz aW9uKSAiLyINCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmFtZSAiLSIgdmVy c2lvbiAiLnRhci5iejIiKSkNCisgICAgICAgICAgICAgIChzaGEyNTYNCisgICAgICAgICAgICAg ICAoYmFzZTMyDQorICAgICAgICAgICAgICAgICIwcWxodm5sMm0zM3ZmeHFsYmtpYzJubWZwd3lk NG1xMjMwanpoczQ4Y2c3ODM5MmFteTl3IikpKSkNCisgICAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVp bGQtc3lzdGVtKQ0KKyAgICAobmF0aXZlLWlucHV0cw0KKyAgICAgYCgoImludGx0b29sIiAsaW50 bHRvb2wpDQorICAgICAgICgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpKSkNCisgICAgKGlucHV0 cw0KKyAgICAgYCgoImd0aysiICxndGsrLTIpDQorICAgICAgICgibGliaWNhbCIgLGxpYmljYWwp DQorICAgICAgICgibGlibm90aWZ5IiAsbGlibm90aWZ5KQ0KKyAgICAgICAoInBvcHQiICxwb3B0 KQ0KKyAgICAgICAoInhmY2U0LXBhbmVsIiAseGZjZTQtcGFuZWwpKSkNCisgICAgKGhvbWUtcGFn ZSAiaHR0cDovL3d3dy54ZmNlLm9yZy9wcm9qZWN0cy8iKQ0KKyAgICAoc3lub3BzaXMgIlNpbXBs ZSBjYWxlbmRhciBhcHBsaWNhdGlvbiB3aXRoIHJlbWluZGVycyIpDQorICAgIChkZXNjcmlwdGlv bg0KKyAgICAgIlRoaXMgaXMgYSBzaW1wbGUgY2FsZW5kYXIgYXBwbGljYXRpb24gZm9yIHRoZSBY ZmNlIGRlc2t0b3AuICBPcmFnZSBoYXMNCithbGFybXMgYW5kIHVzZXMgdGhlIGlDYWxlbmRhciBm b3JtYXQsIG1ha2luZyBpdCBjb21wYXRpYmxlIHdpdGggbWFueSBvdGhlcg0KK2NhbGVuZGFyIGFw cGxpY2F0aW9ucy4gIEl0IGFsc28gaW5jbHVkZXMgYSBwYW5lbCBjbG9jayBwbHVnaW4gYW5kIGFu DQoraW50ZXJuYXRpb25hbCBjbG9jayBhcHBsaWNhdGlvbiBjYXBhYmxlIG9mIHNpbXVsdGFuZW91 c2x5IHNob3dpbmcgY2xvY2tzIGZyb20NCitzZXZlcmFsIGRpZmZlcmVudCB0aW1lIHpvbmVzLiIp DQorICAgIChsaWNlbnNlIGdwbDIrKSkpDQotLSANCjIuNy40DQoNCg== --MP_/Qv/5ja3S86dNGPstoi4xmru-- --Sig_/rDn_Y2Q_OxTpHD3Zsv4D/WW Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXM1EcAAoJEGS2gC359kOTySMH/1YAbRsdKFj6utmMRHsZ/Yi+ aCZXbHwcppeHDXtkB/QxOPq8/zVQ0A4ZMG+GEzZ3xgPPiXrI64TaSY2ITMBaeL83 EOVYRIV+kF+bBTODi+5vcxAJT6D0Pk1Zetub9QRiQXRSGyd8CUMpxPI8L71WQz3O SeoUxoz93ecfJtdEAHLKGDksj1M1WBdxKm44vQ2Htkr7uXtbao0ZPhW6MEMKbfdr 0gbDT9Err1/bANy8v3WvcM6jOKRj6C2lbZl3UC6ID0g/aSidhMoay/iR4JHFN/bp f5zQaN//6KU6O8x7aujjaGBl6c8ofkFDsDen1nXjMpEmidRUCyphlw850hKT0sA= =kBur -----END PGP SIGNATURE----- --Sig_/rDn_Y2Q_OxTpHD3Zsv4D/WW--