gtk3-optional-csd: update patch for 3.20.2

3 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8af558d9f809..a539712e14a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Mar 12 11:09:01 UTC 2016
+# Mon Apr  4 22:07:12 UTC 2016
 pkgbase = gtk3-optional-csd
 	pkgdesc = gobject-based gui toolkit with optionally enabled csd
-	pkgver = 3.18.9
+	pkgver = 3.20.2
 	pkgrel = 1
 	url = http://www.gtk.org/
 	install = gtk3.install
@@ -12,6 +12,7 @@ pkgbase = gtk3-optional-csd
 	makedepends = gobject-introspection
 	makedepends = gtk-doc
 	makedepends = libcanberra
+	makedepends = wayland-protocols
 	depends = atk
 	depends = cairo
 	depends = libcups
@@ -36,10 +37,10 @@ pkgbase = gtk3-optional-csd
 	optdepends = at-spi2-atk: accessibility
 	provides = gtk3
 	conflicts = gtk3
-	source = https://download.gnome.org/sources/gtk+/3.18/gtk+-3.18.9.tar.xz
+	source = https://download.gnome.org/sources/gtk+/3.20/gtk+-3.20.2.tar.xz
 	source = gtk3-make-csd-optional.patch
-	sha1sums = 32d5422742f3f972b2e0c0dc9c26e58c3c2e1f5d
-	sha1sums = 5975f8fc5a582288f59b32112c3a3207dc842696
+	sha1sums = 7933099b2607fe66493c71d758faca0225d37565
+	sha1sums = b667c109d6f58ea8547a52a7b381ed65e383d778
 
 pkgname = gtk3-optional-csd
 
diff --git a/PKGBUILD b/PKGBUILD
index ef7dfdc662f4..61c97662097e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=gtk3-optional-csd
-pkgver=3.18.9
+pkgver=3.20.2
 pkgrel=1
 
 pkgdesc='gobject-based gui toolkit with optionally enabled csd'
@@ -11,7 +11,7 @@ depends=('atk' 'cairo' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
          'libepoxy' 'gdk-pixbuf2' 'libxcomposite' 'libxdamage' 'pango'
          'shared-mime-info' 'colord' 'at-spi2-atk' 'wayland' 'libxkbcommon'
          'adwaita-icon-theme' 'json-glib' 'rest' 'librsvg')
-makedepends=('gobject-introspection' 'gtk-doc' 'libcanberra')
+makedepends=('gobject-introspection' 'gtk-doc' 'libcanberra' 'wayland-protocols')
 optdepends=('at-spi2-atk: accessibility')
 
 provides=('gtk3')
@@ -20,8 +20,8 @@ conflicts=('gtk3')
 source=("https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz"
         'gtk3-make-csd-optional.patch')
 
-sha1sums=('32d5422742f3f972b2e0c0dc9c26e58c3c2e1f5d'
-          '5975f8fc5a582288f59b32112c3a3207dc842696')
+sha1sums=('7933099b2607fe66493c71d758faca0225d37565'
+          'b667c109d6f58ea8547a52a7b381ed65e383d778')
 
 install='gtk3.install'
 
diff --git a/gtk3-make-csd-optional.patch b/gtk3-make-csd-optional.patch
index a5694580bad4..2275259a13b0 100644
--- a/gtk3-make-csd-optional.patch
+++ b/gtk3-make-csd-optional.patch
@@ -1,20 +1,20 @@
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
-index 53f74e8..37d7aa8 100644
 --- a/gtk/gtkwindow.c
 +++ b/gtk/gtkwindow.c
-@@ -5771,30 +5771,12 @@ gtk_window_should_use_csd (GtkWindow *window)
+@@ -6025,9 +6025,6 @@
    GtkWindowPrivate *priv = window->priv;
    const gchar *csd_env;
- 
+
 -  if (priv->csd_requested)
 -    return TRUE;
 -
    if (!priv->decorated)
      return FALSE;
- 
-   if (priv->type == GTK_WINDOW_POPUP)
+
+@@ -6035,28 +6032,6 @@
      return FALSE;
- 
+
+   csd_env = g_getenv ("GTK_CSD");
+-
 -#ifdef GDK_WINDOWING_BROADWAY
 -  if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
 -    return TRUE;
@@ -30,6 +30,12 @@ index 53f74e8..37d7aa8 100644
 -    return TRUE;
 -#endif
 -
-   csd_env = g_getenv ("GTK_CSD");
- 
+-#ifdef GDK_WINDOWING_WIN32
+-  if (g_strcmp0 (csd_env, "0") != 0 &&
+-      GDK_IS_WIN32_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
+-    return TRUE;
+-#endif
+-
    return (g_strcmp0 (csd_env, "1") == 0);
+ }
+