r43919 - in /desktop/unstable/gnome-shell/debian: changelog patches/50-compute-weeknumber-with-gdatetime.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Wed Nov 26 11:05:29 2014
New Revision: 43919

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43919
Log:
Add 50-compute-weeknumber-with-gdatetime.patch: Fix miscalculation of
week number in the calendar (closes: #769118).

Added:
    desktop/unstable/gnome-shell/debian/patches/50-compute-weeknumber-with-gdatetime.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=43919&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Wed Nov 26 11:05:29 2014
@@ -1,12 +1,17 @@
-gnome-shell (3.14.1-2) UNRELEASED; urgency=medium
-
+gnome-shell (3.14.1-2) unstable; urgency=medium
+
+  [ Laurent Bigonville ]
   * debian/gnome-shell.gsettings-override: nautilus.desktop has been renamed
     to org.gnome.Nautilus.desktop
   * debian/gnome-shell.gsettings-override: Replace epiphany by iceweasel, the
     gnome metapackage is depending against iceweasel and we want new users to
     have a webbrowser.
 
- -- Laurent Bigonville <bigon at debian.org>  Fri, 07 Nov 2014 10:29:40 +0100
+  [ Jordi Mallach ]
+  * Add 50-compute-weeknumber-with-gdatetime.patch: Fix miscalculation of
+    week number in the calendar (closes: #769118).
+
+ -- Jordi Mallach <jordi at debian.org>  Wed, 26 Nov 2014 02:17:03 +0100
 
 gnome-shell (3.14.1-1) unstable; urgency=medium
 

Added: desktop/unstable/gnome-shell/debian/patches/50-compute-weeknumber-with-gdatetime.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/50-compute-weeknumber-with-gdatetime.patch?rev=43919&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/50-compute-weeknumber-with-gdatetime.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/50-compute-weeknumber-with-gdatetime.patch	[utf-8] Wed Nov 26 11:05:29 2014
@@ -0,0 +1,53 @@
+From 29673deac7e1c34127b0ac1484d0e7766ecc9acc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Thu, 13 Nov 2014 15:14:56 +0000
+Subject: [PATCH] calendar: Stop computing week number ourselves
+
+Correctly computing the ISO week number is tricky and we already
+have code in the platform to do it, so just refer its computation
+to GDateTime rather than doing it ourselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=736722
+---
+ js/ui/calendar.js | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/js/ui/calendar.js b/js/ui/calendar.js
+index bc51d20..6edf69f 100644
+--- a/js/ui/calendar.js
++++ b/js/ui/calendar.js
+@@ -88,23 +88,6 @@ function _formatEventTime(event, clockFormat, periodBegin, periodEnd) {
+     return ret;
+ }
+ 
+-function _getCalendarWeekForDate(date) {
+-    // Based on the algorithms found here:
+-    // http://en.wikipedia.org/wiki/Talk:ISO_week_date
+-    let midnightDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+-    // Need to get Monday to be 1 ... Sunday to be 7
+-    let dayOfWeek = 1 + ((midnightDate.getDay() + 6) % 7);
+-    let nearestThursday = new Date(midnightDate.getFullYear(), midnightDate.getMonth(),
+-                                   midnightDate.getDate() + (4 - dayOfWeek));
+-
+-    let jan1st = new Date(nearestThursday.getFullYear(), 0, 1);
+-    let diffDate = nearestThursday - jan1st;
+-    let dayNumber = Math.floor(Math.abs(diffDate) / MSECS_IN_DAY);
+-    let weekNumber = Math.floor(dayNumber / 7) + 1;
+-
+-    return weekNumber;
+-}
+-
+ function _getCalendarDayAbbreviation(dayNumber) {
+     let abbreviations = [
+         /* Translators: Calendar grid abbreviation for Sunday.
+@@ -672,7 +655,7 @@ const Calendar = new Lang.Class({
+             this._buttons.push(button);
+ 
+             if (this._useWeekdate && iter.getDay() == 4) {
+-                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
++                let label = new St.Label({ text: iter.toLocaleFormat('%V'),
+                                            style_class: 'calendar-day-base calendar-week-number'});
+                 layout.attach(label, rtl ? 7 : 0, row, 1, 1);
+             }
+-- 
+2.1.0

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=43919&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Wed Nov 26 11:05:29 2014
@@ -2,3 +2,4 @@
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch
+50-compute-weeknumber-with-gdatetime.patch