[arch-commits] Commit in gtk3/trunk (PKGBUILD scrolledwindow.patch)

[Jan Steffens]

    Date: Monday, May 23, 2016 @ 18:47:09
  Author: heftig
Revision: 268510

3.20.6-1

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/scrolledwindow.patch

----------------------+
 PKGBUILD             |    9 +++------
 scrolledwindow.patch |   33 ---------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-23 16:32:17 UTC (rev 268509)
+++ PKGBUILD	2016-05-23 16:47:09 UTC (rev 268510)
@@ -4,8 +4,8 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.20.5
-pkgrel=2
+pkgver=3.20.6
+pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
@@ -15,13 +15,11 @@
 makedepends=(gobject-introspection libcanberra gtk-doc)
 license=(LGPL)
 source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
-        scrolledwindow.patch
         settings.ini
         gtk-query-immodules-3.0.hook
         gtk-update-icon-cache.hook
         gtk-update-icon-cache.script)
-sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
-            '806be66e612c313d42d3f9384cb1bb986f89d1b9c680ab86f9e1032534fb0c09'
+sha256sums=('3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
             '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
@@ -29,7 +27,6 @@
 
 prepare() {
     cd gtk+-$pkgver
-    patch -Np1 -i ../scrolledwindow.patch
     NOCONFIGURE=1 ./autogen.sh
 }
 

Deleted: scrolledwindow.patch
===================================================================
--- scrolledwindow.patch	2016-05-23 16:32:17 UTC (rev 268509)
+++ scrolledwindow.patch	2016-05-23 16:47:09 UTC (rev 268510)
@@ -1,33 +0,0 @@
-From ca8d51e6d0f78cc170cc212dd7ef6664d2e662f4 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Fri, 20 May 2016 09:16:35 -0400
-Subject: Revert "scrolledwindow: Remove child before destroying self"
-
-This reverts commit dcb4b48b29559ca632bb020a3b8eb2b9188b02e7.
-
-This was causing crashes in the filechooser in some applications.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=766694
----
- gtk/gtkscrolledwindow.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
-index 0918d72..1b52082 100644
---- a/gtk/gtkscrolledwindow.c
-+++ b/gtk/gtkscrolledwindow.c
-@@ -2672,11 +2672,6 @@ gtk_scrolled_window_destroy (GtkWidget *widget)
- {
-   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
-   GtkScrolledWindowPrivate *priv = scrolled_window->priv;
--  GtkWidget *child;
--
--  child = gtk_bin_get_child (GTK_BIN (widget));
--  if (child)
--    gtk_container_remove (GTK_CONTAINER (widget), child);
- 
-   remove_indicator (scrolled_window, &priv->hindicator);
-   remove_indicator (scrolled_window, &priv->vindicator);
--- 
-cgit v0.12
-