<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[147751] users/devans/GNOME-3/stable/dports/gnome/gnome-calendar</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/147751">147751</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-04-14 08:02:36 -0700 (Thu, 14 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: gnome-calendar, update to version 3.20.1, remove patch concerning crash when gnome shell is not present, issue now fixed upstream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecalendarPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomecalendarfilespatchsrcgcalyearviewcdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomegnomecalendarPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile (147750 => 147751)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile 2016-04-14 14:36:32 UTC (rev 147750)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile 2016-04-14 15:02:36 UTC (rev 147751)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-calendar
</span><del>-version 3.20.0
</del><ins>+version 3.20.1
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Calendar is a calendar application for GNOME.
</span><span class="lines">@@ -17,8 +17,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 f4515b994c7ab5a6131e10ce9cb97f59df1ffa92 \
- sha256 a6466cd22d65f4a890a82c4d351c16a51c9471380d5ee2c5601dc56f9121ec60
</del><ins>+checksums rmd160 cbdc016d5139a87a398ce442e537af5d3b669795 \
+ sha256 5182c4d053848f76386bf7748944c34772f3d18b909e42a3226c36e7e49b097c
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -40,10 +40,6 @@
</span><span class="cx"> patchfiles patch-configure.ac.diff \
</span><span class="cx"> patch-src-Makefile.am.diff
</span><span class="cx">
</span><del>-# revert upstream commit 'year-view: Read show-weekdate from GNOME Shell'
-# https://git.gnome.org/browse/gnome-calendar/commit/?id=32c5c824e326759af0766b011b02f354889a7b6c
-patchfiles-append patch-src-gcal-year-view.c.diff
-
</del><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="cx">
</span><span class="cx"> post-patch {
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomecalendarfilespatchsrcgcalyearviewcdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff (147750 => 147751)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff 2016-04-14 14:36:32 UTC (rev 147750)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff 2016-04-14 15:02:36 UTC (rev 147751)
</span><span class="lines">@@ -1,133 +0,0 @@
</span><del>---- src/gcal-year-view.c.orig 2016-03-20 09:36:28.000000000 -0700
-+++ src/gcal-year-view.c 2016-03-20 09:36:57.000000000 -0700
-@@ -87,10 +87,6 @@
- */
- gboolean use_24h_format;
-
-- /* show week numbers from GNOME Shell settings */
-- GSettings *shell_settings;
-- gboolean show_week_numbers;
--
- /* text direction factors */
- gint k;
-
-@@ -104,7 +100,6 @@
- enum {
- PROP_0,
- PROP_DATE,
-- PROP_SHOW_WEEK_NUMBERS,
- LAST_PROP
- };
-
-@@ -841,27 +836,24 @@
- else
- *weeks_counter = *weeks_counter + 1;
-
-- if (year_view->show_week_numbers)
-- {
-- nr_week = g_strdup_printf ("%d", *weeks_counter);
--
-- pango_layout_set_text (layout, nr_week, -1);
-- pango_layout_get_pixel_size (layout, &layout_width, &layout_height);
-- box_padding_top = (box_side - layout_height) / 2.0 > 0 ? (box_side - layout_height) / 2.0 : 0;
-- box_padding_start = (box_side - layout_width) / 2.0 > 0 ? (box_side - layout_width) / 2.0 : 0;
-+ nr_week = g_strdup_printf ("%d", *weeks_counter);
-
-- gtk_render_background (context, cr,
-- x + sw * box_padding_top + year_view->k * (8 * box_side - layout_height) - WEEK_NUMBER_MARGIN,
-- box_side * (i + 1) + y + box_padding_top - WEEK_NUMBER_MARGIN,
-- layout_height + WEEK_NUMBER_MARGIN * 2, layout_height + WEEK_NUMBER_MARGIN * 2);
-+ pango_layout_set_text (layout, nr_week, -1);
-+ pango_layout_get_pixel_size (layout, &layout_width, &layout_height);
-+ box_padding_top = (box_side - layout_height) / 2.0 > 0 ? (box_side - layout_height) / 2.0 : 0;
-+ box_padding_start = (box_side - layout_width) / 2.0 > 0 ? (box_side - layout_width) / 2.0 : 0;
-
-- gtk_render_layout (context, cr,
-- x + sw * box_padding_start + year_view->k * (8 * box_side - layout_width),
-- box_side * (i + 1) + y + box_padding_top,
-- layout);
-+ gtk_render_background (context, cr,
-+ x + sw * box_padding_top + year_view->k * (8 * box_side - layout_height) - WEEK_NUMBER_MARGIN,
-+ box_side * (i + 1) + y + box_padding_top - WEEK_NUMBER_MARGIN,
-+ layout_height + WEEK_NUMBER_MARGIN * 2, layout_height + WEEK_NUMBER_MARGIN * 2);
-+
-+ gtk_render_layout (context, cr,
-+ x + sw * box_padding_start + year_view->k * (8 * box_side - layout_width),
-+ box_side * (i + 1) + y + box_padding_top,
-+ layout);
-
-- g_free (nr_week);
-- }
-+ g_free (nr_week);
- }
- gtk_style_context_restore (context);
-
-@@ -1099,8 +1091,6 @@
-
- g_clear_pointer (&year_view->date, g_free);
-
-- g_clear_object (&year_view->shell_settings);
--
- G_OBJECT_CLASS (gcal_year_view_parent_class)->finalize (object);
- }
-
-@@ -1118,10 +1108,6 @@
- g_value_set_boxed (value, self->date);
- break;
-
-- case PROP_SHOW_WEEK_NUMBERS:
-- g_value_set_boolean (value, self->show_week_numbers);
-- break;
--
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- }
-@@ -1133,20 +1119,10 @@
- const GValue *value,
- GParamSpec *pspec)
- {
-- GcalYearView *self = GCAL_YEAR_VIEW (object);
--
- switch (prop_id)
- {
- case PROP_DATE:
-- update_date (self, g_value_dup_boxed (value));
-- break;
--
-- case PROP_SHOW_WEEK_NUMBERS:
-- if (self->show_week_numbers != g_value_get_boolean (value))
-- {
-- self->show_week_numbers = g_value_get_boolean (value);
-- g_object_notify (object, "show-week-numbers");
-- }
-+ update_date (GCAL_YEAR_VIEW (object), g_value_dup_boxed (value));
- break;
-
- default:
-@@ -1449,14 +1425,6 @@
-
- g_object_class_override_property (object_class, PROP_DATE, "active-date");
-
-- g_object_class_install_property (object_class,
-- PROP_SHOW_WEEK_NUMBERS,
-- g_param_spec_boolean ("show-week-numbers",
-- "Show Week Numbers",
-- "Show Week Numbers Column",
-- FALSE,
-- G_PARAM_READWRITE));
--
- /* FIXME: it will problably go back to GcalView */
- signals[EVENT_ACTIVATED] = g_signal_new ("event-activated", GCAL_TYPE_YEAR_VIEW, G_SIGNAL_RUN_LAST,
- 0,
-@@ -1501,11 +1469,6 @@
- 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);
--
- 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);
- }
</del></span></pre>
</div>
</div>
</body>
</html>