r54984 - in /desktop/unstable/gnome-calendar/debian: changelog patches/libical3.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Sat Dec  9 19:44:37 2017
New Revision: 54984

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54984
Log:
Cherry-pick libical3.patch to fix build (Closes: #883936)

Added:
    desktop/unstable/gnome-calendar/debian/patches/libical3.patch
Modified:
    desktop/unstable/gnome-calendar/debian/changelog
    desktop/unstable/gnome-calendar/debian/patches/series

Modified: desktop/unstable/gnome-calendar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/changelog?rev=54984&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/changelog	[utf-8] Sat Dec  9 19:44:37 2017
@@ -1,3 +1,9 @@
+gnome-calendar (3.26.2-2) UNRELEASED; urgency=medium
+
+  * Cherry-pick libical3.patch to fix build with libical 3 (Closes: #883936)
+
+ -- Jeremy Bicha <jbicha at debian.org>  Sat, 09 Dec 2017 14:40:19 -0500
+
 gnome-calendar (3.26.2-1) unstable; urgency=medium
 
   * New upstream release

Added: desktop/unstable/gnome-calendar/debian/patches/libical3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/patches/libical3.patch?rev=54984&op=file
==============================================================================
--- desktop/unstable/gnome-calendar/debian/patches/libical3.patch	(added)
+++ desktop/unstable/gnome-calendar/debian/patches/libical3.patch	[utf-8] Sat Dec  9 19:44:37 2017
@@ -0,0 +1,47 @@
+From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001
+From: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
+Date: Wed, 15 Nov 2017 13:09:54 -0800
+Subject: [PATCH] utils: simplify gcal_dup_icaltime
+
+Instead of copying member by member, copy the entire struct contents.
+It works as before, but doesn't depend on the member names.
+
+This fixes compiling gnome-calendar with libical 3.0.0, since the
+struct icaltimetype had one of the members removed (is_utc).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=790072
+---
+ src/gcal-utils.c | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/src/gcal-utils.c b/src/gcal-utils.c
+index c80ba53..4558f54 100644
+--- a/src/gcal-utils.c
++++ b/src/gcal-utils.c
+@@ -199,24 +199,7 @@ datetime_is_date (GDateTime *dt)
+ icaltimetype*
+ gcal_dup_icaltime (const icaltimetype *date)
+ {
+-  icaltimetype *new_date;
+-
+-  if (date == NULL)
+-    return NULL;
+-
+-  new_date= g_new (icaltimetype, 1);
+-  new_date->year = date->year;
+-  new_date->month = date->month;
+-  new_date->day = date->day;
+-  new_date->hour = date->hour;
+-  new_date->minute = date->minute;
+-  new_date->second = date->second;
+-  new_date->is_utc = date->is_utc;
+-  new_date->is_date = date->is_date;
+-  new_date->is_daylight = date->is_daylight;
+-  new_date->zone = date->zone;
+-
+-  return new_date;
++  return g_memdup (date, sizeof (icaltimetype));
+ }
+ 
+ /**
+

Modified: desktop/unstable/gnome-calendar/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/patches/series?rev=54984&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/patches/series	[utf-8] Sat Dec  9 19:44:37 2017
@@ -0,0 +1 @@
+libical3.patch