[152882] users/devans/GNOME-3/stable/dports/gnome/gnome-calendar
devans at macports.org
devans at macports.org
Mon Sep 19 22:57:15 PDT 2016
Revision: 152882
https://trac.macports.org/changeset/152882
Author: devans at macports.org
Date: 2016-09-19 22:57:15 -0700 (Mon, 19 Sep 2016)
Log Message:
-----------
GNOME-3/stable: gnome-calendar, merge unstable to stable and update to stable version 3.22.0, drop outdated patches.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff
Removed Paths:
-------------
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/patch-configure.ac.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome-calendar:143837-143848
/users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar:143836-147073
+ /trunk/dports/gnome/gnome-calendar:143837-143848
/users/devans/GNOME-3/unstable/dports/gnome/gnome-calendar:143836-147073,150527-152871
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile 2016-09-20 05:45:20 UTC (rev 152881)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/Portfile 2016-09-20 05:57:15 UTC (rev 152882)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-calendar
-version 3.20.4
+version 3.22.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 a6f3bf95cde939a7d651efa81716150a9658629f \
- sha256 eb39488c7087eb597d281f16414fe6439fc8280b618535a66db85e5cfceccc11
+checksums rmd160 cd9219f02f35404e3bf479c5968a89624de7833b \
+ sha256 e10670275df86ff2598261a7f755c02df4ba6be5d14081e906b94bf7bd03299c
depends_build port:pkgconfig \
port:intltool \
@@ -37,9 +37,7 @@
depends_run port:gnome-themes-standard \
port:yelp
-patchfiles patch-configure.ac.diff \
- patch-src-Makefile.am.diff \
- check-for-desktop-env.diff
+patchfiles patch-src-Makefile.am.diff
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
Deleted: 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 2016-09-20 05:45:20 UTC (rev 152881)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/check-for-desktop-env.diff 2016-09-20 05:57:15 UTC (rev 152882)
@@ -1,21 +0,0 @@
---- 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);
Deleted: 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-20 05:45:20 UTC (rev 152881)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-configure.ac.diff 2016-09-20 05:57:15 UTC (rev 152882)
@@ -1,11 +0,0 @@
---- configure.ac.orig 2015-12-22 23:48:36.000000000 -0800
-+++ configure.ac 2015-12-22 23:49:57.000000000 -0800
-@@ -84,7 +84,7 @@
- -Wall -Wcast-align -Wuninitialized\
- -Wno-strict-aliasing -Wempty-body -Wformat\
- -Wformat-security -Wformat-nonliteral -Winit-self\
-- -Wdeclaration-after-statement -Wvla\
-+ -Wdeclaration-after-statement\
- -Wpointer-arith -Wmissing-declarations\
- -Wcast-align -Wmissing-prototypes\
- -Wredundant-decls"
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff 2016-09-20 05:45:20 UTC (rev 152881)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-calendar/files/patch-src-Makefile.am.diff 2016-09-20 05:57:15 UTC (rev 152882)
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -73,9 +73,6 @@
gcal-year-view.c \
gcal-year-view.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160919/4e28713c/attachment.html>
More information about the macports-changes
mailing list