[Pkg-xfce-commits] r10219 - in /desktop/trunk/orage/debian: changelog patches/02_libical3.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sat Dec  9 20:32:03 2017
New Revision: 10219

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=10219
Log:
* debian/patches:
  - 02_libical3 added, fix build with libical3.               closes: #883934

Added:
    desktop/trunk/orage/debian/patches/02_libical3.patch
Modified:
    desktop/trunk/orage/debian/changelog
    desktop/trunk/orage/debian/patches/series

Modified: desktop/trunk/orage/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/orage/debian/changelog?rev=10219&op=diff
==============================================================================
--- desktop/trunk/orage/debian/changelog	(original)
+++ desktop/trunk/orage/debian/changelog	Sat Dec  9 20:32:03 2017
@@ -1,3 +1,10 @@
+orage (4.12.1-4) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 02_libical3 added, fix build with libical3.               closes: #883934
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 09 Dec 2017 21:31:30 +0100
+
 orage (4.12.1-3) unstable; urgency=medium
 
   * debian/control:

Added: desktop/trunk/orage/debian/patches/02_libical3.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/orage/debian/patches/02_libical3.patch?rev=10219&op=file
==============================================================================
--- desktop/trunk/orage/debian/patches/02_libical3.patch	(added)
+++ desktop/trunk/orage/debian/patches/02_libical3.patch	Sat Dec  9 20:32:03 2017
@@ -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;
+             }

Modified: desktop/trunk/orage/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/orage/debian/patches/series?rev=10219&op=diff
==============================================================================
--- desktop/trunk/orage/debian/patches/series	(original)
+++ desktop/trunk/orage/debian/patches/series	Sat Dec  9 20:32:03 2017
@@ -1 +1,2 @@
 01_support-filename-desktop.patch
+02_libical3.patch