diff options
author | Jonas Jochmaring | 2016-05-19 21:44:30 +0200 |
---|---|---|
committer | Jonas Jochmaring | 2016-05-19 21:44:30 +0200 |
commit | 8619c51a7507d1bf928edd8beaf1aa37df90ef67 (patch) | |
tree | 728b1c20770f4f188ef1abf7102bb6e7540c67fb | |
parent | 395cef22dd3c9a5c9fd4a25fc8808d4a1c351354 (diff) | |
download | aur-8619c51a7507d1bf928edd8beaf1aa37df90ef67.tar.gz |
updated to 3.20.5-1
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | trap_possible_X_error.diff | 30 |
3 files changed, 9 insertions, 48 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu May 12 16:48:30 UTC 2016 +# Thu May 19 19:44:16 UTC 2016 pkgbase = gtk3-light pkgdesc = GTK3 without colord. - pkgver = 3.20.4 - pkgrel = 2 + pkgver = 3.20.5 + pkgrel = 1 url = http://www.gtk.org/ install = gtk3.install arch = i686 @@ -35,18 +35,16 @@ pkgbase = gtk3-light 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 options = !docs backup = etc/gtk-3.0/settings.ini - 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 = settings.ini source = gtk-query-immodules-3.0.hook - source = trap_possible_X_error.diff sha256sums = e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202 sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845 - sha256sums = 1204b67e45938304ce8500c4b9de52af5d2d90bcb4a2e28bc665f5b29803f28d pkgname = gtk3-light @@ -7,8 +7,8 @@ pkgname=gtk3-light -pkgver=3.20.4 -pkgrel=2 +pkgver=3.20.5 +pkgrel=1 pkgdesc="GTK3 without colord." arch=(i686 x86_64) url="http://www.gtk.org/" @@ -25,21 +25,14 @@ backup=(etc/gtk-3.0/settings.ini) license=(LGPL) source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz settings.ini - gtk-query-immodules-3.0.hook - trap_possible_X_error.diff) + gtk-query-immodules-3.0.hook) sha256sums=('e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' - 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' - '1204b67e45938304ce8500c4b9de52af5d2d90bcb4a2e28bc665f5b29803f28d') + 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845') prepare() { cd "gtk+-$pkgver" 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/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); |