From b8d703d0bf378b919c2e7fec23605668dc714c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sat, 7 Mar 2020 23:35:24 +0100
Subject: [PATCH] Update to 3.36.0

---
 .gitignore                                 |  1 +
 0001-environment-Fix-date-conversion.patch | 33 ----------------------
 gnome-shell.spec                           | 13 +++++----
 sources                                    |  2 +-
 4 files changed, 9 insertions(+), 40 deletions(-)
 delete mode 100644 0001-environment-Fix-date-conversion.patch

diff --git a/.gitignore b/.gitignore
index 88c3f9e..33c9d3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,3 +172,4 @@ gnome-shell-2.31.5.tar.bz2
 /gnome-shell-3.35.90.tar.xz
 /gnome-shell-3.35.91.tar.xz
 /gnome-shell-3.35.92.tar.xz
+/gnome-shell-3.36.0.tar.xz
diff --git a/0001-environment-Fix-date-conversion.patch b/0001-environment-Fix-date-conversion.patch
deleted file mode 100644
index 8fb1e90..0000000
--- a/0001-environment-Fix-date-conversion.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0dd171a7c899806e93254d879bc126431d99c36b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Mon, 2 Mar 2020 13:46:04 +0100
-Subject: [PATCH] environment: Fix date conversion
-
-This is a regression from commit 06b690ff21204:
-
-GLib.DateTime.new() expects the full four-digit year, so passing
-the abbreviated year from Date() will result in a bogus datetime.
-
-Today is *not* Saturday March 2nd, 120 ...
-
-https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1061
----
- js/ui/environment.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/environment.js b/js/ui/environment.js
-index 8ab9e7d44..0450f7932 100644
---- a/js/ui/environment.js
-+++ b/js/ui/environment.js
-@@ -320,7 +320,7 @@ function init() {
-             _localTimeZone = GLib.TimeZone.new_local();
- 
-         let dt = GLib.DateTime.new(_localTimeZone,
--            this.getYear(),
-+            this.getFullYear(),
-             this.getMonth() + 1,
-             this.getDate(),
-             this.getHours(),
--- 
-2.25.1
-
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 8fbec59..285e603 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,5 +1,5 @@
 Name:           gnome-shell
-Version:        3.35.92
+Version:        3.36.0
 Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
@@ -7,7 +7,7 @@ License:        GPLv2+
 Provides:       desktop-notification-daemon
 URL:            https://wiki.gnome.org/Projects/GnomeShell
 #VCS:           git:git://git.gnome.org/gnome-shell
-Source0:        http://download.gnome.org/sources/gnome-shell/3.35/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/gnome-shell/3.36/%{name}-%{version}.tar.xz
 
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch1: gnome-shell-favourite-apps-firefox.patch
@@ -17,16 +17,14 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
 Patch2: 0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch
 Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch
 
-Patch4: 0001-environment-Fix-date-conversion.patch
-
 %define libcroco_version 0.6.8
 %define eds_version 3.33.1
-%define gnome_desktop_version 3.33.4
+%define gnome_desktop_version 3.35.91
 %define glib2_version 2.56.0
 %define gobject_introspection_version 1.49.1
 %define gjs_version 1.57.3
 %define gtk3_version 3.15.0
-%define mutter_version 3.35.92
+%define mutter_version 3.36.0
 %define polkit_version 0.100
 %define gsettings_desktop_schemas_version 3.33.1
 %define ibus_version 1.5.2
@@ -229,6 +227,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
 
 %changelog
+* Sat Mar 07 2020 Florian Müllner <fmuellner@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
 * Sun Mar 01 2020 Florian Müllner <fmuellner@redhat.com> - 3.35.92-1
 - Update to 3.35.92
 
diff --git a/sources b/sources
index 05967b2..49ad2f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-shell-3.35.92.tar.xz) = 8d1d3e91d7fd9bc711baadd3e0068db6406d88bc8eb5e2c7fd86345f11ca2994550a63b502212174d47b97bb3cc3a0ce8db03c70106b92eb8bc897a3974b204c
+SHA512 (gnome-shell-3.36.0.tar.xz) = 8e4b6d9e024b27696f2fe26b86582a35ddeb42341efd05c7f731255abc1661506c14d8260757d05b3ce00e6c2e96c443ea4c22c9e671e93c9e8ef6f632cd41d4