[152236] users/devans/GNOME-3/stable/dports/gnome/gnome-calendar

[devans at macports.org]

Revision: 152236
          https://trac.macports.org/changeset/152236
Author:   devans at macports.org
Date:     2016-09-01 08:10:05 -0700 (Thu, 01 Sep 2016)
Log Message:
-----------
GNOME-3/stable: gnome-calendar, update to version 3.20.3, prevent crash if GNOME desktop env is not active.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-configure.ac.diff

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/check-for-desktop-env.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile	2016-09-01 14:37:13 UTC (rev 152235)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile	2016-09-01 15:10:05 UTC (rev 152236)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                gnome-calendar
-version             3.20.2
+version             3.20.3
 license             GPL-3+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Calendar is a calendar application for GNOME.
@@ -17,8 +17,8 @@
 
 use_xz              yes
 
-checksums           rmd160  4bdce959d4179c68e206762c064955c699253b12 \
-                    sha256  f132cff56310b83cf086628e949685b04cdaf872e989d67dbb8a3e4e9943deee
+checksums           rmd160  c9170f73e31a98fc86b2dc906fc830abe2fa6a22 \
+                    sha256  8f12f554447d3147817b162d708dfd4a596b8303bfee9fe358ec7091fceec36b
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -38,7 +38,8 @@
                     port:yelp
 
 patchfiles          patch-configure.ac.diff \
-                    patch-src-Makefile.am.diff
+                    patch-src-Makefile.am.diff \
+                    check-for-desktop-env.diff
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 

Added: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/check-for-desktop-env.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/check-for-desktop-env.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/check-for-desktop-env.diff	2016-09-01 15:10:05 UTC (rev 152236)
@@ -0,0 +1,21 @@
+--- src/gcal-year-view.c.orig	2016-08-31 13:26:01.000000000 -0700
++++ src/gcal-year-view.c	2016-09-01 07:51:20.000000000 -0700
+@@ -1501,10 +1501,14 @@
+   self->end_selected_date = g_new0 (icaltimetype, 1);
+   self->end_selected_date->zone = e_cal_util_get_system_timezone ();
+ 
+-  /* bind GNOME Shell' show week numbers property to GNOME Calendar's one */
+-  self->shell_settings = g_settings_new ("org.gnome.shell.calendar");
+-  g_settings_bind (self->shell_settings, "show-weekdate", self, "show-week-numbers", G_SETTINGS_BIND_DEFAULT);
+-  g_signal_connect_swapped (self->shell_settings, "changed::show-weekdate", G_CALLBACK (gtk_widget_queue_draw), self);
++  /* FIXME: this setting should be moved to gsettings-desktop-schemas */
++  if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "GNOME") == 0)
++    {
++      /* bind GNOME Shell' show week numbers property to GNOME Calendar's one */
++      self->shell_settings = g_settings_new ("org.gnome.shell.calendar");
++      g_settings_bind (self->shell_settings, "show-weekdate", self, "show-week-numbers", G_SETTINGS_BIND_DEFAULT);
++      g_signal_connect_swapped (self->shell_settings, "changed::show-weekdate", G_CALLBACK (gtk_widget_queue_allocate), self);
++    }
+ 
+   gtk_list_box_set_header_func (GTK_LIST_BOX (self->events_sidebar), update_sidebar_headers, self, NULL);
+   gtk_list_box_set_sort_func (GTK_LIST_BOX (self->events_sidebar), sidebar_sort_func, NULL, NULL);

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-configure.ac.diff	2016-09-01 14:37:13 UTC (rev 152235)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-configure.ac.diff	2016-09-01 15:10:05 UTC (rev 152236)
@@ -1,6 +1,6 @@
 --- configure.ac.orig	2015-12-22 23:48:36.000000000 -0800
 +++ configure.ac	2015-12-22 23:49:57.000000000 -0800
-@@ -70,7 +70,7 @@
+@@ -84,7 +84,7 @@
   -Wall -Wcast-align -Wuninitialized\
   -Wno-strict-aliasing -Wempty-body -Wformat\
   -Wformat-security -Wformat-nonliteral -Winit-self\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160901/5d89f01f/attachment-0001.html>