diff --git a/gtk+-3.20.2.tar.xz b/gtk+-3.20.2.tar.xz
deleted file mode 100644
index 80c56c6..0000000
--- a/gtk+-3.20.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ab1d1068ea55e0046f437d69983f164df5e68cb2e9fdfb38787b867f33f69f7
-size 17199320
diff --git a/gtk+-3.20.3.tar.xz b/gtk+-3.20.3.tar.xz
new file mode 100644
index 0000000..c0bbac3
--- /dev/null
+++ b/gtk+-3.20.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694
+size 17188044
diff --git a/gtk3-Wayland-do-not-resize.patch b/gtk3-Wayland-do-not-resize.patch
deleted file mode 100644
index b8de0dd..0000000
--- a/gtk3-Wayland-do-not-resize.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 82b735170006cf4beacf38ab9c5ce1db0920352f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 4 Apr 2016 14:55:38 +0200
-Subject: [PATCH] wayland: Do not resize with the same size
-
-gnome-control-center is calling gtk_window_resize() on configure-event
-signals which leads to a busy loop.
-
-Avoids such a busy loop by not re-configuring a window with the same
-size, unless this is coming from and xdg-shell configure.
-
-bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=764374
----
- gdk/wayland/gdkwindow-wayland.c | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
-index 46255ef..8f94472 100644
---- a/gdk/wayland/gdkwindow-wayland.c
-+++ b/gdk/wayland/gdkwindow-wayland.c
-@@ -168,10 +168,10 @@ struct _GdkWindowImplWaylandClass
-   GdkWindowImplClass parent_class;
- };
- 
--static void gdk_wayland_window_configure (GdkWindow *window,
--                                          int        width,
--                                          int        height,
--                                          int        scale);
-+static void gdk_wayland_window_maybe_configure (GdkWindow *window,
-+                                                int        width,
-+                                                int        height,
-+                                                int        scale);
- 
- static void maybe_set_gtk_surface_dbus_properties (GdkWindow *window);
- static void maybe_set_gtk_surface_modal (GdkWindow *window);
-@@ -571,7 +571,7 @@ window_update_scale (GdkWindow *window)
-     }
- 
-   /* Notify app that scale changed */
--  gdk_wayland_window_configure (window, window->width, window->height, scale);
-+  gdk_wayland_window_maybe_configure (window, window->width, window->height, scale);
- }
- 
- static void
-@@ -927,6 +927,22 @@ gdk_wayland_window_configure (GdkWindow *window,
- }
- 
- static void
-+gdk_wayland_window_maybe_configure (GdkWindow *window,
-+                                    int        width,
-+                                    int        height,
-+                                    int        scale)
-+{
-+  GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-+
-+  if (window->width == width &&
-+      window->height == height &&
-+      impl->scale == scale)
-+    return;
-+
-+  gdk_wayland_window_configure (window, width, height, scale);
-+}
-+
-+static void
- gdk_wayland_window_sync_parent (GdkWindow *window,
-                                 GdkWindow *parent)
- {
-@@ -1936,7 +1952,7 @@ gdk_window_wayland_move_resize (GdkWindow *window,
-    * just move the window - don't update its size
-    */
-   if (width > 0 && height > 0)
--    gdk_wayland_window_configure (window, width, height, impl->scale);
-+    gdk_wayland_window_maybe_configure (window, width, height, impl->scale);
- }
- 
- static void
-@@ -2744,7 +2760,7 @@ gdk_wayland_window_set_shadow_width (GdkWindow *window,
-     (impl->margin_left + impl->margin_right) + (left + right);
-   new_height = window->height -
-     (impl->margin_top + impl->margin_bottom) + (top + bottom);
--  gdk_wayland_window_configure (window, new_width, new_height, impl->scale);
-+  gdk_wayland_window_maybe_configure (window, new_width, new_height, impl->scale);
- 
-   impl->margin_left = left;
-   impl->margin_right = right;
--- 
-2.5.5
-
-
diff --git a/gtk3-bgo764174-boo973416-no-undersize.patch b/gtk3-bgo764174-boo973416-no-undersize.patch
deleted file mode 100644
index c8e4e23..0000000
--- a/gtk3-bgo764174-boo973416-no-undersize.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-@@ -, +, @@ 
- required
- gtk/gtkwindow.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
---- a/gtk/gtkwindow.c	
-+++ a/gtk/gtkwindow.c	
-@@ -10036,14 +10036,16 @@ gtk_window_update_fixed_size (GtkWindow   *window,
- 
-       if (info->default_width > -1)
-         {
--          new_geometry->min_width = MAX (default_width_csd, new_width);
--          new_geometry->max_width = new_geometry->min_width;
-+          gint w = MAX (MAX (default_width_csd, new_width), new_geometry->min_width);
-+          new_geometry->min_width = w;
-+          new_geometry->max_width = w;
-         }
- 
-       if (info->default_height > -1)
-         {
--          new_geometry->min_height = MAX (default_height_csd, new_height);
--          new_geometry->max_height = new_geometry->min_height;
-+          gint h = MAX (MAX (default_height_csd, new_height), new_geometry->min_height);
-+          new_geometry->min_height = h;
-+          new_geometry->max_height = h;
-         }
-     }
- }
-
diff --git a/gtk3-stable-adwaita-fixes.patch b/gtk3-stable-adwaita-fixes.patch
deleted file mode 100644
index b19d39c..0000000
--- a/gtk3-stable-adwaita-fixes.patch
+++ /dev/null
@@ -1,572 +0,0 @@
-From 8d402589cfeab084224596e4127d75c8f5dbef11 Mon Sep 17 00:00:00 2001
-From: Lapo Calamandrei <calamandrei@gmail.com>
-Date: Fri, 1 Apr 2016 16:42:40 +0200
-Subject: Adwaita: set secondary caret color to selection blue
-
-see https://bugzilla.gnome.org/show_bug.cgi?id=764204
----
- gtk/theme/Adwaita/_common.scss           | 2 ++
- gtk/theme/Adwaita/gtk-contained-dark.css | 3 ++-
- gtk/theme/Adwaita/gtk-contained.css      | 3 ++-
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
-index c8114cb..ed64ed7 100644
---- a/gtk/theme/Adwaita/_common.scss
-+++ b/gtk/theme/Adwaita/_common.scss
-@@ -39,6 +39,8 @@ $button_transition: all 200ms $ease-out-quad;
-   outline-offset: -3px;
-   outline-width: 1px;
-   -gtk-outline-radius: 2px;
-+
-+  -gtk-secondary-caret-color: $selected_bg_color
- }
- 
- 
-diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
-index fee8e67..7b6a592 100644
---- a/gtk/theme/Adwaita/gtk-contained-dark.css
-+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
-@@ -14,7 +14,8 @@
-   outline-style: dashed;
-   outline-offset: -3px;
-   outline-width: 1px;
--  -gtk-outline-radius: 2px; }
-+  -gtk-outline-radius: 2px;
-+  -gtk-secondary-caret-color: #215d9c; }
- 
- /***************
-  * Base States *
-diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
-index 8d10bbe..a5cee5f 100644
---- a/gtk/theme/Adwaita/gtk-contained.css
-+++ b/gtk/theme/Adwaita/gtk-contained.css
-@@ -14,7 +14,8 @@
-   outline-style: dashed;
-   outline-offset: -3px;
-   outline-width: 1px;
--  -gtk-outline-radius: 2px; }
-+  -gtk-outline-radius: 2px;
-+  -gtk-secondary-caret-color: #4a90d9; }
- 
- /***************
-  * Base States *
--- 
-cgit v0.12
-
-
-From 9ce61b5c9a8e95bf92fd3cbda495f0ef397b89a8 Mon Sep 17 00:00:00 2001
-From: Lapo Calamandrei <calamandrei@gmail.com>
-Date: Sat, 2 Apr 2016 16:03:02 +0200
-Subject: Adwaita: cosmetic fixes
-
----
- gtk/theme/Adwaita/_common.scss           | 14 +++++++-------
- gtk/theme/Adwaita/gtk-contained-dark.css | 10 +++++-----
- gtk/theme/Adwaita/gtk-contained.css      | 10 +++++-----
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
-index ed64ed7..32dee8a 100644
---- a/gtk/theme/Adwaita/_common.scss
-+++ b/gtk/theme/Adwaita/_common.scss
-@@ -834,7 +834,7 @@ button {
- // More inline toolbar buttons
- toolbar.inline-toolbar toolbutton,
- toolbar.inline-toolbar toolbutton:backdrop {
--  & > button.flat { @extend %linked_middle; }
-+  > button.flat { @extend %linked_middle; }
- 
-   &:first-child > button.flat { @extend %linked:first-child; }
- 
-@@ -1574,7 +1574,7 @@ treeview.view {
-   border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color,
-   border-top-color: $bg_color;                         // while this is the grid lines color, better then nothing
- 
--  & rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
-+  rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
- 
-   &:selected {
-     &:focus, & {
-@@ -1923,7 +1923,7 @@ popover.background {
-   border-radius: 5px;
-   background-color: $popover_bg_color;
- 
--  &, .csd & { border: 1px solid $borders_color; }
-+  .csd &, & { border: 1px solid $borders_color; }
- 
-   box-shadow: 0 1px 2px transparentize(black, 0.7);
- 
-@@ -1939,7 +1939,7 @@ popover.background {
-     background-color: transparent;
-   }
- 
--  &, .csd & {
-+  .csd &, & {
-     &.touch-selection,
-     &.magnifier {
-       @extend %osd;
-@@ -2740,7 +2740,7 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work
-   }
- 
-   // ...on selected list rows
--  row:selected & { &, &:disabled { border-color: $selected_borders_color; } }
-+  row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
- 
-   // OSD
-   .osd & {
-@@ -3887,7 +3887,7 @@ infobar { border-style: none; }
-     }
-   }
- 
--  & label:selected { &:focus, &:hover, & { background-color: darken($selected_bg_color, 10%); }}
-+  label:selected { &:focus, &:hover, & { background-color: darken($selected_bg_color, 10%); }}
- 
-   *:link { @extend %link_selected; }
- }
-@@ -4092,7 +4092,7 @@ colorchooser .popover.osd { border-radius: 5px; }
-       border-radius: 5px;
-     }
- 
--    &:backdrop { &:hover, &:disabled, & {@extend %undecorated_button; }}
-+    &:backdrop { &:hover, &:disabled, & { @extend %undecorated_button; }}
-   }
- }
- 
-diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
-index 7b6a592..c79f05f 100644
---- a/gtk/theme/Adwaita/gtk-contained-dark.css
-+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
-@@ -126,7 +126,7 @@ textview {
-   textview:backdrop {
-     background-color: #333636; }
- 
--popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
-+.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification,
- .app-notification.frame, .osd .scale-popup, .osd {
-   color: #eeeeec;
-   border: none;
-@@ -642,7 +642,7 @@ button.osd {
-     text-shadow: none;
-     -gtk-icon-shadow: none;
-     border: none; }
--popover.background.touch-selection button, popover.background.magnifier button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, .app-notification button,
-+.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button,
- .app-notification.frame button, .osd
- button {
-   color: #eeeeec;
-@@ -2217,7 +2217,7 @@ popover.background {
-   border-radius: 5px;
-   background-color: #393f3f;
-   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
--  popover.background, .csd popover.background {
-+  .csd popover.background, popover.background {
-     border: 1px solid #1c1f1f; }
-   popover.background:backdrop {
-     background-color: #393f3f;
-@@ -2228,7 +2228,7 @@ popover.background {
-   popover.background > toolbar {
-     border-style: none;
-     background-color: transparent; }
--  popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier {
-+  .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier {
-     border: 1px solid rgba(255, 255, 255, 0.1); }
-   popover.background separator {
-     margin: 3px; }
-@@ -2944,7 +2944,7 @@ scale highlight, progressbar progress {
-     scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled {
-       background-color: transparent;
-       border-color: transparent; }
--  row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress, row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled {
-+  row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled, row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress {
-     border-color: #0f2b48; }
-   .osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress {
-     border-color: rgba(0, 0, 0, 0.7); }
-diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
-index a5cee5f..87e4f21 100644
---- a/gtk/theme/Adwaita/gtk-contained.css
-+++ b/gtk/theme/Adwaita/gtk-contained.css
-@@ -126,7 +126,7 @@ textview {
-   textview:backdrop {
-     background-color: #f2f2f2; }
- 
--popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
-+.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification,
- .app-notification.frame, .osd .scale-popup, .osd {
-   color: #eeeeec;
-   border: none;
-@@ -645,7 +645,7 @@ button.osd {
-     text-shadow: none;
-     -gtk-icon-shadow: none;
-     border: none; }
--popover.background.touch-selection button, popover.background.magnifier button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, .app-notification button,
-+.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button,
- .app-notification.frame button, .osd
- button {
-   color: #eeeeec;
-@@ -2230,7 +2230,7 @@ popover.background {
-   border-radius: 5px;
-   background-color: #e8e8e7;
-   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
--  popover.background, .csd popover.background {
-+  .csd popover.background, popover.background {
-     border: 1px solid #9d9d99; }
-   popover.background:backdrop {
-     background-color: #e8e8e7;
-@@ -2241,7 +2241,7 @@ popover.background {
-   popover.background > toolbar {
-     border-style: none;
-     background-color: transparent; }
--  popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier {
-+  .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier {
-     border: 1px solid rgba(255, 255, 255, 0.1); }
-   popover.background separator {
-     margin: 3px; }
-@@ -2973,7 +2973,7 @@ scale highlight, progressbar progress {
-     scale highlight:backdrop:disabled, progressbar progress:backdrop:disabled, progressbar:backdrop progress:disabled {
-       background-color: transparent;
-       border-color: transparent; }
--  row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress, row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled {
-+  row:selected scale highlight:disabled, scale row:selected highlight:disabled, row:selected progressbar progress:disabled, progressbar row:selected progress:disabled, row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress {
-     border-color: #184472; }
-   .osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress {
-     border-color: rgba(0, 0, 0, 0.7); }
--- 
-cgit v0.12
-
-From 30e234d84749dea9ed137bddc2e94c8ff7fa48b7 Mon Sep 17 00:00:00 2001
-From: Lapo Calamandrei <calamandrei@gmail.com>
-Date: Sat, 2 Apr 2016 16:24:52 +0200
-Subject: Adwaita: style textview border
-
-see https://bugzilla.gnome.org/show_bug.cgi?id=764203
----
- gtk/theme/Adwaita/_common.scss           | 37 ++++++++++++++++++++++++++------
- gtk/theme/Adwaita/gtk-contained-dark.css | 25 ++++++++++++++++-----
- gtk/theme/Adwaita/gtk-contained.css      | 25 ++++++++++++++++-----
- 3 files changed, 71 insertions(+), 16 deletions(-)
-
-diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
-index 32dee8a..7733d2e 100644
---- a/gtk/theme/Adwaita/_common.scss
-+++ b/gtk/theme/Adwaita/_common.scss
-@@ -121,6 +121,37 @@ textview {
-   }
- }
- 
-+textview border {
-+  background-color: mix($bg_color, $base_color, 50%);
-+  background-image: image($bg_color); // HACK: the border node just draws background so, using a background-image to draw the border
-+  background-repeat: no-repeat;
-+
-+  &:backdrop {
-+    background-color: mix($backdrop_bg_color, $backdrop_base_color, 50%);
-+    background-image: image($backdrop_bg_color);
-+  }
-+
-+  &.bottom {
-+    background-size: 100% 1px;
-+    background-position: top;
-+  }
-+
-+  &.top {
-+    background-size: 100% 1px;
-+    background-position: bottom;
-+  }
-+
-+  &.left {
-+    background-size: 1px 100%;
-+    background-position: right;
-+  }
-+
-+  &.right {
-+    background-size: 1px 100%;
-+    background-position: left;
-+  }
-+}
-+
- iconview { @extend .view; }
- 
- .rubberband,
-@@ -199,12 +230,6 @@ assistant {
-   .sidebar label.highlight { background-color: mix($bg_color, $fg_color, 80%); }
- }
- 
--textview { // This will get overridden by .view, needed by gedit line numbers
--  background-color: mix($bg_color, $base_color, 50%);
--
--  &:backdrop { background-color: mix($backdrop_bg_color, $backdrop_base_color, 50%); }
--}
--
- %osd, .osd {
-   color: $osd_fg_color;
-   border: none;
-diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
-index c79f05f..0dbd69d 100644
---- a/gtk/theme/Adwaita/gtk-contained-dark.css
-+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
-@@ -75,6 +75,26 @@ textview text {
-   textview text:selected {
-     border-radius: 3px; }
- 
-+textview border {
-+  background-color: #313434;
-+  background-image: image(#393f3f);
-+  background-repeat: no-repeat; }
-+  textview border:backdrop {
-+    background-color: #333636;
-+    background-image: image(#393f3f); }
-+  textview border.bottom {
-+    background-size: 100% 1px;
-+    background-position: top; }
-+  textview border.top {
-+    background-size: 100% 1px;
-+    background-position: bottom; }
-+  textview border.left {
-+    background-size: 1px 100%;
-+    background-position: right; }
-+  textview border.right {
-+    background-size: 1px 100%;
-+    background-position: left; }
-+
- .rubberband,
- rubberband,
- flowbox rubberband,
-@@ -121,11 +141,6 @@ assistant .sidebar label {
- assistant .sidebar label.highlight {
-   background-color: #5d6262; }
- 
--textview {
--  background-color: #313434; }
--  textview:backdrop {
--    background-color: #333636; }
--
- .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification,
- .app-notification.frame, .osd .scale-popup, .osd {
-   color: #eeeeec;
-diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
-index 87e4f21..a221f23 100644
---- a/gtk/theme/Adwaita/gtk-contained.css
-+++ b/gtk/theme/Adwaita/gtk-contained.css
-@@ -75,6 +75,26 @@ textview text {
-   textview text:selected {
-     border-radius: 3px; }
- 
-+textview border {
-+  background-color: #f4f4f3;
-+  background-image: image(#e8e8e7);
-+  background-repeat: no-repeat; }
-+  textview border:backdrop {
-+    background-color: #f2f2f2;
-+    background-image: image(#e8e8e7); }
-+  textview border.bottom {
-+    background-size: 100% 1px;
-+    background-position: top; }
-+  textview border.top {
-+    background-size: 100% 1px;
-+    background-position: bottom; }
-+  textview border.left {
-+    background-size: 1px 100%;
-+    background-position: right; }
-+  textview border.right {
-+    background-size: 1px 100%;
-+    background-position: left; }
-+
- .rubberband,
- rubberband,
- flowbox rubberband,
-@@ -121,11 +141,6 @@ assistant .sidebar label {
- assistant .sidebar label.highlight {
-   background-color: #c3c4c4; }
- 
--textview {
--  background-color: #f4f4f3; }
--  textview:backdrop {
--    background-color: #f2f2f2; }
--
- .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification,
- .app-notification.frame, .osd .scale-popup, .osd {
-   color: #eeeeec;
--- 
-cgit v0.12
-
-
-From 17d1cd1506f04f1d737bb562fb5811e0e07538e9 Mon Sep 17 00:00:00 2001
-From: Lapo Calamandrei <calamandrei@gmail.com>
-Date: Mon, 4 Apr 2016 12:03:11 +0200
-Subject: Adwaita: transparent textview border border
-
-So it will play nicely with gedit color combinations.
-See https://bugzilla.gnome.org/show_bug.cgi?id=764203
----
- gtk/theme/Adwaita/_common.scss           | 9 +++------
- gtk/theme/Adwaita/gtk-contained-dark.css | 5 ++---
- gtk/theme/Adwaita/gtk-contained.css      | 5 ++---
- 3 files changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
-index 7733d2e..d553c44 100644
---- a/gtk/theme/Adwaita/_common.scss
-+++ b/gtk/theme/Adwaita/_common.scss
-@@ -123,13 +123,10 @@ textview {
- 
- textview border {
-   background-color: mix($bg_color, $base_color, 50%);
--  background-image: image($bg_color); // HACK: the border node just draws background so, using a background-image to draw the border
--  background-repeat: no-repeat;
-+  background-image: image(transparentize(black, 0.8)); // HACK: the border node just draws background so,
-+  background-repeat: no-repeat;                        // using a background-image to draw the border
- 
--  &:backdrop {
--    background-color: mix($backdrop_bg_color, $backdrop_base_color, 50%);
--    background-image: image($backdrop_bg_color);
--  }
-+  &:backdrop { background-color: mix($backdrop_bg_color, $backdrop_base_color, 50%); }
- 
-   &.bottom {
-     background-size: 100% 1px;
-diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
-index 0dbd69d..c6acb03 100644
---- a/gtk/theme/Adwaita/gtk-contained-dark.css
-+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
-@@ -77,11 +77,10 @@ textview text {
- 
- textview border {
-   background-color: #313434;
--  background-image: image(#393f3f);
-+  background-image: image(rgba(0, 0, 0, 0.2));
-   background-repeat: no-repeat; }
-   textview border:backdrop {
--    background-color: #333636;
--    background-image: image(#393f3f); }
-+    background-color: #333636; }
-   textview border.bottom {
-     background-size: 100% 1px;
-     background-position: top; }
-diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
-index a221f23..361299f 100644
---- a/gtk/theme/Adwaita/gtk-contained.css
-+++ b/gtk/theme/Adwaita/gtk-contained.css
-@@ -77,11 +77,10 @@ textview text {
- 
- textview border {
-   background-color: #f4f4f3;
--  background-image: image(#e8e8e7);
-+  background-image: image(rgba(0, 0, 0, 0.2));
-   background-repeat: no-repeat; }
-   textview border:backdrop {
--    background-color: #f2f2f2;
--    background-image: image(#e8e8e7); }
-+    background-color: #f2f2f2; }
-   textview border.bottom {
-     background-size: 100% 1px;
-     background-position: top; }
--- 
-cgit v0.12
-
-
-From 6144b2276c7298040c080f85ffa83afbe1257c54 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Tue, 1 Dec 2015 17:25:54 +0100
-Subject: window: Remove suspicious branch
-
-This commit was found to make emacs windows shrink, but the reversal
-caused more widespread damage than initially expected. I've send
-suggested fixes to the emacs team, to avoid the shrinking window,
-regardless of this commit.
-
-Original commit message:
-
-It seems this branch is not needed anymore. It was originally added in
-1999 to support gtk_widget_realize(), but all those reasons seem
-obsolete today.
-Instead just call gtk_widget_realize().
-
-If you end up at this commit when bisecting:
-There is no bug that made me remove this code, it was purely meant to be
-cleanup / dead code removal. I seem to have introduced a new bug or
-bisecting wouldn't have let you here. So it seems we should just revert
-this commit.
----
- gtk/gtkwindow.c | 55 +------------------------------------------------------
- 1 file changed, 1 insertion(+), 54 deletions(-)
-
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
-index 5922415..f1d736c 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -6092,7 +6092,6 @@ gtk_window_show (GtkWidget *widget)
-   GtkWindow *window = GTK_WINDOW (widget);
-   GtkWindowPrivate *priv = window->priv;
-   GtkContainer *container = GTK_CONTAINER (window);
--  gboolean need_resize;
-   gboolean is_plug;
- 
-   if (!_gtk_widget_is_toplevel (GTK_WIDGET (widget)))
-@@ -6103,62 +6102,10 @@ gtk_window_show (GtkWidget *widget)
- 
-   _gtk_widget_set_visible_flag (widget, TRUE);
- 
--  need_resize = _gtk_widget_get_alloc_needed (widget) || !_gtk_widget_get_realized (widget);
--
-   gtk_css_node_validate (gtk_widget_get_css_node (widget));
- 
--  if (need_resize)
--    {
--      GtkWindowGeometryInfo *info = gtk_window_get_geometry_info (window, TRUE);
--      GtkAllocation allocation = { 0, 0 };
--      GdkRectangle configure_request;
--      GdkGeometry new_geometry;
--      guint new_flags;
--      gboolean was_realized;
--
--      /* We are going to go ahead and perform this configure request
--       * and then emulate a configure notify by going ahead and
--       * doing a size allocate. Sort of a synchronous
--       * mini-copy of gtk_window_move_resize() here.
--       */
--      gtk_window_compute_configure_request (window,
--                                            &configure_request,
--                                            &new_geometry,
--                                            &new_flags);
--      
--      /* We update this because we are going to go ahead
--       * and gdk_window_resize() below, rather than
--       * queuing it.
--       */
--      info->last.configure_request = configure_request;
--      
--      /* and allocate the window - this is normally done
--       * in move_resize in response to configure notify
--       */
--      allocation.width  = configure_request.width;
--      allocation.height = configure_request.height;
--      gtk_widget_size_allocate (widget, &allocation);
-+  gtk_widget_realize (widget);
- 
--      /* Then we guarantee we have a realize */
--      was_realized = FALSE;
--      if (!_gtk_widget_get_realized (widget))
--	{
--	  gtk_widget_realize (widget);
--	  was_realized = TRUE;
--	}
--
--      /* We only send configure request if we didn't just finish
--       * creating the window; if we just created the window
--       * then we created it with widget->allocation anyhow.
--       */
--      if (!was_realized)
--        gdk_window_move_resize (_gtk_widget_get_window (widget),
--				configure_request.x,
--				configure_request.y,
--				configure_request.width,
--				configure_request.height);
--    }
--  
-   gtk_container_check_resize (container);
- 
-   gtk_widget_map (widget);
--- 
-cgit v0.12
-
diff --git a/gtk3.changes b/gtk3.changes
index 464cab9..6bd655f 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Apr 12 07:50:50 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.20.3:
+  + Bugs fixed: bgo#764174, bgo#764203, bgo#764204, bgo#764261,
+    bgo#764374, bgo#764378, bgo#764540, bgo#764585, bgo#764664,
+    bgo#764686, bgo#764710, bgo#764835.
+  + Updated translations.
+- Drop gtk3-bgo764174-boo973416-no-undersize.patch,
+  gtk3-Wayland-do-not-resize.patch and
+  gtk3-stable-adwaita-fixes.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Tue Apr  5 16:28:35 UTC 2016 - zaitor@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index c8c77d8..92f08e1 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -29,7 +29,7 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.20.2
+Version:        3.20.3
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
@@ -47,12 +47,6 @@ Patch1:         gtk3-path-local.patch
 ## PATCH-DISABLED gtk3-bnc130159-bgo319483-async-font-selection.patch - Upstream bug was closed as obsolete in 2011, lets see if anyone complains. 
 # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch3:         gtk3-bnc130159-bgo319483-async-font-selection.patch
-# PATCH-FIX-UPSTREAM gtk3-bgo764174-boo973416-no-undersize.patch bgo#764174 boo#973416 egeorget@openmailbox.org -- gtkwindow: Don't allow unresizable windows to be smaller than required
-Patch4:         gtk3-bgo764174-boo973416-no-undersize.patch
-# PATCH-FIX-UPSTREAM gtk3-stable-adwaita-fixes.patch zaitor@opensuse.org -- Add upstream adwaita fixes
-Patch5:         gtk3-stable-adwaita-fixes.patch
-# PATCH-FIX-UPSTREAM gtk3-Wayland-do-not-resize.patch bgo#764374 zaitor@opensuse.org -- gnome-control-center is calling gtk_window_resize() on configure-event signals which leads to a busy loop.
-Patch6:         gtk3-Wayland-do-not-resize.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -345,9 +339,6 @@ cp -a %{S:1} .
 %patch1 -p0
 ## PATCH-DISABLED - Upstream bug was closed as obsolete in 2011, as there was a new fontchooser, lets disable the patch and see if anyone complains.
 #%%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 # Needed for patch1