From 05e9a63d3c9b5774f647012ee2492ebdcc870566 Mon Sep 17 00:00:00 2001 From: Florian Müllner Date: Mar 23 2015 18:46:52 +0000 Subject: Update to 3.14.4 --- diff --git a/.gitignore b/.gitignore index d347f25..c27f4d5 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-3.14.1.5.tar.xz /gnome-shell-3.14.2.tar.xz /gnome-shell-3.14.3.tar.xz +/gnome-shell-3.14.4.tar.xz diff --git a/0001-calendar-Stop-computing-week-number-ourselves.patch b/0001-calendar-Stop-computing-week-number-ourselves.patch deleted file mode 100644 index ce0f15c..0000000 --- a/0001-calendar-Stop-computing-week-number-ourselves.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1e8e5d4671f017926098fdf6bd79310372607713 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -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 127eb2d..4132c00 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. -@@ -669,7 +652,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 - diff --git a/gnome-shell.spec b/gnome-shell.spec index 5b5ee89..5c5a7cb 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell -Version: 3.14.3 -Release: 2%{?dist} +Version: 3.14.4 +Release: 1%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -12,7 +12,6 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.14/%{name}-%{ver # Replace Epiphany with Firefox in the default favourite apps list Patch1: gnome-shell-favourite-apps-firefox.patch -Patch2: 0001-calendar-Stop-computing-week-number-ourselves.patch %define clutter_version 1.15.90 %define gnome_bluetooth_version 1:3.9.0 @@ -119,7 +118,6 @@ easy to use experience. %prep %setup -q %patch1 -p1 -b .firefox -%patch2 -p1 -b .calendar-week-number %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -181,6 +179,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %exclude %{_datadir}/gtk-doc %changelog +* Mon Mar 23 2015 Florian Müllner - 3.14.4-1 +- Update to 3.14.4 + * Fri Mar 13 2015 Dan Williams - 3.14.3-2 - Fix week number calculation in calendar (BGO #736722) diff --git a/sources b/sources index a6d3a93..e420850 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c380179c79f19b21e7947a2e3455e96 gnome-shell-3.14.3.tar.xz +0ad085bc32cd3ff266d1ab69fff04692 gnome-shell-3.14.4.tar.xz