[arch-commits] Commit in lib32-gtk3/repos/multilib-x86_64 (6 files)
Maxime Gauduin
alucryd at archlinux.org
Sat Jan 30 08:43:03 UTC 2016
Date: Saturday, January 30, 2016 @ 09:43:02
Author: alucryd
Revision: 159475
archrelease: copy trunk to multilib-x86_64
Added:
lib32-gtk3/repos/multilib-x86_64/PKGBUILD
(from rev 159474, lib32-gtk3/trunk/PKGBUILD)
lib32-gtk3/repos/multilib-x86_64/gtk3.install
(from rev 159474, lib32-gtk3/trunk/gtk3.install)
Deleted:
lib32-gtk3/repos/multilib-x86_64/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
lib32-gtk3/repos/multilib-x86_64/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
lib32-gtk3/repos/multilib-x86_64/PKGBUILD
lib32-gtk3/repos/multilib-x86_64/gtk3.install
-----------------------------------------------------------------+
0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch | 85 -------
0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch | 94 --------
PKGBUILD | 111 ++++------
gtk3.install | 26 +-
4 files changed, 63 insertions(+), 253 deletions(-)
Deleted: 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
===================================================================
--- 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch 2016-01-30 08:42:53 UTC (rev 159474)
+++ 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch 2016-01-30 08:43:02 UTC (rev 159475)
@@ -1,85 +0,0 @@
-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
-
Deleted: 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
===================================================================
--- 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 2016-01-30 08:42:53 UTC (rev 159474)
+++ 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 2016-01-30 08:43:02 UTC (rev 159475)
@@ -1,94 +0,0 @@
-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: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-30 08:42:53 UTC (rev 159474)
+++ PKGBUILD 2016-01-30 08:43:02 UTC (rev 159475)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: josephgbr <rafael.f.f1 at gmail.com>
-# Contributor: GordonGR <ntheo1979 at gmail.com>
-
-pkgname=lib32-gtk3
-pkgver=3.18.6
-pkgrel=1
-pkgdesc='GObject-based multi-platform GUI toolkit (v3)'
-arch=('x86_64')
-license=('LGPL')
-url='http://www.gtk.org/'
-depends=('gtk3' 'lib32-at-spi2-atk' 'lib32-colord' 'lib32-gdk-pixbuf2'
- 'lib32-json-glib' 'lib32-libcups' 'lib32-libepoxy' 'lib32-librsvg'
- 'lib32-libxcomposite' 'lib32-libxcursor' 'lib32-libxinerama'
- 'lib32-libxkbcommon' 'lib32-libxrandr' 'lib32-pango' 'lib32-rest')
-makedepends=('gcc-multilib' 'gobject-introspection')
-install='gtk3.install'
-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')
-sha256sums=('78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef'
- '0402c3b7801810beb0f24ad20e4fb2eb7519cf3984f39e093a6e2752a0f7d9de'
- '94722b06284e76f628fc8933617ac19c14f6775a5250fe3c382defab63d7b10e')
-
-prepare() {
- cd gtk+-${pkgver}
-
- 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}
-
- export CC='gcc -m32'
- export CXX='/bin/false'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
- ./configure \
- --prefix='/usr' \
- --libdir='/usr/lib32' \
- --localstatedir='/var' \
- --sysconfdir='/etc' \
- --enable-{broadway,wayland,x11}-backend \
- --disable-libcanberra \
- --disable-schemas-compile
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd gtk+-${pkgver}
-
- make DESTDIR="${pkgdir}" install
- mv "${pkgdir}"/usr/bin/gtk-query-immodules-3.0{,-32}
- rm "${pkgdir}"/usr/bin/{broadwayd,gtk-{builder-tool,encode-symbolic-svg,launch,update-icon-cache},gtk3-{demo,demo-application,icon-browser,widget-factory}}
- rm -rf "${pkgdir}"/{etc,usr/{include,share}}
-}
-
-# vim: ts=2 sw=2 et:
Copied: lib32-gtk3/repos/multilib-x86_64/PKGBUILD (from rev 159474, lib32-gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-01-30 08:43:02 UTC (rev 159475)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+# Contributor: GordonGR <ntheo1979 at gmail.com>
+
+pkgname=lib32-gtk3
+pkgver=3.18.7
+pkgrel=1
+pkgdesc='GObject-based multi-platform GUI toolkit (v3)'
+arch=('x86_64')
+license=('LGPL')
+url='http://www.gtk.org/'
+depends=('gtk3' 'lib32-at-spi2-atk' 'lib32-colord' 'lib32-gdk-pixbuf2'
+ 'lib32-json-glib' 'lib32-libcups' 'lib32-libepoxy' 'lib32-librsvg'
+ 'lib32-libxcomposite' 'lib32-libxcursor' 'lib32-libxinerama'
+ 'lib32-libxkbcommon' 'lib32-libxrandr' 'lib32-pango' 'lib32-rest')
+makedepends=('gcc-multilib' 'gobject-introspection')
+install='gtk3.install'
+source=("https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz")
+sha256sums=('a76e1cb0ac45ce5c2734f6778f2731a5c6a23d1ff6bd4db357774f014ee68820')
+
+build() {
+ cd gtk+-${pkgver}
+
+ export CC='gcc -m32'
+ export CXX='/bin/false'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+ ./configure \
+ --prefix='/usr' \
+ --libdir='/usr/lib32' \
+ --localstatedir='/var' \
+ --sysconfdir='/etc' \
+ --enable-{broadway,wayland,x11}-backend \
+ --disable-libcanberra \
+ --disable-schemas-compile
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd gtk+-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ mv "${pkgdir}"/usr/bin/gtk-query-immodules-3.0{,-32}
+ rm "${pkgdir}"/usr/bin/{broadwayd,gtk-{builder-tool,encode-symbolic-svg,launch,update-icon-cache},gtk3-{demo,demo-application,icon-browser,widget-factory}}
+ rm -rf "${pkgdir}"/{etc,usr/{include,share}}
+}
+
+# vim: ts=2 sw=2 et:
Deleted: gtk3.install
===================================================================
--- gtk3.install 2016-01-30 08:42:53 UTC (rev 159474)
+++ gtk3.install 2016-01-30 08:43:02 UTC (rev 159475)
@@ -1,13 +0,0 @@
-post_install() {
- GTK_PATH=/usr/lib32/gtk-3.0 /usr/bin/gtk-query-immodules-3.0-32 --update-cache
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f /usr/lib32/gtk-3.0/3.0.0/immodules.cache
-}
-
-# vim: ts=2 sw=2 et:
Copied: lib32-gtk3/repos/multilib-x86_64/gtk3.install (from rev 159474, lib32-gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install (rev 0)
+++ gtk3.install 2016-01-30 08:43:02 UTC (rev 159475)
@@ -0,0 +1,13 @@
+post_install() {
+ GTK_PATH=/usr/lib32/gtk-3.0 /usr/bin/gtk-query-immodules-3.0-32 --update-cache
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /usr/lib32/gtk-3.0/3.0.0/immodules.cache
+}
+
+# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list