From 8a5fdeae40dc26a108407ac1c69d0803b9256f594d135ceea3aa981ebdd60511 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 13 Dec 2007 13:12:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=60 --- p_xkills_wrong_client.diff | 21 ++++++++------------- xorg-server-1.4.0.90.tar.bz2 | 3 +++ xorg-server-1.4.tar.bz2 | 3 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 8 +++++--- 5 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 xorg-server-1.4.0.90.tar.bz2 delete mode 100644 xorg-server-1.4.tar.bz2 diff --git a/p_xkills_wrong_client.diff b/p_xkills_wrong_client.diff index 4bd63fb..8e334e9 100644 --- a/p_xkills_wrong_client.diff +++ b/p_xkills_wrong_client.diff @@ -1,16 +1,11 @@ -Index: programs/Xserver/os/connection.c -=================================================================== -RCS file: /work/cvsdir/cvs/xc/programs/Xserver/os/connection.c,v -retrieving revision 1.1.1.35 -diff -u -r1.1.1.35 connection.c ---- programs/Xserver/os/connection.c 13 Sep 2005 10:31:37 -0000 1.1.1.35 -+++ programs/Xserver/os/connection.c 1 Mar 2006 11:00:20 -0000 -@@ -1134,7 +1134,7 @@ - FD_ZERO(&tmask); - FD_SET(curclient, &tmask); - r = Select (curclient + 1, &tmask, NULL, NULL, ¬ime); +--- os/connection.c.orig 2007-12-12 23:14:52.787902250 +0100 ++++ os/connection.c 2007-12-12 23:16:10.600765250 +0100 +@@ -1009,7 +1009,7 @@ + do { + r = Select (curclient + 1, &tmask, NULL, NULL, ¬ime); + } while (r < 0 && (errno == EINTR || errno == EAGAIN)); - if (r < 0) + if (r < 0 && (errno == EBADF)) - CloseDownClient(clients[ConnectionTranslation[curclient]]); + if (ConnectionTranslation[curclient] > 0) + CloseDownClient(clients[ConnectionTranslation[curclient]]); mask &= ~((fd_mask)1 << curoff); - } diff --git a/xorg-server-1.4.0.90.tar.bz2 b/xorg-server-1.4.0.90.tar.bz2 new file mode 100644 index 0000000..4feabb6 --- /dev/null +++ b/xorg-server-1.4.0.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe +size 6315011 diff --git a/xorg-server-1.4.tar.bz2 b/xorg-server-1.4.tar.bz2 deleted file mode 100644 index d01684e..0000000 --- a/xorg-server-1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -size 6179392 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 18fe661..c1e5940 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 12 23:30:09 CET 2007 - sndirsch@suse.de + +- xorg-server 1.4.0.90 (prerelease of 1.4.1) + ------------------------------------------------------------------- Fri Nov 30 22:29:25 CET 2007 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 72b0248..bc80166 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -11,7 +11,7 @@ # norootforbuild Name: xorg-x11-server -%define dirsuffix 1.4 +%define dirsuffix 1.4.0.90 %define fglrx_driver_hack 0 %define vnc 1 BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel @@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 36 +Release: 38 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -178,7 +178,7 @@ mv mfbmodule.c hw/xfree86/xf1bpp %patch11 #%patch12 -p2 %patch13 -%patch14 -p2 +%patch14 %patch16 -p2 pushd hw/xfree86/os-support %patch18 @@ -553,6 +553,8 @@ exit 0 %endif %changelog +* Wed Dec 12 2007 - sndirsch@suse.de +- xorg-server 1.4.0.90 (prerelease of 1.4.1) * Fri Nov 30 2007 - sndirsch@suse.de - pixman.diff * fixed include path for pixman.h