- up to 1.11.3.902

Changed files:
    xorg-xserver-server-build.patch -> 1.5
    xorg-xserver-server.spec -> 1.298

diff --git a/xorg-xserver-server-build.patch b/xorg-xserver-server-build.patch
deleted file mode 100644 (file)
index a63a1bb..0000000
--- a/xorg-xserver-server-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- xorg-server-1.11.3/hw/kdrive/linux/keyboard.c.org  2011-12-17 08:32:26.955371326 +0100
-+++ xorg-server-1.11.3/hw/kdrive/linux/keyboard.c      2011-12-17 08:32:45.179135298 +0100
-@@ -692,7 +692,7 @@
-         return !Success;
- 
-     fd = LinuxConsoleFd;
--    ki->driverPrivate = (void *) fd;
-+    ki->driverPrivate = (void *) (intptr_t) fd;
- 
-     ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
-     tcgetattr (fd, &LinuxTermios);
-@@ -724,7 +724,7 @@
-     if (!ki)
-         return;
- 
--    fd = (int) ki->driverPrivate;
-+    fd = (int) (intptr_t) ki->driverPrivate;
- 
-     KdUnregisterFd(ki, fd, FALSE);
-     ioctl(fd, KDSKBMODE, LinuxKbdTrans);
-@@ -753,7 +753,7 @@
-     if (!ki)
-         return;
- 
--    ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7);
-+    ioctl ((int) (intptr_t)ki->driverPrivate, KDSETLED, leds & 7);
- }
- 
- KdKeyboardDriver LinuxKeyboardDriver = {
---- xorg-server-1.11.3/hw/kdrive/linux/ms.c.org        2011-12-17 08:33:00.929507448 +0100
-+++ xorg-server-1.11.3/hw/kdrive/linux/ms.c    2011-12-17 08:33:21.106650997 +0100
-@@ -152,7 +152,7 @@
-     }
-     if (KdRegisterFd (port, MsRead, pi))
-       return TRUE;
--    pi->driverPrivate = (void *)port;
-+    pi->driverPrivate = (void *) (intptr_t)port;
- 
-     return Success;
- 
-@@ -164,7 +164,7 @@
- static void
- MsDisable (KdPointerInfo *pi)
- {
--    KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
-+    KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
- }
- 
- static void
---- xorg-server-1.11.3/hw/kdrive/linux/ps2.c.org       2011-12-17 08:33:34.930310934 +0100
-+++ xorg-server-1.11.3/hw/kdrive/linux/ps2.c   2011-12-17 08:33:53.580751546 +0100
-@@ -159,7 +159,7 @@
-         return BadAlloc;
-     }
- 
--    pi->driverPrivate = (void *)fd;
-+    pi->driverPrivate = (void *)(intptr_t)fd;
- 
-     return Success;
- }
-@@ -168,7 +168,7 @@
- static void
- Ps2Disable (KdPointerInfo *pi)
- {
--    KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
-+    KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
- }
- 
- static void

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index c40b2e499ff2cce57680c2c56b83e04c6314b983..0d3b64821a050a4587e69e84afc73751adaeaeec 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -25,12 +25,12 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.11.3
+Version:       1.11.3.902
 Release:       %{rel}%{?with_multigl:.mgl}
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: a7194c437963627e1db0dd2d6c1a1984
+# Source0-md5: 5cb5980c85fc2e84f9bcfb9bd8d34ce1
 Source1:       10-quirks.conf
 Source2:       xserver.pamd
 Source10:      %{name}-Xvfb.init
@@ -42,7 +42,6 @@ Patch3:               %{name}-less-acpi-brokenness.patch
 Patch4:                %{name}-builtin-SHA1.patch
 Patch5:                %{name}-export-GetMaster.patch
 Patch6:                110_nvidia_slowdow_fix.patch
-Patch7:                %{name}-build.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -385,7 +384,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h