[147751] users/devans/GNOME-3/stable/dports/gnome/gnome-calendar
devans at macports.org
devans at macports.org
Thu Apr 14 08:02:36 PDT 2016
Revision: 147751
https://trac.macports.org/changeset/147751
Author: devans at macports.org
Date: 2016-04-14 08:02:36 -0700 (Thu, 14 Apr 2016)
Log Message:
-----------
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.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-calendar
-version 3.20.0
+version 3.20.1
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 f4515b994c7ab5a6131e10ce9cb97f59df1ffa92 \
- sha256 a6466cd22d65f4a890a82c4d351c16a51c9471380d5ee2c5601dc56f9121ec60
+checksums rmd160 cbdc016d5139a87a398ce442e537af5d3b669795 \
+ sha256 5182c4d053848f76386bf7748944c34772f3d18b909e42a3226c36e7e49b097c
depends_build port:pkgconfig \
port:intltool \
@@ -40,10 +40,6 @@
patchfiles patch-configure.ac.diff \
patch-src-Makefile.am.diff
-# 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
-
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff
===================================================================
--- 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)
@@ -1,133 +0,0 @@
---- 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);
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160414/97d52c8d/attachment-0001.html>
More information about the macports-changes
mailing list