rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Apr 30 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-3

Browse Source 
- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM
  around calls to Popen()/Pclose().  Fixes a hang in openoffice when
  opening menus.
- Modify BuildRequires to use the virtual protocol Provides.
This commit is contained in:
Adam Jackson 2007-04-30 22:10:31 +00:00
parent 0e24bd8706
commit 78e07cfbea
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xorg-x11-server.spec
View File

@ -9,7 +9,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.3.0.0
Release: 2%{?dist}
Release: 3%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@ -30,6 +30,7 @@ Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch
Patch18: xorg-x11-server-1.1.1-glcore-visual-matching.patch
Patch19: xserver-1.3.0-xnest-exposures.patch
Patch20: xserver-1.3.0-x86emu-imul-int64.patch
Patch21: xserver-1.3.0-xkb-and-loathing.patch
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@ -90,7 +91,14 @@ BuildRequires: automake autoconf libtool
BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.1.5
BuildRequires: xorg-x11-proto-devel >= 7.1-11
BuildRequires: randrproto >= 1.2
BuildRequires: fixesproto >= 4.0
BuildRequires: damageproto >= 1.1
BuildRequires: scrnsaverproto >= 1.1
BuildRequires: kbproto >= 1.0.3
BuildRequires: xorg-x11-xtrans-devel
BuildRequires: libXfont-devel
BuildRequires: libXau-devel
@ -267,6 +275,7 @@ Xserver source code needed to build VNC server (Xvnc)
%patch18 -p1 -b .glcore-visual
%patch19 -p1 -b .xnest-expose
%patch20 -p1 -b .x86emu-imul
%patch21 -p1 -b .xkb-signal-loathing
%patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none
@ -557,6 +566,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Apr 30 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-3
- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM
around calls to Popen()/Pclose(). Fixes a hang in openoffice when
opening menus.
- Modify BuildRequires to use the virtual protocol Provides.
* Wed Apr 25 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-2
- xserver-1.3.0-less-randr-fakerama.patch: Disable RANDR's fake Xinerama
geometry when there's more than one protocol screen. (#231257)

36
xserver-1.3.0-xkb-and-loathing.patch Normal file
View File

@ -0,0 +1,36 @@
--- xorg-server-1.3.0.0/os/utils.c.jx 2007-04-25 13:28:05.000000000 -0400
+++ xorg-server-1.3.0.0/os/utils.c 2007-04-30 14:33:04.000000000 -0400
@@ -1725,6 +1725,8 @@
int pid;
} *pidlist;
+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
+
pointer
Popen(char *command, char *type)
{
@@ -1746,11 +1748,15 @@
return NULL;
}
+ /* Ignore the smart scheduler while this is going on */
+ old_alarm = signal(SIGALRM, SIG_IGN);
+
switch (pid = fork()) {
case -1: /* error */
close(pdes[0]);
close(pdes[1]);
xfree(cur);
+ signal(SIGALRM, old_alarm);
return NULL;
case 0: /* child */
if (setgid(getgid()) == -1)
@@ -1926,6 +1932,8 @@
/* allow EINTR again */
OsReleaseSignals ();
+ signal(SIGALRM, old_alarm);
+
return pid == -1 ? -1 : pstat;
}