[arch-commits] Commit in gtk3/repos (26 files)
Andreas Radke
andyrtr at archlinux.org
Wed May 11 08:48:24 UTC 2016
Date: Wednesday, May 11, 2016 @ 10:48:24
Author: andyrtr
Revision: 267788
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk3/repos/extra-i686/PKGBUILD
(from rev 267787, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-i686/gtk-query-immodules-3.0.hook
(from rev 267787, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/extra-i686/gtk-update-icon-cache.hook
(from rev 267787, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/extra-i686/gtk-update-icon-cache.script
(from rev 267787, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/extra-i686/gtk3.install
(from rev 267787, gtk3/trunk/gtk3.install)
gtk3/repos/extra-i686/settings.ini
(from rev 267787, gtk3/trunk/settings.ini)
gtk3/repos/extra-i686/trap_possible_X_error.diff
(from rev 267787, gtk3/trunk/trap_possible_X_error.diff)
gtk3/repos/extra-x86_64/PKGBUILD
(from rev 267787, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
(from rev 267787, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
(from rev 267787, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
(from rev 267787, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/extra-x86_64/gtk3.install
(from rev 267787, gtk3/trunk/gtk3.install)
gtk3/repos/extra-x86_64/settings.ini
(from rev 267787, gtk3/trunk/settings.ini)
gtk3/repos/extra-x86_64/trap_possible_X_error.diff
(from rev 267787, gtk3/trunk/trap_possible_X_error.diff)
Deleted:
gtk3/repos/extra-i686/PKGBUILD
gtk3/repos/extra-i686/gtk-query-immodules-3.0.hook
gtk3/repos/extra-i686/gtk-update-icon-cache.hook
gtk3/repos/extra-i686/gtk-update-icon-cache.script
gtk3/repos/extra-i686/gtk3.install
gtk3/repos/extra-i686/settings.ini
gtk3/repos/extra-x86_64/PKGBUILD
gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
gtk3/repos/extra-x86_64/gtk3.install
gtk3/repos/extra-x86_64/settings.ini
-------------------------------------------+
/PKGBUILD | 164 ++++++++++++++++++++++++++++
/gtk-query-immodules-3.0.hook | 22 +++
/gtk-update-icon-cache.hook | 26 ++++
/gtk-update-icon-cache.script | 20 +++
/gtk3.install | 6 +
/settings.ini | 8 +
extra-i686/PKGBUILD | 75 ------------
extra-i686/gtk-query-immodules-3.0.hook | 11 -
extra-i686/gtk-update-icon-cache.hook | 13 --
extra-i686/gtk-update-icon-cache.script | 10 -
extra-i686/gtk3.install | 3
extra-i686/settings.ini | 4
extra-i686/trap_possible_X_error.diff | 30 +++++
extra-x86_64/PKGBUILD | 75 ------------
extra-x86_64/gtk-query-immodules-3.0.hook | 11 -
extra-x86_64/gtk-update-icon-cache.hook | 13 --
extra-x86_64/gtk-update-icon-cache.script | 10 -
extra-x86_64/gtk3.install | 3
extra-x86_64/settings.ini | 4
extra-x86_64/trap_possible_X_error.diff | 30 +++++
20 files changed, 306 insertions(+), 232 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-i686/PKGBUILD 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.20.4
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-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 wayland-protocols desktop-file-utils)
-makedepends=(gobject-introspection libcanberra gtk-doc)
-license=(LGPL)
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'bbe06e1b4e1ad5d61a4e703445a2bb93c6be918964d6dd76c0420c6667fa11eb')
-
-prepare() {
- cd gtk+-$pkgver
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd "gtk+-$pkgver"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk3() {
- depends+=(gtk-update-icon-cache)
- optdepends=('libcanberra: gtk3-widget-factory demo')
- install=gtk3.install
-
- cd "gtk+-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
- install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
-
- # split this out to use with gtk2 too
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
-
- cd gtk+-$pkgver
- install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
- install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
- install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-# vim:set et sw=4:
Copied: gtk3/repos/extra-i686/PKGBUILD (from rev 267787, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.20.4
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+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 wayland-protocols desktop-file-utils)
+makedepends=(gobject-introspection libcanberra gtk-doc)
+license=(LGPL)
+source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
+ settings.ini
+ gtk-query-immodules-3.0.hook
+ gtk-update-icon-cache.hook
+ gtk-update-icon-cache.script
+ trap_possible_X_error.diff)
+sha256sums=('e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+ 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+ 'bbe06e1b4e1ad5d61a4e703445a2bb93c6be918964d6dd76c0420c6667fa11eb'
+ '1204b67e45938304ce8500c4b9de52af5d2d90bcb4a2e28bc665f5b29803f28d')
+
+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() {
+ cd "gtk+-$pkgver"
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_gtk3() {
+ depends+=(gtk-update-icon-cache)
+ optdepends=('libcanberra: gtk3-widget-factory demo')
+ install=gtk3.install
+
+ cd "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+ install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
+
+ # split this out to use with gtk2 too
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 hicolor-icon-theme)
+
+ cd gtk+-$pkgver
+ install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+ install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
+ install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set et sw=4:
Deleted: extra-i686/gtk-query-immodules-3.0.hook
===================================================================
--- extra-i686/gtk-query-immodules-3.0.hook 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-i686/gtk-query-immodules-3.0.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Copied: gtk3/repos/extra-i686/gtk-query-immodules-3.0.hook (from rev 267787, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- extra-i686/gtk-query-immodules-3.0.hook (rev 0)
+++ extra-i686/gtk-query-immodules-3.0.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Deleted: extra-i686/gtk-update-icon-cache.hook
===================================================================
--- extra-i686/gtk-update-icon-cache.hook 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-i686/gtk-update-icon-cache.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets
Copied: gtk3/repos/extra-i686/gtk-update-icon-cache.hook (from rev 267787, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- extra-i686/gtk-update-icon-cache.hook (rev 0)
+++ extra-i686/gtk-update-icon-cache.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets
Deleted: extra-i686/gtk-update-icon-cache.script
===================================================================
--- extra-i686/gtk-update-icon-cache.script 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-i686/gtk-update-icon-cache.script 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
- if [[ -e ${f}index.theme ]]; then
- gtk-update-icon-cache -q "$f"
- else
- rm -f "${f}icon-theme.cache"
- rmdir --ignore-fail-on-non-empty "$f"
- fi
-done
Copied: gtk3/repos/extra-i686/gtk-update-icon-cache.script (from rev 267787, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- extra-i686/gtk-update-icon-cache.script (rev 0)
+++ extra-i686/gtk-update-icon-cache.script 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+ if [[ -e ${f}index.theme ]]; then
+ gtk-update-icon-cache -q "$f"
+ else
+ rm -f "${f}icon-theme.cache"
+ rmdir --ignore-fail-on-non-empty "$f"
+ fi
+done
Deleted: extra-i686/gtk3.install
===================================================================
--- extra-i686/gtk3.install 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-i686/gtk3.install 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/extra-i686/gtk3.install (from rev 267787, gtk3/trunk/gtk3.install)
===================================================================
--- extra-i686/gtk3.install (rev 0)
+++ extra-i686/gtk3.install 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Deleted: extra-i686/settings.ini
===================================================================
--- extra-i686/settings.ini 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-i686/settings.ini 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-i686/settings.ini (from rev 267787, gtk3/trunk/settings.ini)
===================================================================
--- extra-i686/settings.ini (rev 0)
+++ extra-i686/settings.ini 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-i686/trap_possible_X_error.diff (from rev 267787, gtk3/trunk/trap_possible_X_error.diff)
===================================================================
--- extra-i686/trap_possible_X_error.diff (rev 0)
+++ extra-i686/trap_possible_X_error.diff 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,30 @@
+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);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-x86_64/PKGBUILD 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.20.4
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-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 wayland-protocols desktop-file-utils)
-makedepends=(gobject-introspection libcanberra gtk-doc)
-license=(LGPL)
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'bbe06e1b4e1ad5d61a4e703445a2bb93c6be918964d6dd76c0420c6667fa11eb')
-
-prepare() {
- cd gtk+-$pkgver
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd "gtk+-$pkgver"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk3() {
- depends+=(gtk-update-icon-cache)
- optdepends=('libcanberra: gtk3-widget-factory demo')
- install=gtk3.install
-
- cd "gtk+-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
- install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
-
- # split this out to use with gtk2 too
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
-
- cd gtk+-$pkgver
- install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
- install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
- install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-# vim:set et sw=4:
Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 267787, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.20.4
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+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 wayland-protocols desktop-file-utils)
+makedepends=(gobject-introspection libcanberra gtk-doc)
+license=(LGPL)
+source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
+ settings.ini
+ gtk-query-immodules-3.0.hook
+ gtk-update-icon-cache.hook
+ gtk-update-icon-cache.script
+ trap_possible_X_error.diff)
+sha256sums=('e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+ 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+ 'bbe06e1b4e1ad5d61a4e703445a2bb93c6be918964d6dd76c0420c6667fa11eb'
+ '1204b67e45938304ce8500c4b9de52af5d2d90bcb4a2e28bc665f5b29803f28d')
+
+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() {
+ cd "gtk+-$pkgver"
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_gtk3() {
+ depends+=(gtk-update-icon-cache)
+ optdepends=('libcanberra: gtk3-widget-factory demo')
+ install=gtk3.install
+
+ cd "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+ install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
+
+ # split this out to use with gtk2 too
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 hicolor-icon-theme)
+
+ cd gtk+-$pkgver
+ install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+ install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
+ install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set et sw=4:
Deleted: extra-x86_64/gtk-query-immodules-3.0.hook
===================================================================
--- extra-x86_64/gtk-query-immodules-3.0.hook 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-x86_64/gtk-query-immodules-3.0.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Copied: gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook (from rev 267787, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- extra-x86_64/gtk-query-immodules-3.0.hook (rev 0)
+++ extra-x86_64/gtk-query-immodules-3.0.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Deleted: extra-x86_64/gtk-update-icon-cache.hook
===================================================================
--- extra-x86_64/gtk-update-icon-cache.hook 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-x86_64/gtk-update-icon-cache.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets
Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook (from rev 267787, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- extra-x86_64/gtk-update-icon-cache.hook (rev 0)
+++ extra-x86_64/gtk-update-icon-cache.hook 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets
Deleted: extra-x86_64/gtk-update-icon-cache.script
===================================================================
--- extra-x86_64/gtk-update-icon-cache.script 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-x86_64/gtk-update-icon-cache.script 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
- if [[ -e ${f}index.theme ]]; then
- gtk-update-icon-cache -q "$f"
- else
- rm -f "${f}icon-theme.cache"
- rmdir --ignore-fail-on-non-empty "$f"
- fi
-done
Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.script (from rev 267787, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- extra-x86_64/gtk-update-icon-cache.script (rev 0)
+++ extra-x86_64/gtk-update-icon-cache.script 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+ if [[ -e ${f}index.theme ]]; then
+ gtk-update-icon-cache -q "$f"
+ else
+ rm -f "${f}icon-theme.cache"
+ rmdir --ignore-fail-on-non-empty "$f"
+ fi
+done
Deleted: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-x86_64/gtk3.install 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 267787, gtk3/trunk/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install (rev 0)
+++ extra-x86_64/gtk3.install 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini 2016-05-11 08:48:01 UTC (rev 267787)
+++ extra-x86_64/settings.ini 2016-05-11 08:48:24 UTC (rev 267788)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 267787, gtk3/trunk/settings.ini)
===================================================================
--- extra-x86_64/settings.ini (rev 0)
+++ extra-x86_64/settings.ini 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-x86_64/trap_possible_X_error.diff (from rev 267787, gtk3/trunk/trap_possible_X_error.diff)
===================================================================
--- extra-x86_64/trap_possible_X_error.diff (rev 0)
+++ extra-x86_64/trap_possible_X_error.diff 2016-05-11 08:48:24 UTC (rev 267788)
@@ -0,0 +1,30 @@
+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);
More information about the arch-commits
mailing list