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

[Maxime Gauduin]

    Date: Monday, May 30, 2016 @ 20:23:50
  Author: alucryd
Revision: 177474

upgpkg: lib32-gtk3 3.20.6-1

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

---------------------------+
 PKGBUILD                  |   11 ++++-------
 gtk3-scrolledwindow.patch |   33 ---------------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-30 18:13:26 UTC (rev 177473)
+++ PKGBUILD	2016-05-30 18:23:50 UTC (rev 177474)
@@ -4,7 +4,7 @@
 # Contributor: GordonGR <ntheo1979 at gmail.com>
 
 pkgname=lib32-gtk3
-pkgver=3.20.5
+pkgver=3.20.6
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit'
 arch=('x86_64')
@@ -16,16 +16,13 @@
          'lib32-libxkbcommon' 'lib32-libxrandr' 'lib32-pango' 'lib32-rest')
 makedepends=('gcc-multilib' 'gobject-introspection' 'gtk-doc')
 source=("https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz"
-        'gtk-query-immodules-3.0-32.hook'
-        'gtk3-scrolledwindow.patch')
-sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
-            '6b786bbcb83ba850675339b42690eedba110dcd8d0c3cdb5cfef333d8f9c320b'
-            '806be66e612c313d42d3f9384cb1bb986f89d1b9c680ab86f9e1032534fb0c09')
+        'gtk-query-immodules-3.0-32.hook')
+sha256sums=('3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2'
+            '6b786bbcb83ba850675339b42690eedba110dcd8d0c3cdb5cfef333d8f9c320b')
 
 prepare() {
   cd gtk+-${pkgver}
 
-  patch -Np1 -i ../gtk3-scrolledwindow.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 

Deleted: gtk3-scrolledwindow.patch
===================================================================
--- gtk3-scrolledwindow.patch	2016-05-30 18:13:26 UTC (rev 177473)
+++ gtk3-scrolledwindow.patch	2016-05-30 18:23:50 UTC (rev 177474)
@@ -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
-