<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/17174c0c479103c11decae36d57d3c3c8ff3c76e">https://github.com/macports/macports-ports/commit/17174c0c479103c11decae36d57d3c3c8ff3c76e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 17174c0c479103c11decae36d57d3c3c8ff3c76e
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Jul 17 13:00:17 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-calendar: update to version 3.24.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * freshen autogen.sh from upstream git repo
</span><span style='display:block; white-space:pre;color:#404040;'> * apply post-release bugfix
</span>---
gnome/gnome-calendar/Portfile | 13 ++-
gnome/gnome-calendar/files/autogen.sh | 16 ++-
.../patch-separate-weeks-events-overlaps.diff | 111 +++++++++++++++++++++
.../files/patch-src-Makefile.am.diff | 10 +-
4 files changed, 133 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-calendar/Portfile b/gnome/gnome-calendar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9676ac6..9d711da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-calendar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-calendar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name gnome-calendar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.3
</span> license GPL-3+
set branch [join [lrange [split ${version} .] 0 1] .]
description Calendar is a calendar application for GNOME.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +16,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 754287f3436e0faada69cbbebb327a783374cde5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 75f95e9cd1961f943cab077db2c1a39e7125e5fe94ec7cad55e7814fcf2b6737
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3f44e9f196bd7eca0a41bd1aa704c5b5f9bfd395 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +37,8 @@ depends_lib port:desktop-file-utils \
</span> depends_run port:gnome-themes-standard \
port:yelp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-Makefile.am.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-separate-weeks-events-overlaps.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,8 +51,7 @@ post-patch {
</span>
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-compile-warnings=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-maintainer-mode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-maintainer-mode \
</span> --disable-schemas-compile \
--disable-silent-rules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-calendar/files/autogen.sh b/gnome/gnome-calendar/files/autogen.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index f419154..96b5d8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-calendar/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-calendar/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,15 @@
</span> # Run this to generate all the initial makefiles, etc.
set -e
<span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --force --copy --automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf -i -f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cd $srcdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mkdir -p m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf --verbose --force --install || exit $?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+intltoolize --force --copy --automake || exit $?
</span>
if test -z "$NOCONFIGURE"; then
run_configure=true
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +27,5 @@ else
</span> run_configure=false
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if test $run_configure = true; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./configure "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cd "$olddir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-calendar/files/patch-separate-weeks-events-overlaps.diff b/gnome/gnome-calendar/files/patch-separate-weeks-events-overlaps.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..aaa1ffe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-calendar/files/patch-separate-weeks-events-overlaps.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,111 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9f4bc90761bb9eb3b3e8bdc9ec6b42f44f02053e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Abdullahi Usman <abdullahismn7@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 10 Jul 2017 11:43:36 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: week-grid : seperate week's events overlaps.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The week view can display mutilple events that can partly or fully span
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+same time ranges.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+But week view fails to make correct assumption about the width of events when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+two or more events span some time ranges in which these events also span some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+time ranges with other events, and whereby the number of these other events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that they span time ranges with does not coincide with the number of the events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that the other event also span. Week view ended up calculating cells that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+appears horizontally jointed up. Also int16_compare() does not dereference the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pointer from g_ptr_array_sort() correctly and that makes it sort events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+incorrectly and hence making events appears vertically jointed up.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If an event have other events in which they span some time, we calcuate its width
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+by taking into consideration of all the events that the other event may span
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+time with. The event that has the higher number of time spans is considered.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We also save and retrieve our positions using UINT_TO_POINTER and POINTER_TO_UINT()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+respectively, and then dereference the pointer from g_ptr_array_sort() correctly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugzilla.gnome.org/show_bug.cgi?id=777416
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/views/gcal-week-grid.c | 41 +++++++++++++++++++++++++++++++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 35 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 20ddb48..ab125b0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/views/gcal-week-grid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/views/gcal-week-grid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,10 +184,10 @@ get_event_range (GcalWeekGrid *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline gint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int16_compare (gconstpointer a,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gconstpointer b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++uint16_compare (gconstpointer a,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gconstpointer b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return GPOINTER_TO_UINT (*(gint*)a) - GPOINTER_TO_UINT (*(gint*)b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline guint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -204,7 +204,7 @@ get_event_index (GcalRangeTree *tree,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_sort (array, int16_compare);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_ptr_array_sort (array, uint16_compare);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; array && i < array->len; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,6 +235,35 @@ count_overlaps_at_range (GcalRangeTree *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n_events = gcal_range_tree_count_entries_at_range (self, i, i + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (n_events == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ counter = MAX (counter, n_events);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return counter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static guint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++count_overlaps_of_event (GcalRangeTree *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint16 day_start,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint16 day_end,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint16 event_start,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint16 event_end)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint64 i, counter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ counter = count_overlaps_at_range (self, event_start, day_end);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (i = event_start; i > day_start; i--)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint n_events;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ n_events = gcal_range_tree_count_entries_at_range (self, i - 1, i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (n_events == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ counter = MAX (counter, n_events);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -652,7 +681,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context = gtk_widget_get_style_context (event_widget);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The total number of events available in this range */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- events_at_range = count_overlaps_at_range (self->events, data->start, data->end);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ events_at_range = count_overlaps_of_event (self->events, day_start, day_end, data->start, data->end);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The real horizontal position of this event */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ widget_index = get_event_index (overlaps, data->start, data->end);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -689,7 +718,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcal_range_tree_add_range (overlaps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->start,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->end,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GINT_TO_POINTER (widget_index));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GUINT_TO_POINTER (widget_index));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_clear_pointer (&widgets_data, g_ptr_array_unref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-calendar/files/patch-src-Makefile.am.diff b/gnome/gnome-calendar/files/patch-src-Makefile.am.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bc28a3b..cd5d30d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-calendar/files/patch-src-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-calendar/files/patch-src-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am.orig 2016-02-16 14:44:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2016-02-19 15:15:54.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,9 +73,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcal-year-view.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcal-year-view.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am.orig 2017-06-08 19:37:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am 2017-07-17 12:22:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,9 +85,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcal-window.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcal-window.c
</span>
-gnome_calendar_LDFLAGS = \
- -Wl,--export-dynamic
</pre><pre style='margin:0'>
</pre>