Hello community, here is the log from the commit of package xorg-x11-server checked in at Wed Oct 3 17:06:01 CEST 2007. -------- --- xorg-x11-server/xorg-x11-server.changes 2007-09-29 18:37:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2007-10-03 14:53:14.965543000 +0200 @@ -1,0 +2,19 @@ +Wed Oct 3 14:55:42 CEST 2007 - sndirsch@suse.de + +- 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. (Bug #245711) + +------------------------------------------------------------------- +Wed Oct 3 14:12:03 CEST 2007 - sndirsch@suse.de + +- added missing ia64Pci.h; required for IA64 + +------------------------------------------------------------------- +Wed Oct 3 13:41:42 CEST 2007 - sndirsch@suse.de + +- recreated p_pci-off-by-one.diff.ia64; the default fuzz factor of + patch (2) resulted in a hunk applied to the wrong function and + therefore broke the build :-( + +------------------------------------------------------------------- New: ---- ia64Pci.h xserver-1.3.0-xkb-and-loathing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.Ih5750/_old 2007-10-03 17:05:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Ih5750/_new 2007-10-03 17:05:49.000000000 +0200 @@ -21,7 +21,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 1 +Release: 2 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -46,6 +46,7 @@ %endif Source7: xorg-docs-1.4.tar.bz2 Source8: xorg.conf.man-070818.tar +Source9: ia64Pci.h Patch: 64bit.diff Patch1: fpic.diff Patch2: p_default-module-path.diff @@ -86,6 +87,7 @@ Patch77: fbdevhw.diff Patch79: edit_data_sanity_check.diff Patch80: pixman.diff +Patch81: xserver-1.3.0-xkb-and-loathing.patch Patch334: p_pci-domain.diff %description @@ -141,6 +143,8 @@ %endif %prep %setup -q -n xorg-server-%{dirsuffix} -b1 -a4 -a7 -a8 +test -s hw/xfree86/os-support/shared/ia64Pci.h || \ + cp $RPM_SOURCE_DIR/ia64Pci.h hw/xfree86/os-support/shared/ia64Pci.h # make legal department happy (Bug #204110) test -f ../Mesa-7.0.1/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 test -f ../Mesa-7.0.1/progs/ggi/asc-view.c && exit 1 @@ -199,6 +203,7 @@ %patch77 %patch79 -p1 %patch80 +%patch81 -p1 %build pushd xorg-docs-* @@ -529,6 +534,16 @@ /usr/bin/Xvnc %endif %changelog +* Wed Oct 03 2007 - sndirsch@suse.de +- 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. (Bug #245711) +* Wed Oct 03 2007 - sndirsch@suse.de +- added missing ia64Pci.h; required for IA64 +* Wed Oct 03 2007 - sndirsch@suse.de +- recreated p_pci-off-by-one.diff.ia64; the default fuzz factor of + patch (2) resulted in a hunk applied to the wrong function and + therefore broke the build :-( * Sat Sep 29 2007 - sndirsch@suse.de - xorg-server 1.4 * Welcome to X.Org X Server 1.4, now with hotplugging input to go ++++++ p_pci-off-by-one.diff.ia64 ++++++ --- /var/tmp/diff_new_pack.Ih5750/_old 2007-10-03 17:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Ih5750/_new 2007-10-03 17:05:50.000000000 +0200 @@ -1,7 +1,7 @@ ---- hw/xfree86/os-support/bus/linuxPci.c -+++ hw/xfree86/os-support/bus/linuxPci.c -@@ -550,7 +550,7 @@ xf86GetPciDomain(PCITAG Tag) - return result; +--- hw/xfree86/os-support/bus/linuxPci.c.orig 2007-08-23 21:04:53.000000000 +0200 ++++ hw/xfree86/os-support/bus/linuxPci.c 2007-10-03 13:31:32.647167750 +0200 +@@ -547,7 +547,7 @@ xf86GetPciDomain(PCITAG Tag) + return result + 1; if (!pPCI || pPCI->fakeDevice) - return 1; /* Domain 0 is reserved */ @@ -9,7 +9,7 @@ if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) return 0; -@@ -558,7 +558,7 @@ xf86GetPciDomain(PCITAG Tag) +@@ -555,7 +555,7 @@ xf86GetPciDomain(PCITAG Tag) if ((result = ioctl(fd, PCIIOC_CONTROLLER, 0)) < 0) return 0; @@ -18,7 +18,7 @@ } static pointer -@@ -628,7 +628,7 @@ linuxMapPci(int ScreenNum, int Flags, PC +@@ -626,7 +626,7 @@ linuxMapPci(int ScreenNum, int Flags, PC return NULL; } @@ -27,7 +27,7 @@ static pointer DomainMmappedIO[MAX_DOMAINS]; static int -@@ -649,11 +649,10 @@ linuxOpenLegacy(PCITAG Tag, char *name) +@@ -647,11 +647,10 @@ linuxOpenLegacy(PCITAG Tag, char *name) domain = xf86GetPciDomain(Tag); bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); @@ -41,15 +41,15 @@ fd = open(path, O_RDWR); if (fd >= 0) { xfree(path); -@@ -685,7 +684,6 @@ _X_EXPORT pointer +@@ -683,7 +682,6 @@ _X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { - int domain = xf86GetPciDomain(Tag); - int fd; + int fd = -1; pointer addr; -@@ -733,7 +731,7 @@ xf86MapDomainIO(int ScreenNum, int Flags +@@ -731,7 +729,7 @@ xf86MapDomainIO(int ScreenNum, int Flags int domain = xf86GetPciDomain(Tag); int fd; ++++++ xserver-1.3.0-xkb-and-loathing.patch ++++++ --- 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; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org