all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: L  p R n  d n <guix@lprndn.info>
To: 37121@debbugs.gnu.org
Subject: [bug#37121] [PATCH 35/40] gnu: orage: Fix build.
Date: Tue, 20 Aug 2019 23:50:38 +0200	[thread overview]
Message-ID: <20190820215043.32077-35-guix@lprndn.info> (raw)
In-Reply-To: <20190820215043.32077-1-guix@lprndn.info>

* 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

  parent reply	other threads:[~2019-08-20 19:51 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-20 21:17 [bug#37121] [PATCH 00/40] Update Xfce to 4.14 L p R n d n
2019-08-20 21:50 ` [bug#37121] [PATCH 01/40] gnu: libxfce4util: Update to 4.14.0 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 02/40] gnu: libxfce4util: Add gobject-introspection support L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 03/40] gnu: xfconf: Update to 4.14.1 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 04/40] gnu: xfconf: Add support for gobject-introspection L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 05/40] gnu: xfconf: Add vala support L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 06/40] gnu: libxfce4ui: Update to 4.14.1 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 07/40] gnu: libxfce4ui: Add gobject-introspection support L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 08/40] gnu: libxfce4ui: Add vendor L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 09/40] gnu: exo: Update to 0.12.8 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 10/40] gnu: garcon: Update to 0.6.4 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 11/40] gnu: tumbler: Update to 0.2.7 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 12/40] gnu: tumbler: Fix pdf thumbnailer L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 13/40] gnu: tumbler: Remove unused gstreamer L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 14/40] gnu: xfce4-panel: Update to 4.14.0 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 15/40] gnu: xfce4-panel: Fix tzdata path L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 16/40] gnu: xfce4-appfinder: Update to 4.14.0 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 17/40] gnu: xfce4-session: " L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 18/40] gnu: xfce4-settings: " L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 19/40] gnu: Thunar: Update to 1.8.9 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 20/40] gnu: Thunar: Add gobject-introspection support L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 21/40] gnu: thunar-volman: Update to 0.9.5 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 22/40] gnu: xfwm4: Update to 4.14.0 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 23/40] gnu: xfdesktop: Update to 4.14.1 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 24/40] gnu: xfce4-power-manager: Update to 1.6.5 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 25/40] gnu: Thunar: Add gvfs support L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 26/40] gnu: mousepad: Update to 0.4.2 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 27/40] gnu: ristretto: Update to 0.10.0 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 28/40] gnu: xfce4-terminal: Update to 0.8.8 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 29/40] gnu: xfce4-whiskermenu-plugin: Update to 2.3.3 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 30/40] gnu: xfce4-battery-plugin: Update tp 1.1.3 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 31/40] gnu: xfce4-pulseaudio-plugin: Update to 0.4.2 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 32/40] gnu: libxklavier: Update to 5.4 L p R n d n
2019-08-28 16:25     ` Ludovic Courtès
2019-08-28 20:33       ` L p R n d n
2019-08-29 12:24         ` Ludovic Courtès
2019-08-20 21:50   ` [bug#37121] [PATCH 33/40] gnu: xfce4-xkb-plugin: Update to 0.8.1 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 34/40] gnu: xfce4-taskmanager: Switch from libwnck-2 to libwnck L p R n d n
2019-08-20 21:50   ` L p R n d n [this message]
2019-08-20 21:50   ` [bug#37121] [PATCH 36/40] gnu: xfce4-notifyd: Update to 0.4.4 L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 37/40] gnu: libxfce4util: Build Vala bindings L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 38/40] gnu: xfconf: Remove unnecessary propagated-inputs L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 39/40] gnu: xfconf: Fix tests L p R n d n
2019-08-20 21:50   ` [bug#37121] [PATCH 40/40] gnu: Add copyright header L p R n d n
2019-08-28 16:31 ` [bug#37121] [PATCH 00/40] Update Xfce to 4.14 Ludovic Courtès
2019-08-28 20:43   ` L p R n d n
2019-08-29 12:21     ` Ludovic Courtès
2019-09-02 13:51       ` L p R n d n
2019-09-01 21:05         ` bug#37121: " Ludovic Courtès
2019-09-02 14:08         ` [bug#37121] " L p R n d n

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190820215043.32077-35-guix@lprndn.info \
    --to=guix@lprndn.info \
    --cc=37121@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.