From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:43042) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0AAK-0006di-9z for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0AAD-0000fo-0o for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:31 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0AA6-0000dU-Gb for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0AA6-0003ZZ-CQ for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:22 -0400 Subject: [bug#37121] [PATCH 35/40] gnu: orage: Fix build. Resent-Message-ID: From: L p R n d n Date: Tue, 20 Aug 2019 23:50:38 +0200 Message-Id: <20190820215043.32077-35-guix@lprndn.info> In-Reply-To: <20190820215043.32077-1-guix@lprndn.info> References: <20190820215043.32077-1-guix@lprndn.info> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 37121@debbugs.gnu.org * gnu/packages/xfce.scm (orage)[source]: Add orage-fix-for-libical3.patch. * gnu/packages/orage-fix-for-libical3.patch: New file. --- .../patches/orage-fix-for-libical3.patch | 59 +++++++++++++++++++ gnu/packages/xfce.scm | 3 +- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/orage-fix-for-libical3.patch diff --git a/gnu/packages/patches/orage-fix-for-libical3.patch b/gnu/packages/patches/orage-fix-for-libical3.patch new file mode 100644 index 0000000000..af962b3675 --- /dev/null +++ b/gnu/packages/patches/orage-fix-for-libical3.patch @@ -0,0 +1,59 @@ +diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c +--- orage-4.12.1/src/ical-code.c.libical-3.0 2017-11-14 08:41:30.917375493 +0100 ++++ orage-4.12.1/src/ical-code.c 2017-11-14 08:41:56.823375135 +0100 +@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr + && (strcmp(g_par.local_timezone, "floating") != 0)) + ctime = icaltime_current_time_with_zone(local_icaltimezone); + else { / * use floating time * / +- ctime.is_utc = 0; + ctime.is_date = 0; + ctime.is_daylight = 0; + ctime.zone = NULL; +@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a + * when counting alarm time. */ + if (rel == ICAL_RELATED_START) { + per.stime.is_date = 0; +- per.stime.is_utc = 1; + per.stime.is_daylight = 0; + per.stime.zone = utc_icaltimezone; + per.stime.hour = 0; +@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a + } + else { + per.etime.is_date = 0; +- per.etime.is_utc = 1; + per.etime.is_daylight = 0; + per.etime.zone = utc_icaltimezone; + per.etime.hour = 0; +@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al + /* HACK: convert to UTC time so that we can use time arithmetic + * when counting alarm time. */ + start_time.is_date = 0; +- start_time.is_utc = 1; + start_time.is_daylight = 0; + start_time.zone = utc_icaltimezone; + start_time.hour = 0; +@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } +@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } +@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 04555a3765..e6272632a9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -985,7 +985,8 @@ memory usage graphically, and it can display processes as a tree.") name "-" version ".tar.bz2")) (sha256 (base32 - "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w")))) + "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w")) + (patches (search-patches "orage-fix-for-libical3.patch")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- 2.22.0