[147412] trunk/dports/gnome/gnome-calendar

3 Apr 2016

Revision: 147412
          https://trac.macports.org/changeset/147412
Author:   devans@macports.org
Date:     2016-04-02 23:00:34 -0700 (Sat, 02 Apr 2016)
Log Message:
-----------
gnome-calendar: update to version 3.20.0, revert upstream gnome-shell integration.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-calendar/Portfile
    trunk/dports/gnome/gnome-calendar/files/patch-configure.ac.diff
    trunk/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff

Added Paths:
-----------
    trunk/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff

Property Changed:
----------------
    trunk/dports/gnome/gnome-calendar/


Property changes on: trunk/dports/gnome/gnome-calendar
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gnome-calendar:143837-146759
   + /users/devans/GNOME-3/stable/dports/gnome/gnome-calendar:143837-147317
/users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar:143836-147073

Modified: trunk/dports/gnome/gnome-calendar/Portfile
===================================================================

--- trunk/dports/gnome/gnome-calendar/Portfile	2016-04-03 06:00:04 UTC (rev 147411)
+++ trunk/dports/gnome/gnome-calendar/Portfile	2016-04-03 06:00:34 UTC (rev 147412)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                gnome-calendar
-version             3.18.3
+version             3.20.0
 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  ab2f1b9bfbd3ea3f70ed1411a9c8b9dd6d4f9076 \
-                    sha256  db5b76059725acec18e54b6b8becbbaac2cc6093790ae744d7c93b3afe879575
+checksums           rmd160  f4515b994c7ab5a6131e10ce9cb97f59df1ffa92 \
+                    sha256  a6466cd22d65f4a890a82c4d351c16a51c9471380d5ee2c5601dc56f9121ec60
 
 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=32c5c824e326759af0766...
+patchfiles-append   patch-src-gcal-year-view.c.diff
+
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
 post-patch {

Modified: trunk/dports/gnome/gnome-calendar/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/gnome-calendar/files/patch-configure.ac.diff	2016-04-03 06:00:04 UTC (rev 147411)
+++ trunk/dports/gnome/gnome-calendar/files/patch-configure.ac.diff	2016-04-03 06:00:34 UTC (rev 147412)
@@ -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
-@@ -72,7 +72,7 @@
+@@ -70,7 +70,7 @@
   -Wall -Wcast-align -Wuninitialized\
   -Wno-strict-aliasing -Wempty-body -Wformat\
   -Wformat-security -Wformat-nonliteral -Winit-self\

Modified: trunk/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff	2016-04-03 06:00:04 UTC (rev 147411)
+++ trunk/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff	2016-04-03 06:00:34 UTC (rev 147412)
@@ -1,8 +1,8 @@
---- src/Makefile.am.orig	2015-12-16 16:00:15.000000000 -0800
-+++ src/Makefile.am	2015-12-16 16:02:57.000000000 -0800
-@@ -62,9 +62,6 @@
-     gcal-utils.c                                          \
-     gcal-utils.h
+--- src/Makefile.am.orig	2016-02-16 14:44:39.000000000 -0800
++++ src/Makefile.am	2016-02-19 15:15:54.000000000 -0800
+@@ -66,9 +66,6 @@
+     gcal-year-view.c                                      \
+     gcal-year-view.h
  
 -gnome_calendar_LDFLAGS =                                  \
 -  -Wl,--export-dynamic

Copied: trunk/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff (from rev 147317, users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff)
===================================================================
--- trunk/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-calendar/files/patch-src-gcal-year-view.c.diff	2016-04-03 06:00:34 UTC (rev 147412)
@@ -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);
+ }

    

devans＠macports.org

tags

participants (1)