[gentoo-commits] gentoo-x86 commit in dev-libs/libwacom/files: libwacom-0.5-eraser.patch libwacom-0.5-eraser-bamboo.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/libwacom/files: libwacom-0.5-eraser.patch libwacom-0.5-eraser-bamboo.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    12/05/19 08:43:58

  Added:                libwacom-0.5-eraser.patch
                        libwacom-0.5-eraser-bamboo.patch
  Log:
  Version bump for bug #416363, thanks to Christoph Brill (egore). Now properly installs udev rules.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-libs/libwacom/files/libwacom-0.5-eraser.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libwacom/files/libwacom-0.5-eraser.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libwacom/files/libwacom-0.5-eraser.patch?rev=1.1&content-type=text/plain

Index: libwacom-0.5-eraser.patch
===================================================================
From 17eb272e0cc6dd8404d210770ab9c2c0c9624a09 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 2 May 2012 16:57:04 +0100
Subject: [PATCH] lib: Fix generic stylus missing an eraser

HasEraser=yes, but we didn't add an eraser for the stylus,
leading to bugs in the display UI for consumer products.

https://bugzilla.gnome.org/show_bug.cgi?id=675299
---
 libwacom/libwacom-database.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
index 0c60d6d..9fc9e35 100644
--- a/libwacom/libwacom-database.c
+++ b/libwacom/libwacom-database.c
@@ -369,9 +369,10 @@ libwacom_parse_tablet_keyfile(const char *path)
 		g_strfreev (styli_list);
 		device->supported_styli = (int *) g_array_free (array, FALSE);
 	} else {
-		device->supported_styli = g_new (int, 1);
-		*device->supported_styli = 0xfffff;
-		device->num_styli = 1;
+		device->supported_styli = g_new (int, 2);
+		device->supported_styli[0] = WACOM_STYLUS_FALLBACK_ID;
+		device->supported_styli[1] = WACOM_ERASER_FALLBACK_ID;
+		device->num_styli = 2;
 	}
 
 	/* Features */
-- 
1.7.8.6




1.1                  dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libwacom/files/libwacom-0.5-eraser-bamboo.patch?rev=1.1&content-type=text/plain

Index: libwacom-0.5-eraser-bamboo.patch
===================================================================
From f2845accd942e44238edf030f6bd918f9d88838e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 3 May 2012 09:24:32 +1000
Subject: [PATCH] data: add generic eraser to Bamboo Pen & Touch

Crashes gnome-control-center without it.

(gnome-control-center:18115): wacom-cc-panel-WARNING **: Could not set the
current stylus ID 0x0 for tablet 'Wacom Bamboo Pen & Touch', no general pen
found
wacom-cc-panel:ERROR:gsd-wacom-device.c:1491:gsd_wacom_device_set_current_stylus:
assertion failed: (device->priv->styli)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
---
 data/bamboo-pen-and-touch.tablet |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/data/bamboo-pen-and-touch.tablet b/data/bamboo-pen-and-touch.tablet
index 125db37..3fff338 100644
--- a/data/bamboo-pen-and-touch.tablet
+++ b/data/bamboo-pen-and-touch.tablet
@@ -13,7 +13,7 @@ Width=6
 Height=4
 
 # The other stylusses don't match it, it has two buttons and an eraser.
-Styli=0xfffff
+Styli=0xfffff;0xffffe;
 
 [Features]
 Stylus=true
-- 
1.7.8.6