[146908] users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar
devans at macports.org
devans at macports.org
Sun Mar 20 09:56:10 PDT 2016
Revision: 146908
https://trac.macports.org/changeset/146908
Author: devans at macports.org
Date: 2016-03-20 09:56:10 -0700 (Sun, 20 Mar 2016)
Log Message:
-----------
GNOME-3/unstable: gnome-calendar, update to version 3.19.92, revert upstream commit 'year-view: Read show-weekdate from GNOME Shell'.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/Portfile
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/Portfile 2016-03-20 16:20:55 UTC (rev 146907)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/Portfile 2016-03-20 16:56:10 UTC (rev 146908)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-calendar
-version 3.19.91
+version 3.19.92
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 92bc3986e7822b791ae16a6df2e9b0b255ae06a6 \
- sha256 a255d322e2b7d6cb8e493f24d91dc64611ab44bdf9ded10e47f56ed4dcee2637
+checksums rmd160 990d0b29eda5a3ddf1c481a5feb9cd04083d487a \
+ sha256 e87ed339e78a552a739f99df7e27be94ed99bcd2dc2b581d83ef6e8c73a826e3
depends_build port:pkgconfig \
port:intltool \
@@ -40,6 +40,10 @@
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 {
Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff 2016-03-20 16:56:10 UTC (rev 146908)
@@ -0,0 +1,133 @@
+--- 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/20160320/463cdef9/attachment.html>
More information about the macports-changes
mailing list