[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calendar/files/, gnome-extra/gnome-calendar/

[Mart Raudsepp]

commit:     b5b6d9c8a928a6c2fa64c6fbbe788739f6beb3f2
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 05:16:43 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 02:01:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b6d9c8

gnome-extra/gnome-calendar: bump to 3.24.3 plus a week grid fixes patch from stable branch

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 gnome-extra/gnome-calendar/Manifest                |   1 +
 .../files/3.24.3-week-grid-fixes.patch             | 112 +++++++++++++++++++++
 .../gnome-calendar/gnome-calendar-3.24.3.ebuild    |  41 ++++++++
 3 files changed, 154 insertions(+)

diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index d2a04364169..8669eda22d5 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-calendar-3.22.5.tar.xz 2376792 SHA256 5c933189b842f1e836bb366f2fb9e5323961440bcc16b62dc9ac6f6eb4f5314d SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335 WHIRLPOOL 186efae0a9059b0fa3b4728bd5026f02ac39ccf74120bb9dc1e7d174513e19ceb6e0289204af440ca74b48b3f0a156a1a4d762f80e45e096205fb75b3c920202
 DIST gnome-calendar-3.24.0.tar.xz 2400324 SHA256 8a21f51e10ce491e4a492e21c47de29a9ba1b568f4e2fd6f4e33616609d413d0 SHA512 4ed4198557e148da841554b77263e0fa44de31093ca641ae5a3f521787fe2712ab4dc0409d6459da83e105688d97e4c0e097ea2471ab21698b2bc08ab60f686e WHIRLPOOL df5a5320a08535561aecfe64bc39308bc8f54405debf65ec794db55f75d8ef02b19bed05c94cb47803592a278e16104582198ee06dac59c6fe88666583b1aec5
+DIST gnome-calendar-3.24.3.tar.xz 2425292 SHA256 3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67 WHIRLPOOL 8a807675061ecfef862d535460845fd9feae86744f18667cf54ce4721f53ed100677a66ab9bb1a8f118ab9f41504e7a3c444e65c8d88652fe96e2b954bf6110c

diff --git a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
new file mode 100644
index 00000000000..e382029ceeb
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
@@ -0,0 +1,112 @@
+From 9f4bc90761bb9eb3b3e8bdc9ec6b42f44f02053e Mon Sep 17 00:00:00 2001
+From: Abdullahi Usman
+Date: Mon, 10 Jul 2017 11:43:36 +0100
+Subject: week-grid : seperate week's events overlaps.
+
+The week view can display mutilple events that can partly or fully span
+same time ranges.
+
+But week view fails to make correct assumption about the width of events when
+two or more events span some time ranges in which these events also span some
+time ranges with other events, and whereby the number of these other events
+that they span time ranges with does not coincide with the number of the events
+that the other event also span.  Week view ended up calculating cells that
+appears horizontally jointed up.  Also int16_compare() does not dereference the
+pointer from g_ptr_array_sort() correctly and that makes it sort events
+incorrectly and hence making events appears vertically jointed up.
+
+If an event have other events in which they span some time, we calcuate its width
+by taking into consideration of all the events that the other event may span
+time with.  The event that has the higher number of time spans is considered.
+We also save and retrieve our positions using UINT_TO_POINTER and POINTER_TO_UINT()
+respectively, and then dereference the pointer from g_ptr_array_sort() correctly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777416
+---
+ src/views/gcal-week-grid.c | 41 +++++++++++++++++++++++++++++++++++------
+ 1 file changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
+index 20ddb48..ab125b0 100644
+--- a/src/views/gcal-week-grid.c
++++ b/src/views/gcal-week-grid.c
+@@ -184,10 +184,10 @@ get_event_range (GcalWeekGrid *self,
+ }
+ 
+ static inline gint
+-int16_compare (gconstpointer a,
+-               gconstpointer b)
++uint16_compare (gconstpointer a,
++                gconstpointer b)
+ {
+-  return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
++  return GPOINTER_TO_UINT (*(gint*)a) - GPOINTER_TO_UINT (*(gint*)b);
+ }
+ 
+ static inline guint
+@@ -204,7 +204,7 @@ get_event_index (GcalRangeTree *tree,
+   if (!array)
+     return 0;
+ 
+-  g_ptr_array_sort (array, int16_compare);
++  g_ptr_array_sort (array, uint16_compare);
+ 
+   for (i = 0; array && i < array->len; i++)
+     {
+@@ -235,6 +235,35 @@ count_overlaps_at_range (GcalRangeTree *self,
+ 
+       n_events = gcal_range_tree_count_entries_at_range (self, i, i + 1);
+ 
++      if (n_events == 0)
++        break;
++
++      counter = MAX (counter, n_events);
++    }
++
++  return counter;
++}
++
++static guint
++count_overlaps_of_event (GcalRangeTree *self,
++                         guint16        day_start,
++                         guint16        day_end,
++                         guint16        event_start,
++                         guint16        event_end)
++{
++  guint64 i, counter;
++
++  counter = count_overlaps_at_range (self, event_start, day_end);
++
++  for (i = event_start; i > day_start; i--)
++    {
++      guint n_events;
++
++      n_events = gcal_range_tree_count_entries_at_range (self, i - 1, i);
++
++      if (n_events == 0)
++        break;
++
+       counter = MAX (counter, n_events);
+     }
+ 
+@@ -652,7 +681,7 @@ gcal_week_grid_size_allocate (GtkWidget     *widget,
+           context = gtk_widget_get_style_context (event_widget);
+ 
+           /* The total number of events available in this range */
+-          events_at_range = count_overlaps_at_range (self->events, data->start, data->end);
++          events_at_range = count_overlaps_of_event (self->events, day_start, day_end, data->start, data->end);
+ 
+           /* The real horizontal position of this event */
+           widget_index = get_event_index (overlaps, data->start, data->end);
+@@ -689,7 +718,7 @@ gcal_week_grid_size_allocate (GtkWidget     *widget,
+           gcal_range_tree_add_range (overlaps,
+                                      data->start,
+                                      data->end,
+-                                     GINT_TO_POINTER (widget_index));
++                                     GUINT_TO_POINTER (widget_index));
+         }
+ 
+       g_clear_pointer (&widgets_data, g_ptr_array_unref);
+-- 
+cgit v0.12
+

diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
new file mode 100644
index 00000000000..75c1537a99c
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.21.6:3
+	>=gnome-extra/evolution-data-server-3.17.1:=
+	>=dev-libs/libical-1.0.1:0=
+	net-libs/libsoup:2.4
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
+)
+
+src_configure() {
+	# Explicit --enable-debug=minimum forces no -O and -g touching in development (odd minor) versions
+	gnome2_src_configure \
+		--enable-debug=minimum
+}