diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | scrolledwindow.patch | 33 | ||||
| -rw-r--r-- | trap_possible_X_error.diff | 30 |
4 files changed, 45 insertions, 46 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu May 12 16:40:13 UTC 2016 +# Sat May 21 07:07:55 UTC 2016 pkgbase = gtk3-typeahead pkgdesc = GTK+ 3 with typeahead feature enabled for the file chooser widget - pkgver = 3.20.4 + pkgver = 3.20.5 pkgrel = 1 url = http://www.gtk.org/ install = gtk3.install @@ -37,17 +37,17 @@ pkgbase = gtk3-typeahead depends = wayland-protocols depends = desktop-file-utils optdepends = libcanberra: gtk3-widget-factory demo - provides = gtk3=3.20.4 + provides = gtk3=3.20.5 conflicts = gtk3 - source = https://download.gnome.org/sources/gtk+/3.20/gtk+-3.20.4.tar.xz + source = https://download.gnome.org/sources/gtk+/3.20/gtk+-3.20.5.tar.xz + source = scrolledwindow.patch source = settings.ini source = gtk-query-immodules-3.0.hook - source = trap_possible_X_error.diff source = typeahead.patch - sha256sums = e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f + sha256sums = 9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564 + sha256sums = 806be66e612c313d42d3f9384cb1bb986f89d1b9c680ab86f9e1032534fb0c09 sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202 sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845 - sha256sums = 1204b67e45938304ce8500c4b9de52af5d2d90bcb4a2e28bc665f5b29803f28d sha256sums = 5b3b9ba35378515359a25714e7c185783d15ec97c137e3564fcb1dbe658c941f pkgname = gtk3-typeahead @@ -1,7 +1,7 @@ # Maintainer: twilinx <twilinx@mesecons.net> pkgname=gtk3-typeahead -pkgver=3.20.4 +pkgver=3.20.5 pkgrel=1 conflicts=(gtk3) provides=("gtk3=$pkgver") @@ -16,14 +16,14 @@ optdepends=('libcanberra: gtk3-widget-factory demo') 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 - trap_possible_X_error.diff typeahead.patch) -sha256sums=('e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f' +sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564' + '806be66e612c313d42d3f9384cb1bb986f89d1b9c680ab86f9e1032534fb0c09' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' - '1204b67e45938304ce8500c4b9de52af5d2d90bcb4a2e28bc665f5b29803f28d' '5b3b9ba35378515359a25714e7c185783d15ec97c137e3564fcb1dbe658c941f') prepare() { @@ -31,13 +31,9 @@ prepare() { # Typeahead-specific changes patch gtk/gtkfilechooserwidget.c -i $srcdir/typeahead.patch + patch -Np1 -i $srcdir/scrolledwindow.patch NOCONFIGURE=1 ./autogen.sh - - # upstream fix for crashes with X servers not supporting XI2 - # https://bugzilla.gnome.org/show_bug.cgi?id=766233 - # https://github.com/GNOME/gtk/commit/7e7d7991cc8e7c7a2b50ce6530a8ebafd673516b - patch -Np1 -i ${srcdir}/trap_possible_X_error.diff } build() { diff --git a/scrolledwindow.patch b/scrolledwindow.patch new file mode 100644 index 000000000000..00d3f5d1579c --- /dev/null +++ b/scrolledwindow.patch @@ -0,0 +1,33 @@ +From ca8d51e6d0f78cc170cc212dd7ef6664d2e662f4 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@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 + diff --git a/trap_possible_X_error.diff b/trap_possible_X_error.diff deleted file mode 100644 index 373d80a43492..000000000000 --- a/trap_possible_X_error.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index f7c79c4..ad65e29 100644 ---- a/gdk/x11/gdkdisplay-x11.c -+++ b/gdk/x11/gdkdisplay-x11.c -@@ -2881,10 +2881,14 @@ gdk_x11_display_get_default_seat (GdkDisplay *display) - { - GList *seats, *l; - int device_id; -+ gboolean result = FALSE; - - seats = gdk_display_list_seats (display); -- XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display), -- None, &device_id); -+ -+ gdk_x11_display_error_trap_push (display); -+ result = XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display), -+ None, &device_id); -+ gdk_x11_display_error_trap_pop_ignored (display); - - for (l = seats; l; l = l->next) - { -@@ -2892,7 +2896,7 @@ gdk_x11_display_get_default_seat (GdkDisplay *display) - - pointer = gdk_seat_get_pointer (l->data); - -- if (gdk_x11_device_get_id (pointer) == device_id) -+ if (gdk_x11_device_get_id (pointer) == device_id || !result) - { - GdkSeat *seat = l->data; - g_list_free (seats); |