diff --git a/gnome-shell-3.14.2.tar.xz b/gnome-shell-3.14.2.tar.xz deleted file mode 100644 index af00a9c..0000000 --- a/gnome-shell-3.14.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4166656cac98da9b2fbd5c315ca1c4f34e06f1f5423ae058831ceb51ea5deda1 -size 1590640 diff --git a/gnome-shell-3.14.3.tar.xz b/gnome-shell-3.14.3.tar.xz new file mode 100644 index 0000000..05fcbb0 --- /dev/null +++ b/gnome-shell-3.14.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb44484efb94af4d90189127136a82b2cc1afed93e24834165ae550b58b539d6 +size 1592136 diff --git a/gnome-shell-fix-week-count.patch b/gnome-shell-fix-week-count.patch new file mode 100644 index 0000000..6500af4 --- /dev/null +++ b/gnome-shell-fix-week-count.patch @@ -0,0 +1,52 @@ +From 29673deac7e1c34127b0ac1484d0e7766ecc9acc 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(-) + +Index: gnome-shell-3.14.2/js/ui/calendar.js +=================================================================== +--- gnome-shell-3.14.2.orig/js/ui/calendar.js ++++ gnome-shell-3.14.2/js/ui/calendar.js +@@ -89,23 +89,6 @@ function _formatEventTime(event, clockFo + 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. +@@ -670,7 +653,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); + } + diff --git a/gnome-shell.changes b/gnome-shell.changes index 40adc0c..f93fa41 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Dec 19 15:12:55 UTC 2014 - zaitor@opensuse.org + +- Update to version 3.14.3: + + Properly remove network connections from list (bgo#740227). + + Fix handling of cancel button on login screen (bgo#740141). + + Fix build when using dash as default shell (bgo#739241). + + Make event list in calendar scrollable (bgo#705115). + + Fix calendar-server crash on DBus timeout (bgo#735308). + + Fix gestures triggering erroneously (bgo#740237). +- Add gnome-shell-fix-week-count.patch: Fix week count in top-bar + calendar; patch taken from upstream git master and edited to + apply cleanly against current version (bgo#736722, boo#910069). + ------------------------------------------------------------------- Wed Nov 12 20:57:42 UTC 2014 - zaitor@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index 83a37bb..fe513b0 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -17,7 +17,7 @@ Name: gnome-shell -Version: 3.14.2 +Version: 3.14.3 Release: 0 Summary: GNOME Shell License: GPL-2.0+ @@ -26,6 +26,8 @@ Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.14/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch +# PATCH-FIX-UPSTREAM gnome-shell-fix-week-count.patch boo#boo#910069 bgo#736722 badshah400@gmail.com -- Fix week count in top-bar calendar; patch taken from upstream git master and edited to apply cleanly against current version +Patch2: gnome-shell-fix-week-count.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ BuildRequires: intltool @@ -143,6 +145,7 @@ to enable, disable and install them. %prep %setup -q %patch1 -p1 +%patch2 -p1 translation-update-upstream %build