| 1 |
commit: 12625187c65c810e122282e5aec49748109708c3 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 14:55:10 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 14:56:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12625187 |
| 7 |
|
| 8 |
gnome-extra/gnome-calendar: fix compatibility with dev-libs/libical:0/3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../files/3.24.3-libical3-compat.patch | 49 ++++++++++++++++++++++ |
| 13 |
.../gnome-calendar/gnome-calendar-3.24.3.ebuild | 3 +- |
| 14 |
2 files changed, 51 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..5d0160e9773 |
| 19 |
--- /dev/null |
| 20 |
+++ b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch |
| 21 |
@@ -0,0 +1,49 @@ |
| 22 |
+From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Caio Marcelo de Oliveira Filho <caio.oliveira@×××××.com> |
| 24 |
+Date: Wed, 15 Nov 2017 13:09:54 -0800 |
| 25 |
+Subject: [PATCH] utils: simplify gcal_dup_icaltime |
| 26 |
+ |
| 27 |
+Instead of copying member by member, copy the entire struct contents. |
| 28 |
+It works as before, but doesn't depend on the member names. |
| 29 |
+ |
| 30 |
+This fixes compiling gnome-calendar with libical 3.0.0, since the |
| 31 |
+struct icaltimetype had one of the members removed (is_utc). |
| 32 |
+ |
| 33 |
+https://bugzilla.gnome.org/show_bug.cgi?id=790072 |
| 34 |
+--- |
| 35 |
+ src/gcal-utils.c | 19 +------------------ |
| 36 |
+ 1 file changed, 1 insertion(+), 18 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/src/gcal-utils.c b/src/gcal-utils.c |
| 39 |
+index c80ba53a..4558f540 100644 |
| 40 |
+--- a/src/gcal-utils.c |
| 41 |
++++ b/src/gcal-utils.c |
| 42 |
+@@ -199,24 +199,7 @@ datetime_is_date (GDateTime *dt) |
| 43 |
+ icaltimetype* |
| 44 |
+ gcal_dup_icaltime (const icaltimetype *date) |
| 45 |
+ { |
| 46 |
+- icaltimetype *new_date; |
| 47 |
+- |
| 48 |
+- if (date == NULL) |
| 49 |
+- return NULL; |
| 50 |
+- |
| 51 |
+- new_date= g_new (icaltimetype, 1); |
| 52 |
+- new_date->year = date->year; |
| 53 |
+- new_date->month = date->month; |
| 54 |
+- new_date->day = date->day; |
| 55 |
+- new_date->hour = date->hour; |
| 56 |
+- new_date->minute = date->minute; |
| 57 |
+- new_date->second = date->second; |
| 58 |
+- new_date->is_utc = date->is_utc; |
| 59 |
+- new_date->is_date = date->is_date; |
| 60 |
+- new_date->is_daylight = date->is_daylight; |
| 61 |
+- new_date->zone = date->zone; |
| 62 |
+- |
| 63 |
+- return new_date; |
| 64 |
++ return g_memdup (date, sizeof (icaltimetype)); |
| 65 |
+ } |
| 66 |
+ |
| 67 |
+ /** |
| 68 |
+-- |
| 69 |
+2.15.1 |
| 70 |
+ |
| 71 |
|
| 72 |
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild |
| 73 |
index 75c1537a99c..96803962df4 100644 |
| 74 |
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild |
| 75 |
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild |
| 76 |
@@ -1,4 +1,4 @@ |
| 77 |
-# Copyright 1999-2017 Gentoo Foundation |
| 78 |
+# Copyright 1999-2018 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
EAPI=6 |
| 82 |
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND} |
| 83 |
|
| 84 |
PATCHES=( |
| 85 |
"${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch |
| 86 |
+ "${FILESDIR}"/${PV}-libical3-compat.patch # from master branch, https://bugzilla.gnome.org/show_bug.cgi?id=790072 |
| 87 |
) |
| 88 |
|
| 89 |
src_configure() { |
Archives