gentoo resync : 08.01.2018

3 files changed, 53 insertions, 2 deletions

diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index fa7215ebe3bd..582ad8502cca 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,6 +1,7 @@
+AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
 AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
 DIST gnome-calendar-3.22.5.tar.xz 2376792 BLAKE2B b36ba91a0c8202bf1419450656b8abd75913a83ecb7780ac73204e0e52dd938069c364fc106860d3ef7ae14bb3545ddab54db9889207d0568e0fb6bb055eeba7 SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
 EBUILD gnome-calendar-3.22.5.ebuild 748 BLAKE2B ef9d8db79696ae99c9cbe392fc0413f595f78debc7cbe1ab467b7d2777ad55539acd3a6b885b2f62e7d5a73f27336c97b86c3ffff05f4548433080db3b8eb0a4 SHA512 70cf17138a1f4d5f14076c9f330228a1f82007bfbaf121b4ccb2a6d36a3b83e257e7e9aa2f5c601e7fd11ddc05399babb5a0ee98d3bc632c08af8fd27e3db266
-EBUILD gnome-calendar-3.24.3.ebuild 1023 BLAKE2B 9a26a57786a1c03f352b5fb663262f0206de11b038c1a5630b6b81ea9107670385076dce45cdf5e4ea6d373366429a865e2e2cc58264d4307f0cbfb6c05c1ae4 SHA512 8fdb17af92906789327928cd170acbe498d2481deeb92067d0bbc21208f7a457b4a1d759ff6c0a7f7677316a6cb8d0e2c9f852e17087f8693cbfc5a7333f5510
+EBUILD gnome-calendar-3.24.3.ebuild 1138 BLAKE2B 00d023159d87cd305b7c16a1bb6cf317786718c9d40d6af6af296e049bea1dc6e04deb669f62e7f2832b91652d515b00930aeae71c6824d49804f9efd5237887 SHA512 0b0eef3890fdecac042c0658e8fd5100637d32860d6b3b4bf471787897e6067529571f444b3ceab309e745d6482894e87e4a735f67f232b7a9800659facd2733
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
new file mode 100644
index 000000000000..5d0160e9773e
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
@@ -0,0 +1,49 @@
+From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001
+From: Caio Marcelo de Oliveira Filho <caio.oliveira@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 c80ba53a..4558f540 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));
+ }
+ 
+ /**
+-- 
+2.15.1
+
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
index 75c1537a99c7..96803962df49 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
+	"${FILESDIR}"/${PV}-libical3-compat.patch # from master branch, https://bugzilla.gnome.org/show_bug.cgi?id=790072
 )
 
 src_configure() {