From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 1 Feb 2011 12:42:45 +0000 (+0000)
Subject: - removed rh611677-generate_modkeymap-max_keys patch (aplied in xserver 1.9.3)
X-Git-Tag: auto/th/tigervnc-1_0_90-11~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftigervnc.git;a=commitdiff_plain;h=0afef7c90e6353ecfa328229736b90988520470b

- removed rh611677-generate_modkeymap-max_keys patch (aplied in xserver 1.9.3)
- bump xserver BR

Changed files:
    tigervnc-rh611677-generate_modkeymap-max_keys.patch -> 1.2
    tigervnc.spec -> 1.20
---

diff --git a/tigervnc-rh611677-generate_modkeymap-max_keys.patch b/tigervnc-rh611677-generate_modkeymap-max_keys.patch
deleted file mode 100644
index 1c03169..0000000
--- a/tigervnc-rh611677-generate_modkeymap-max_keys.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 3fae47581a47613f1117b8794ae37b75ace73f3e Mon Sep 17 00:00:00 2001
-From: Adam Tkac <atkac@redhat.com>
-Date: Tue, 24 Aug 2010 17:21:30 +0200
-Subject: [PATCH] Return Success from generate_modkeymap() when max_keys_per_mod is zero.
-
-max_keys_per_mod equal to zero is a valid situation so generate_modkeymap
-should not return BadAlloc in this case.
-
-Signed-off-by: Adam Tkac <atkac@redhat.com>
----
- dix/inpututils.c |   24 +++++++++++++-----------
- 1 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/dix/inpututils.c b/dix/inpututils.c
-index 8ec80b5..6693c67 100644
---- a/dix/inpututils.c
-+++ b/dix/inpututils.c
-@@ -286,7 +286,7 @@ int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
- {
-     CARD8 keys_per_mod[8];
-     int max_keys_per_mod;
--    KeyCode *modkeymap;
-+    KeyCode *modkeymap = NULL;
-     int i, j, ret;
- 
-     ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixGetAttrAccess);
-@@ -310,18 +310,20 @@ int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
-         }
-     }
- 
--    modkeymap = calloc(max_keys_per_mod * 8, sizeof(KeyCode));
--    if (!modkeymap)
--        return BadAlloc;
-+    if (max_keys_per_mod != 0) {
-+        modkeymap = calloc(max_keys_per_mod * 8, sizeof(KeyCode));
-+        if (!modkeymap)
-+            return BadAlloc;
- 
--    for (i = 0; i < 8; i++)
--        keys_per_mod[i] = 0;
-+        for (i = 0; i < 8; i++)
-+            keys_per_mod[i] = 0;
- 
--    for (i = 8; i < MAP_LENGTH; i++) {
--        for (j = 0; j < 8; j++) {
--            if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) {
--                modkeymap[(j * max_keys_per_mod) + keys_per_mod[j]] = i;
--                keys_per_mod[j]++;
-+        for (i = 8; i < MAP_LENGTH; i++) {
-+            for (j = 0; j < 8; j++) {
-+                if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) {
-+                    modkeymap[(j * max_keys_per_mod) + keys_per_mod[j]] = i;
-+                    keys_per_mod[j]++;
-+                }
-             }
-         }
-     }
--- 
-1.7.2.2
-
diff --git a/tigervnc.spec b/tigervnc.spec
index 7768a39..f326548 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -2,7 +2,7 @@
 # - tigervnc.init
 
 %define		snap		r4159
-%define		xversion	1.9
+%define		xversion	1.9.3
 
 Summary:	A TigerVNC remote display system
 Summary(pl.UTF-8):	System zdalnego dostępu TigerVNC
@@ -18,7 +18,6 @@ Source1:	%{name}.desktop
 Patch0:		tigervnc-cookie.patch
 Patch1:		tigervnc-ldnow.patch
 Patch2:		tigervnc-rh102434.patch
-Patch3:		tigervnc-rh611677-generate_modkeymap-max_keys.patch
 Patch4:		tigervnc-rh611677.patch
 Patch5:		tigervnc-rh633931.patch
 Patch6:		tigervnc-viewer-reparent.patch
@@ -179,7 +178,6 @@ pozwalający na zdalny dostęp do pulpitu.
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
 patch -p1 <../xserver19.patch
-%patch3 -p1
 
 %build
 %{__gettextize}