[arch-commits] Commit in gtk3/repos (20 files)
Evangelos Foutras
foutrelis at archlinux.org
Fri Jan 8 02:36:14 UTC 2016
Date: Friday, January 8, 2016 @ 03:36:14
Author: foutrelis
Revision: 257628
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk3/repos/extra-i686/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
(from rev 257627, gtk3/trunk/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch)
gtk3/repos/extra-i686/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
(from rev 257627, gtk3/trunk/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch)
gtk3/repos/extra-i686/PKGBUILD
(from rev 257627, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-i686/gtk-update-icon-cache.install
(from rev 257627, gtk3/trunk/gtk-update-icon-cache.install)
gtk3/repos/extra-i686/gtk3.install
(from rev 257627, gtk3/trunk/gtk3.install)
gtk3/repos/extra-i686/settings.ini
(from rev 257627, gtk3/trunk/settings.ini)
gtk3/repos/extra-x86_64/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
(from rev 257627, gtk3/trunk/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch)
gtk3/repos/extra-x86_64/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
(from rev 257627, gtk3/trunk/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch)
gtk3/repos/extra-x86_64/PKGBUILD
(from rev 257627, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-x86_64/gtk-update-icon-cache.install
(from rev 257627, gtk3/trunk/gtk-update-icon-cache.install)
gtk3/repos/extra-x86_64/gtk3.install
(from rev 257627, gtk3/trunk/gtk3.install)
gtk3/repos/extra-x86_64/settings.ini
(from rev 257627, gtk3/trunk/settings.ini)
Deleted:
gtk3/repos/extra-i686/PKGBUILD
gtk3/repos/extra-i686/gtk-update-icon-cache.install
gtk3/repos/extra-i686/gtk3.install
gtk3/repos/extra-i686/settings.ini
gtk3/repos/extra-x86_64/PKGBUILD
gtk3/repos/extra-x86_64/gtk-update-icon-cache.install
gtk3/repos/extra-x86_64/gtk3.install
gtk3/repos/extra-x86_64/settings.ini
------------------------------------------------------------------------------+
/PKGBUILD | 148 ++++++++++
/gtk-update-icon-cache.install | 6
/gtk3.install | 36 ++
/settings.ini | 8
extra-i686/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch | 85 +++++
extra-i686/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch | 94 ++++++
extra-i686/PKGBUILD | 65 ----
extra-i686/gtk-update-icon-cache.install | 3
extra-i686/gtk3.install | 18 -
extra-i686/settings.ini | 4
extra-x86_64/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch | 85 +++++
extra-x86_64/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch | 94 ++++++
extra-x86_64/PKGBUILD | 65 ----
extra-x86_64/gtk-update-icon-cache.install | 3
extra-x86_64/gtk3.install | 18 -
extra-x86_64/settings.ini | 4
16 files changed, 556 insertions(+), 180 deletions(-)
Copied: gtk3/repos/extra-i686/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch (from rev 257627, gtk3/trunk/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch)
===================================================================
--- extra-i686/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch (rev 0)
+++ extra-i686/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,85 @@
+From affd6e70734d7897324409d6fc0beb7b4eb7235a Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Wed, 6 Jan 2016 14:54:33 -0500
+Subject: [PATCH 1/2] x11: Only do cursor name fallback for standard names
+
+Always returning a left_ptr if we can't find anything better
+broke firefox application-specific fallback for missing cursors.
+Keep that working by only doing the fallback for the CSS cursor
+names, not for things like hashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760141
+---
+ gdk/x11/gdkcursor-x11.c | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
+index 540f48e..d619f58 100644
+--- a/gdk/x11/gdkcursor-x11.c
++++ b/gdk/x11/gdkcursor-x11.c
+@@ -611,17 +611,23 @@ static const struct {
+ const gchar *css_name, *traditional_name;
+ } name_map[] = {
+ { "default", "left_ptr" },
++ { "help", "left_ptr" },
++ { "context-menu", "left_ptr" },
+ { "pointer", "hand" },
+ { "progress", "left_ptr_watch" },
+ { "wait", "watch" },
+ { "cell", "crosshair" },
+ { "crosshair", "cross" },
+ { "text", "xterm" },
++ { "vertical-text","xterm" },
+ { "alias", "dnd-link" },
+ { "copy", "dnd-copy" },
++ { "move", "dnd-move" },
+ { "no-drop", "dnd-none" },
+ { "not-allowed", "crossed_circle" },
+ { "grab", "hand2" },
++ { "grabbing", "hand2" },
++ { "all-scroll", "left_ptr" },
+ { "col-resize", "h_double_arrow" },
+ { "row-resize", "v_double_arrow" },
+ { "n-resize", "top_side" },
+@@ -636,6 +642,8 @@ static const struct {
+ { "ns-resize", "v_double_arrow" },
+ { "nesw-resize", "fd_double_arrow" },
+ { "nwse-resize", "bd_double_arrow" },
++ { "zoom-in", "left_ptr" },
++ { "zoom-out", "left_ptr" },
+ { NULL, NULL }
+ };
+
+@@ -650,7 +658,7 @@ name_fallback (const gchar *name)
+ return name_map[i].traditional_name;
+ }
+
+- return "left_ptr";
++ return NULL;
+ }
+
+ GdkCursor*
+@@ -683,9 +691,17 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay *display,
+ xdisplay = GDK_DISPLAY_XDISPLAY (display);
+ xcursor = XcursorLibraryLoadCursor (xdisplay, name);
+ if (xcursor == None)
+- xcursor = XcursorLibraryLoadCursor (xdisplay, name_fallback (name));
+- if (xcursor == None)
+- xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
++ {
++ const char *fallback;
++
++ fallback = name_fallback (name);
++ if (fallback)
++ {
++ xcursor = XcursorLibraryLoadCursor (xdisplay, fallback);
++ if (xcursor == None)
++ xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
++ }
++ }
+ if (xcursor == None)
+ return NULL;
+ }
+--
+2.7.0
+
Copied: gtk3/repos/extra-i686/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch (from rev 257627, gtk3/trunk/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch)
===================================================================
--- extra-i686/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch (rev 0)
+++ extra-i686/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,94 @@
+From 81a287478a4db9ce650cc764474b9c173b137dee Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Wed, 6 Jan 2016 14:56:06 -0500
+Subject: [PATCH 2/2] wayland: Only do cursor name fallback for standard names
+
+Always returning a left_ptr if we can't find anything better
+broke firefox application-specific fallback for missing cursors.
+Keep that working by only doing the fallback for the CSS cursor
+names, not for things like hashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760141
+---
+ gdk/wayland/gdkcursor-wayland.c | 29 +++++++++++++++++++++--------
+ 1 file changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
+index 8aee5ae..bdfa316 100644
+--- a/gdk/wayland/gdkcursor-wayland.c
++++ b/gdk/wayland/gdkcursor-wayland.c
+@@ -87,17 +87,23 @@ static const struct {
+ const gchar *css_name, *traditional_name;
+ } name_map[] = {
+ { "default", "left_ptr" },
++ { "help", "left_ptr" },
++ { "context-menu", "left_ptr" },
+ { "pointer", "hand" },
+ { "progress", "left_ptr_watch" },
+ { "wait", "watch" },
+ { "cell", "crosshair" },
+ { "crosshair", "cross" },
+ { "text", "xterm" },
++ { "vertical-text","xterm" },
+ { "alias", "dnd-link" },
+ { "copy", "dnd-copy" },
++ { "move", "dnd-move" },
+ { "no-drop", "dnd-none" },
+ { "not-allowed", "crossed_circle" },
+ { "grab", "hand2" },
++ { "grabbing", "hand2" },
++ { "all-scroll", "left_ptr" },
+ { "col-resize", "h_double_arrow" },
+ { "row-resize", "v_double_arrow" },
+ { "n-resize", "top_side" },
+@@ -112,6 +118,8 @@ static const struct {
+ { "ns-resize", "v_double_arrow" },
+ { "nesw-resize", "fd_double_arrow" },
+ { "nwse-resize", "bd_double_arrow" },
++ { "zoom-in", "left_ptr" },
++ { "zoom-out", "left_ptr" },
+ { NULL, NULL }
+ };
+
+@@ -126,7 +134,7 @@ name_fallback (const gchar *name)
+ return name_map[i].traditional_name;
+ }
+
+- return "left_ptr";
++ return NULL;
+ }
+
+ static gboolean
+@@ -144,17 +152,22 @@ _gdk_wayland_cursor_update (GdkWaylandDisplay *wayland_display,
+ cursor->scale);
+ c = wl_cursor_theme_get_cursor (theme, cursor->name);
+ if (!c)
+- c = wl_cursor_theme_get_cursor (theme, name_fallback (cursor->name));
++ {
++ const char *fallback;
++
++ fallback = name_fallback (cursor->name);
++ if (fallback)
++ {
++ c = wl_cursor_theme_get_cursor (theme, name_fallback (cursor->name));
++ if (!c)
++ c = wl_cursor_theme_get_cursor (theme, "left_ptr");
++ }
++ }
+
+ if (!c)
+ {
+ g_warning (G_STRLOC ": Unable to load %s from the cursor theme", cursor->name);
+-
+- /* return the left_ptr cursor as a fallback */
+- c = wl_cursor_theme_get_cursor (theme, "left_ptr");
+-
+- if (!c)
+- return FALSE;
++ return FALSE;
+ }
+
+ cursor->wl_cursor = c;
+--
+2.7.0
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-i686/PKGBUILD 2016-01-08 02:36:14 UTC (rev 257628)
@@ -1,65 +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.18.6
-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)
-makedepends=(gobject-introspection libcanberra)
-license=(LGPL)
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- settings.ini)
-sha256sums=('78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
-
-prepare() {
- cd gtk+-$pkgver
-}
-
-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"
-
- # 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)
- install=gtk-update-icon-cache.install
-
- cd gtk+-$pkgver/gtk
- install -Dm755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-# vim:set et sw=4:
Copied: gtk3/repos/extra-i686/PKGBUILD (from rev 257627, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,74 @@
+# $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.18.6
+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)
+makedepends=(gobject-introspection libcanberra)
+license=(LGPL)
+source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
+ 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
+ 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
+ settings.ini)
+sha256sums=('78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef'
+ '0402c3b7801810beb0f24ad20e4fb2eb7519cf3984f39e093a6e2752a0f7d9de'
+ '94722b06284e76f628fc8933617ac19c14f6775a5250fe3c382defab63d7b10e'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
+
+prepare() {
+ cd gtk+-$pkgver
+
+ # Fix zoom in/out cursors in GTK3 builds of Firefox
+ # https://bugzilla.gnome.org/show_bug.cgi?id=760141
+ patch -Np1 -i ../0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
+ patch -Np1 -i ../0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
+}
+
+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"
+
+ # 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)
+ install=gtk-update-icon-cache.install
+
+ cd gtk+-$pkgver/gtk
+ install -Dm755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+# vim:set et sw=4:
Deleted: extra-i686/gtk-update-icon-cache.install
===================================================================
--- extra-i686/gtk-update-icon-cache.install 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-i686/gtk-update-icon-cache.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -1,3 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk3/repos/extra-i686/gtk-update-icon-cache.install (from rev 257627, gtk3/trunk/gtk-update-icon-cache.install)
===================================================================
--- extra-i686/gtk-update-icon-cache.install (rev 0)
+++ extra-i686/gtk-update-icon-cache.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,3 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: extra-i686/gtk3.install
===================================================================
--- extra-i686/gtk3.install 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-i686/gtk3.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -1,18 +0,0 @@
-post_install() {
- /usr/bin/gtk-query-immodules-3.0 --update-cache
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk3/repos/extra-i686/gtk3.install (from rev 257627, gtk3/trunk/gtk3.install)
===================================================================
--- extra-i686/gtk3.install (rev 0)
+++ extra-i686/gtk3.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,18 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-3.0 --update-cache
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+
+post_remove() {
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: extra-i686/settings.ini
===================================================================
--- extra-i686/settings.ini 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-i686/settings.ini 2016-01-08 02:36:14 UTC (rev 257628)
@@ -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 257627, gtk3/trunk/settings.ini)
===================================================================
--- extra-i686/settings.ini (rev 0)
+++ extra-i686/settings.ini 2016-01-08 02:36:14 UTC (rev 257628)
@@ -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/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch (from rev 257627, gtk3/trunk/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch)
===================================================================
--- extra-x86_64/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch (rev 0)
+++ extra-x86_64/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,85 @@
+From affd6e70734d7897324409d6fc0beb7b4eb7235a Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Wed, 6 Jan 2016 14:54:33 -0500
+Subject: [PATCH 1/2] x11: Only do cursor name fallback for standard names
+
+Always returning a left_ptr if we can't find anything better
+broke firefox application-specific fallback for missing cursors.
+Keep that working by only doing the fallback for the CSS cursor
+names, not for things like hashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760141
+---
+ gdk/x11/gdkcursor-x11.c | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
+index 540f48e..d619f58 100644
+--- a/gdk/x11/gdkcursor-x11.c
++++ b/gdk/x11/gdkcursor-x11.c
+@@ -611,17 +611,23 @@ static const struct {
+ const gchar *css_name, *traditional_name;
+ } name_map[] = {
+ { "default", "left_ptr" },
++ { "help", "left_ptr" },
++ { "context-menu", "left_ptr" },
+ { "pointer", "hand" },
+ { "progress", "left_ptr_watch" },
+ { "wait", "watch" },
+ { "cell", "crosshair" },
+ { "crosshair", "cross" },
+ { "text", "xterm" },
++ { "vertical-text","xterm" },
+ { "alias", "dnd-link" },
+ { "copy", "dnd-copy" },
++ { "move", "dnd-move" },
+ { "no-drop", "dnd-none" },
+ { "not-allowed", "crossed_circle" },
+ { "grab", "hand2" },
++ { "grabbing", "hand2" },
++ { "all-scroll", "left_ptr" },
+ { "col-resize", "h_double_arrow" },
+ { "row-resize", "v_double_arrow" },
+ { "n-resize", "top_side" },
+@@ -636,6 +642,8 @@ static const struct {
+ { "ns-resize", "v_double_arrow" },
+ { "nesw-resize", "fd_double_arrow" },
+ { "nwse-resize", "bd_double_arrow" },
++ { "zoom-in", "left_ptr" },
++ { "zoom-out", "left_ptr" },
+ { NULL, NULL }
+ };
+
+@@ -650,7 +658,7 @@ name_fallback (const gchar *name)
+ return name_map[i].traditional_name;
+ }
+
+- return "left_ptr";
++ return NULL;
+ }
+
+ GdkCursor*
+@@ -683,9 +691,17 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay *display,
+ xdisplay = GDK_DISPLAY_XDISPLAY (display);
+ xcursor = XcursorLibraryLoadCursor (xdisplay, name);
+ if (xcursor == None)
+- xcursor = XcursorLibraryLoadCursor (xdisplay, name_fallback (name));
+- if (xcursor == None)
+- xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
++ {
++ const char *fallback;
++
++ fallback = name_fallback (name);
++ if (fallback)
++ {
++ xcursor = XcursorLibraryLoadCursor (xdisplay, fallback);
++ if (xcursor == None)
++ xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
++ }
++ }
+ if (xcursor == None)
+ return NULL;
+ }
+--
+2.7.0
+
Copied: gtk3/repos/extra-x86_64/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch (from rev 257627, gtk3/trunk/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch)
===================================================================
--- extra-x86_64/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch (rev 0)
+++ extra-x86_64/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,94 @@
+From 81a287478a4db9ce650cc764474b9c173b137dee Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Wed, 6 Jan 2016 14:56:06 -0500
+Subject: [PATCH 2/2] wayland: Only do cursor name fallback for standard names
+
+Always returning a left_ptr if we can't find anything better
+broke firefox application-specific fallback for missing cursors.
+Keep that working by only doing the fallback for the CSS cursor
+names, not for things like hashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760141
+---
+ gdk/wayland/gdkcursor-wayland.c | 29 +++++++++++++++++++++--------
+ 1 file changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
+index 8aee5ae..bdfa316 100644
+--- a/gdk/wayland/gdkcursor-wayland.c
++++ b/gdk/wayland/gdkcursor-wayland.c
+@@ -87,17 +87,23 @@ static const struct {
+ const gchar *css_name, *traditional_name;
+ } name_map[] = {
+ { "default", "left_ptr" },
++ { "help", "left_ptr" },
++ { "context-menu", "left_ptr" },
+ { "pointer", "hand" },
+ { "progress", "left_ptr_watch" },
+ { "wait", "watch" },
+ { "cell", "crosshair" },
+ { "crosshair", "cross" },
+ { "text", "xterm" },
++ { "vertical-text","xterm" },
+ { "alias", "dnd-link" },
+ { "copy", "dnd-copy" },
++ { "move", "dnd-move" },
+ { "no-drop", "dnd-none" },
+ { "not-allowed", "crossed_circle" },
+ { "grab", "hand2" },
++ { "grabbing", "hand2" },
++ { "all-scroll", "left_ptr" },
+ { "col-resize", "h_double_arrow" },
+ { "row-resize", "v_double_arrow" },
+ { "n-resize", "top_side" },
+@@ -112,6 +118,8 @@ static const struct {
+ { "ns-resize", "v_double_arrow" },
+ { "nesw-resize", "fd_double_arrow" },
+ { "nwse-resize", "bd_double_arrow" },
++ { "zoom-in", "left_ptr" },
++ { "zoom-out", "left_ptr" },
+ { NULL, NULL }
+ };
+
+@@ -126,7 +134,7 @@ name_fallback (const gchar *name)
+ return name_map[i].traditional_name;
+ }
+
+- return "left_ptr";
++ return NULL;
+ }
+
+ static gboolean
+@@ -144,17 +152,22 @@ _gdk_wayland_cursor_update (GdkWaylandDisplay *wayland_display,
+ cursor->scale);
+ c = wl_cursor_theme_get_cursor (theme, cursor->name);
+ if (!c)
+- c = wl_cursor_theme_get_cursor (theme, name_fallback (cursor->name));
++ {
++ const char *fallback;
++
++ fallback = name_fallback (cursor->name);
++ if (fallback)
++ {
++ c = wl_cursor_theme_get_cursor (theme, name_fallback (cursor->name));
++ if (!c)
++ c = wl_cursor_theme_get_cursor (theme, "left_ptr");
++ }
++ }
+
+ if (!c)
+ {
+ g_warning (G_STRLOC ": Unable to load %s from the cursor theme", cursor->name);
+-
+- /* return the left_ptr cursor as a fallback */
+- c = wl_cursor_theme_get_cursor (theme, "left_ptr");
+-
+- if (!c)
+- return FALSE;
++ return FALSE;
+ }
+
+ cursor->wl_cursor = c;
+--
+2.7.0
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-x86_64/PKGBUILD 2016-01-08 02:36:14 UTC (rev 257628)
@@ -1,65 +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.18.6
-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)
-makedepends=(gobject-introspection libcanberra)
-license=(LGPL)
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- settings.ini)
-sha256sums=('78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
-
-prepare() {
- cd gtk+-$pkgver
-}
-
-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"
-
- # 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)
- install=gtk-update-icon-cache.install
-
- cd gtk+-$pkgver/gtk
- install -Dm755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-# vim:set et sw=4:
Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 257627, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,74 @@
+# $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.18.6
+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)
+makedepends=(gobject-introspection libcanberra)
+license=(LGPL)
+source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
+ 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
+ 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
+ settings.ini)
+sha256sums=('78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef'
+ '0402c3b7801810beb0f24ad20e4fb2eb7519cf3984f39e093a6e2752a0f7d9de'
+ '94722b06284e76f628fc8933617ac19c14f6775a5250fe3c382defab63d7b10e'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
+
+prepare() {
+ cd gtk+-$pkgver
+
+ # Fix zoom in/out cursors in GTK3 builds of Firefox
+ # https://bugzilla.gnome.org/show_bug.cgi?id=760141
+ patch -Np1 -i ../0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
+ patch -Np1 -i ../0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
+}
+
+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"
+
+ # 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)
+ install=gtk-update-icon-cache.install
+
+ cd gtk+-$pkgver/gtk
+ install -Dm755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+# vim:set et sw=4:
Deleted: extra-x86_64/gtk-update-icon-cache.install
===================================================================
--- extra-x86_64/gtk-update-icon-cache.install 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-x86_64/gtk-update-icon-cache.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -1,3 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.install (from rev 257627, gtk3/trunk/gtk-update-icon-cache.install)
===================================================================
--- extra-x86_64/gtk-update-icon-cache.install (rev 0)
+++ extra-x86_64/gtk-update-icon-cache.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,3 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-x86_64/gtk3.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -1,18 +0,0 @@
-post_install() {
- /usr/bin/gtk-query-immodules-3.0 --update-cache
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
- /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
- /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 257627, gtk3/trunk/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install (rev 0)
+++ extra-x86_64/gtk3.install 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,18 @@
+post_install() {
+ /usr/bin/gtk-query-immodules-3.0 --update-cache
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+
+post_remove() {
+ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+ /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini 2016-01-08 02:35:57 UTC (rev 257627)
+++ extra-x86_64/settings.ini 2016-01-08 02:36:14 UTC (rev 257628)
@@ -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 257627, gtk3/trunk/settings.ini)
===================================================================
--- extra-x86_64/settings.ini (rev 0)
+++ extra-x86_64/settings.ini 2016-01-08 02:36:14 UTC (rev 257628)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
More information about the arch-commits
mailing list