commit xorg-x11-server for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Mon Mar 2 01:19:43 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-02-24 12:09:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2009-02-27 18:12:42.904194062 +0100 @@ -1,0 +2,14 @@ +Fri Feb 27 12:40:32 CET 2009 - sndirsch@suse.de + +- xorg-server 1.6.0 +- temporarily disabled build of Xvnc/libvnc.so +- obsoletes 64bit-portability-issue.diff, 64bit.diff, + commit-59f9fb4b8.diff, commit-a9e2030.diff, dga_cleanup.diff, + miPointerUpdate-crashfix.diff, p_mouse_misc.diff, + ps_showopts.diff, unplugged_monitor_crashfix.diff +- adjusted 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch, + bitmap_always_unscaled.diff, confine_to_shape.diff, fbdevhw.diff, + p_ia64-console.diff, randr1_1-sig11.diff, xephyr.diff, + xorg-server-xf4vnc.patch, zap_warning_xserver.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 64bit.diff 64bit-portability-issue.diff commit-59f9fb4b8.diff commit-a9e2030.diff dga_cleanup.diff miPointerUpdate-crashfix.diff p_mouse_misc.diff ps_showopts.diff unplugged_monitor_crashfix.diff xorg-server-1.5.2.tar.bz2 New: ---- xorg-server-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100 @@ -19,9 +19,10 @@ Name: xorg-x11-server -%define dirsuffix 1.5.2 +%define dirsuffix 1.6.0 %define fglrx_driver_hack 0 -%define vnc 1 +### FIXME +%define vnc 0 BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-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 %if %vnc BuildRequires: libjpeg-devel @@ -29,7 +30,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 27 +Release: 28 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -56,13 +57,10 @@ %endif Source7: xorg-docs-1.4.tar.bz2 Source8: xorg.conf.man-070818.tar -Patch: 64bit.diff Patch1: fpic.diff Patch2: p_default-module-path.diff Patch6: pu_fixes.diff -Patch7: p_mouse_misc.diff Patch8: p_bug96328.diff -Patch11: ps_showopts.diff Patch13: p_xorg_acpi.diff Patch14: p_xkills_wrong_client.diff Patch16: p_xnest-ignore-getimage-errors.diff @@ -101,16 +99,10 @@ Patch109: events.diff Patch112: fix-dpi-values.diff Patch113: no-return-in-nonvoid-function.diff -Patch114: 64bit-portability-issue.diff Patch117: acpi-warning.diff Patch118: exa-greedy.diff -Patch120: dga_cleanup.diff -Patch121: miPointerUpdate-crashfix.diff -Patch122: unplugged_monitor_crashfix.diff Patch123: vidmode-sig11.diff -Patch124: commit-59f9fb4b8.diff Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch -Patch126: commit-a9e2030.diff Patch127: dpms_screensaver.diff Patch128: pci-legacy-mem-fallback.diff Patch129: bug474071-fix1.diff @@ -172,13 +164,10 @@ %prep %setup -q -n xorg-server-%{dirsuffix} -a4 -a7 -a8 -%patch %patch1 %patch2 %patch6 -%patch7 -p2 %patch8 -p0 -%patch11 %patch13 %patch14 %patch16 -p2 @@ -224,16 +213,10 @@ %patch109 -p1 %patch112 -p0 %patch113 -p0 -%patch114 -p0 %patch117 %patch118 -p1 -%patch120 -p1 -%patch121 -p0 -%patch122 -p0 %patch123 -p0 -%patch124 -p1 %patch125 -p1 -%patch126 -p1 %patch127 -p1 %patch128 pushd hw/xfree86/os-support/bus @@ -509,19 +492,11 @@ /usr/bin/dmxwininfo %ifnarch s390 s390x /usr/bin/gtf -/usr/bin/inb -/usr/bin/inl -/usr/bin/inw -/usr/bin/ioport -/usr/bin/outb -/usr/bin/outl -/usr/bin/outw %endif /usr/bin/vdltodmx /usr/bin/xdmx /usr/bin/xdmxconfig %ifnarch s390 s390x -/usr/bin/xorgconfig /usr/%{_lib}/X11/* /usr/%{_lib}/xorg/modules/ %{_mandir}/man4/* @@ -570,6 +545,17 @@ %endif %changelog +* Fri Feb 27 2009 sndirsch@suse.de +- xorg-server 1.6.0 +- temporarily disabled build of Xvnc/libvnc.so +- obsoletes 64bit-portability-issue.diff, 64bit.diff, + commit-59f9fb4b8.diff, commit-a9e2030.diff, dga_cleanup.diff, + miPointerUpdate-crashfix.diff, p_mouse_misc.diff, + ps_showopts.diff, unplugged_monitor_crashfix.diff +- adjusted 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch, + bitmap_always_unscaled.diff, confine_to_shape.diff, fbdevhw.diff, + p_ia64-console.diff, randr1_1-sig11.diff, xephyr.diff, + xorg-server-xf4vnc.patch, zap_warning_xserver.diff * Tue Feb 24 2009 sndirsch@suse.de - bug474071-fix1.diff * fixes Xserver issue of bnc #474071 ++++++ 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100 @@ -10,41 +10,36 @@ hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index 710e787..c0b6124 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -466,17 +466,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev) - else - xf86DeleteInput(pInfo, 0); +--- xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c 2009-02-27 17:26:35.000000000 +0100 +@@ -675,17 +675,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD + else + xf86DeleteInput(pInfo, 0); -- /* devices added through HAL aren't in the config layout */ -- it = xf86ConfigLayout.inputs; -- while(*it && *it != idev) -- it++; +- /* devices added through HAL aren't in the config layout */ +- it = xf86ConfigLayout.inputs; +- while(*it && *it != idev) +- it++; - -- if (!(*it)) /* end of list, not in the layout */ -+ if (idev) - { -- xfree(idev->driver); -- xfree(idev->identifier); -- xf86optionListFree(idev->commonOptions); -- xfree(idev); -+ /* devices added through HAL aren't in the config layout */ -+ it = xf86ConfigLayout.inputs; -+ while(*it && *it != idev) -+ it++; +- if (!(*it)) /* end of list, not in the layout */ ++ if (idev) + { +- xfree(idev->driver); +- xfree(idev->identifier); +- xf86optionListFree(idev->commonOptions); +- xfree(idev); ++ /* devices added through HAL aren't in the config layout */ ++ it = xf86ConfigLayout.inputs; ++ while(*it && *it != idev) ++ it++; + -+ if (!(*it)) /* end of list, not in the layout */ -+ { -+ xfree(idev->driver); -+ xfree(idev->identifier); -+ xf86optionListFree(idev->commonOptions); -+ xfree(idev); -+ } ++ if (!(*it)) /* end of list, not in the layout */ ++ { ++ xfree(idev->driver); ++ xfree(idev->identifier); ++ xf86optionListFree(idev->commonOptions); ++ xfree(idev); ++ } + } } - } - --- -1.5.2.4 - + OsReleaseSignals(); ++++++ bitmap_always_unscaled.diff ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100 @@ -53,21 +53,3 @@ case $host_os in darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; esac ---- xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2008-04-10 20:58:01.000000000 +0200 -+++ xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-06-16 19:26:46.000000000 +0200 -@@ -1908,14 +1908,12 @@ - { - /* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/ - "/local/", -- "/misc/", -+ "/misc/:unscaled", - "/75dpi/:unscaled", - "/100dpi/:unscaled", - "/Type1/", - "/TrueType/", - "/freefont/", -- "/75dpi/", -- "/100dpi/", - 0 /* end of fontpaths */ - }; - ++++++ confine_to_shape.diff ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100 @@ -1,23 +1,19 @@ -Index: events.c -=================================================================== -RCS file: /home/eich/cvs/xc/programs/Xserver/dix/events.c,v -retrieving revision 1.1.1.19 -diff -u -r1.1.1.19 events.c ---- dix/events.c.orig 26 Aug 2004 12:09:13 -0000 1.1.1.19 -+++ dix/events.c 2 Mar 2005 20:04:13 -0000 -@@ -656,35 +656,79 @@ +--- dix/events.c.orig 2009-02-25 20:12:10.000000000 +0100 ++++ dix/events.c 2009-02-27 16:53:47.000000000 +0100 +@@ -786,37 +786,80 @@ ConfineToShape(DeviceIntPtr pDev, Region { BoxRec box; int x = *px, y = *py; - int incx = 1, incy = 1; -- + SpritePtr pSprite; + int nbox; + BoxPtr pbox; -+ int d, min = (~0U >> 1), dx2, dy2, x_r, y_r; -+ - if (POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box)) ++ int d, min = (~0U >> 1), dx2, dy2, x_r, y_r; + + pSprite = pDev->spriteInfo->sprite; + if (POINT_IN_REGION(pSprite->hot.pScreen, shape, x, y, &box)) return; -- box = *REGION_EXTENTS(sprite.hot.pScreen, shape); +- box = *REGION_EXTENTS(pSprite->hot.pScreen, shape); - /* this is rather crude */ - do { - x += incx; @@ -27,27 +23,27 @@ - x = *px - 1; + + for (nbox = REGION_NUM_RECTS (shape), -+ pbox = REGION_RECTS(shape); ++ pbox = REGION_RECTS(shape); + nbox--; + pbox++) + { -+ if (pbox->x1 < x && pbox->x2 > x) { -+ d = pbox->y1 - y; -+ if (d >= 0) { -+ d *= d; -+ if (d < min) { -+ *px = x; -+ *py = pbox->y1 + 1; -+ min = d; -+ } -+ } else { -+ d = pbox->y2 - y; d *= d; -+ if (d < min) { -+ *px = x; -+ *py = pbox->y2 - 1; -+ min = d; -+ } -+ } ++ if (pbox->x1 < x && pbox->x2 > x) { ++ d = pbox->y1 - y; ++ if (d >= 0) { ++ d *= d; ++ if (d < min) { ++ *px = x; ++ *py = pbox->y1 + 1; ++ min = d; ++ } ++ } else { ++ d = pbox->y2 - y; d *= d; ++ if (d < min) { ++ *px = x; ++ *py = pbox->y2 - 1; ++ min = d; ++ } ++ } } - else if (x < box.x1) - { @@ -58,54 +54,53 @@ - { - incy = -1; - y = *py - 1; -+ else if (pbox->y1 < y && pbox->y2 > y) { -+ d = pbox->x1 - x; -+ if (d >= 0) { -+ d *= d; -+ if (d < min) { -+ *px = pbox->x1 + 1; -+ *py = y; -+ min = d; -+ } -+ } else { -+ d = pbox->x2 - x; d *= d; -+ if (d < min) { -+ *px = pbox->x2 - 1; -+ *py = y; -+ min = d; -+ } -+ } -+ -+ } else { -+ dx2 = pbox->x1 - x; -+ if (dx2 >= 0) { -+ dx2 *= dx2; -+ x_r = pbox->x1 + 1; -+ } else { -+ dx2 = pbox->x2 - x; dx2 *= dx2; -+ x_r = pbox->x2 - 1; -+ } -+ dy2 = pbox->y1 - y; -+ if (dy2 >= 0) { -+ dy2 *= dy2; -+ y_r = pbox->y1 + 1; -+ } else { -+ dy2 = pbox->y2 - y; dy2 *= dy2; -+ y_r = pbox->y2 - 1; -+ } -+ if ((d = dx2 + dy2) < min) { -+ *px = x_r; -+ *py = y_r; -+ min = d; ++ else if (pbox->y1 < y && pbox->y2 > y) { ++ d = pbox->x1 - x; ++ if (d >= 0) { ++ d *= d; ++ if (d < min) { ++ *px = pbox->x1 + 1; ++ *py = y; ++ min = d; ++ } ++ } else { ++ d = pbox->x2 - x; d *= d; ++ if (d < min) { ++ *px = pbox->x2 - 1; ++ *py = y; ++ min = d; ++ } ++ } ++ ++ } else { ++ dx2 = pbox->x1 - x; ++ if (dx2 >= 0) { ++ dx2 *= dx2; ++ x_r = pbox->x1 + 1; ++ } else { ++ dx2 = pbox->x2 - x; dx2 *= dx2; ++ x_r = pbox->x2 - 1; ++ } ++ dy2 = pbox->y1 - y; ++ if (dy2 >= 0) { ++ dy2 *= dy2; ++ y_r = pbox->y1 + 1; ++ } else { ++ dy2 = pbox->y2 - y; dy2 *= dy2; ++ y_r = pbox->y2 - 1; ++ } ++ if ((d = dx2 + dy2) < min) { ++ *px = x_r; ++ *py = y_r; ++ min = d; } - else if (y < box.y1) - return; /* should never get here! */ } -- } while (!POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box)); +- } while (!POINT_IN_REGION(pSprite->hot.pScreen, shape, x, y, &box)); - *px = x; - *py = y; -+ } -+ ++ } } - #endif + static void ++++++ fbdevhw.diff ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100 @@ -1,15 +1,3 @@ ---- hw/xfree86/fbdevhw/fbdevhw.c.orig 2007-09-03 20:48:47.000000000 +0000 -+++ hw/xfree86/fbdevhw/fbdevhw.c 2007-09-03 20:53:12.000000000 +0000 -@@ -245,7 +245,8 @@ - set->green.length == req->green.length && - set->blue.length == req->blue.length && - set->xres == req->xres && set->yres == req->yres && -- set->pixclock == req->pixclock && -+ /* xenfb sets pixclock to 0 (Novell Bug #285523) */ -+ ((set->pixclock == req->pixclock) || !set->pixclock) && - set->right_margin == req->right_margin && - set->hsync_len == req->hsync_len && - set->left_margin == req->left_margin && --- hw/xfree86/fbdevhw/fbdevhw.c.orig 2008-04-20 03:06:32.000000000 +0000 +++ hw/xfree86/fbdevhw/fbdevhw.c 2008-04-20 03:30:00.000000000 +0000 @@ -923,9 +923,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo ++++++ p_ia64-console.diff ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:37.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:37.000000000 +0100 @@ -24,19 +24,19 @@ return(TRUE); } } ---- linux/lnx_init.c.orig 2007-08-23 21:04:53.000000000 +0200 -+++ linux/lnx_init.c 2007-09-29 16:19:53.771798500 +0200 -@@ -240,9 +240,6 @@ - - if (!ShareVTs) +--- linux/lnx_init.c.orig 2009-02-27 15:41:39.000000000 +0100 ++++ linux/lnx_init.c 2009-02-27 15:41:47.000000000 +0100 +@@ -252,9 +252,6 @@ xf86OpenConsole(void) { + struct termios nTty; + -#if defined(DO_OS_FONTRESTORE) - lnx_savefont(); -#endif /* * now get the VT. This _must_ succeed, or else fail completely. */ -@@ -254,6 +251,10 @@ +@@ -266,6 +263,10 @@ xf86OpenConsole(void) FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n", strerror(errno)); @@ -47,19 +47,19 @@ if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", strerror(errno)); -@@ -342,6 +343,11 @@ +@@ -384,6 +385,11 @@ xf86CloseConsole() if (VTSwitch) { +#if defined(DO_OS_FONTRESTORE) -+ if (xf86Info.vtno == vtno) /* check if we are active */ ++ if (xf86Info.vtno == vtno) /* check if we are active */ + lnx_restorefont(); -+ lnx_freefontdata(); ++ lnx_freefontdata(); +#endif /* * Perform a switch back to the active VT when we were started */ -@@ -356,11 +362,6 @@ +@@ -398,11 +404,6 @@ xf86CloseConsole() activeVT = -1; } ++++++ randr1_1-sig11.diff ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:37.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:37.000000000 +0100 @@ -1,14 +1,12 @@ -diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c -index 4432ad9..7e446de 100644 ---- a/hw/xfree86/common/xf86RandR.c -+++ b/hw/xfree86/common/xf86RandR.c -@@ -223,6 +223,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, +--- xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c 2009-02-27 17:04:34.000000000 +0100 +@@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, Bool useVirtual = FALSE; Rotation oldRotation = randrp->rotation; + if (!scrp->vtSema) + return FALSE; + - miPointerPosition (&px, &py); + miPointerGetPosition(inputInfo.pointer, &px, &py); for (mode = scrp->modes; ; mode = mode->next) { ++++++ xephyr.diff ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:37.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:37.000000000 +0100 @@ -1,25 +1,19 @@ ---- hw/kdrive/Makefile.am.orig 2006-10-23 16:23:04.000000000 +0200 -+++ hw/kdrive/Makefile.am 2006-10-23 16:23:34.000000000 +0200 -@@ -1,10 +1,9 @@ - if KDRIVEVESA --VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \ -- smi via -+VESA_SUBDIRS = - endif - +--- hw/kdrive/Makefile.am.orig 2008-11-14 22:27:05.000000000 +0100 ++++ hw/kdrive/Makefile.am 2009-02-27 15:45:07.000000000 +0100 +@@ -1,5 +1,5 @@ if BUILD_KDRIVEFBDEVLIB -FBDEV_SUBDIRS = fbdev +FBDEV_SUBDIRS = endif - if XSDLSERVER -@@ -21,8 +20,7 @@ + if XFAKESERVER +@@ -21,8 +21,7 @@ + SERVER_SUBDIRS = \ $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ - $(VESA_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - $(XFAKE_SUBDIRS) + $(XEPHYR_SUBDIRS) - DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ - smi via fbdev sdl ephyr src linux fake sis300 + SUBDIRS = \ + src \ ++++++ xorg-server-1.5.2.tar.bz2 -> xorg-server-1.6.0.tar.bz2 ++++++ ++++ 529222 lines of diff (skipped) ++++++ xorg-server-xf4vnc.patch ++++++ ++++ 1215 lines (skipped) ++++ between xorg-x11-server/xorg-server-xf4vnc.patch ++++ and /mounts/work_src_done/STABLE/xorg-x11-server/xorg-server-xf4vnc.patch ++++++ zap_warning_xserver.diff ++++++ --- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:49.000000000 +0100 +++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:49.000000000 +0100 @@ -1,31 +1,4 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Config.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Config.c ---- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Config.c 2008-03-09 12:36:39.000000000 +0100 -+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Config.c 2008-03-09 13:33:17.000000000 +0100 -@@ -743,6 +743,7 @@ - FLAG_NOTRAPSIGNALS, - FLAG_DONTVTSWITCH, - FLAG_DONTZAP, -+ FLAG_ZAPWARNING, - FLAG_DONTZOOM, - FLAG_DISABLEVIDMODE, - FLAG_ALLOWNONLOCAL, -@@ -788,6 +789,8 @@ - {0}, FALSE }, - { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, - {0}, FALSE }, -+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN, -+ {0}, FALSE }, - { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, - {0}, FALSE }, - { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, -@@ -912,6 +915,7 @@ - xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); - xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); - xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); -+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning); - xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); - - xf86GetOptValBool(FlagOptions, FLAG_ALLOW_DEACTIVATE_GRABS, diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c --- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c 2008-03-09 13:27:24.000000000 +0100 +++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c 2008-03-09 13:30:18.000000000 +0100 @@ -61,16 +34,6 @@ case ACTION_NEXT_MODE: if (!xf86Info.dontZoom) diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Globals.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Globals.c ---- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Globals.c 2008-03-09 12:36:39.000000000 +0100 -+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Globals.c 2008-03-09 13:31:40.000000000 +0100 -@@ -107,6 +107,7 @@ - FALSE, /* inputPending */ - FALSE, /* dontVTSwitch */ - FALSE, /* dontZap */ -+ FALSE, /* ZapWarning */ - FALSE, /* dontZoom */ - FALSE, /* notrapSignals */ - FALSE, /* caughtSignal */ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h --- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h 2007-12-07 03:38:42.000000000 +0100 +++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h 2008-03-09 13:29:43.000000000 +0100 @@ -99,20 +62,74 @@ .BI "Option \*qDontZoom\*q \*q" boolean \*q This disallows the use of the .B Ctrl+Alt+Keypad\-Plus ---- xorg-server-1.4.0.90-orig/hw/xfree86/doc/man/Xorg.man.pre.orig 2008-05-16 16:46:39.000000000 +0200 -+++ xorg-server-1.4.0.90/hw/xfree86/doc/man/Xorg.man.pre 2008-05-16 16:48:50.000000000 +0200 -@@ -461,10 +461,10 @@ - are: - .TP 8 - .B Ctrl+Alt+Backspace --Immediately kills the server -- no questions asked. This can be disabled --with the +--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-27 16:28:19.000000000 +0100 +@@ -697,6 +697,7 @@ typedef enum { + FLAG_NOTRAPSIGNALS, + FLAG_DONTVTSWITCH, + FLAG_DONTZAP, ++ FLAG_ZAPWARNING, + FLAG_DONTZOOM, + FLAG_DISABLEVIDMODE, + FLAG_ALLOWNONLOCAL, +@@ -734,6 +735,8 @@ static OptionInfoRec FlagOptions[] = { + {0}, FALSE }, + { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, + {0}, TRUE }, ++ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN, ++ {0}, FALSE }, + { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, + {0}, FALSE }, + { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, +@@ -847,6 +850,7 @@ configServerFlags(XF86ConfFlagsPtr flags + xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); + if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap)) + xf86Info.dontZap = !party_like_its_1989; ++ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning); + xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); + + xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); +--- xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c.orig 2009-02-27 16:23:51.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c 2009-02-27 16:30:19.000000000 +0100 +@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = { + .vtRequestsPending = FALSE, + .dontVTSwitch = FALSE, + .dontZap = FALSE, ++ .ZapWarning = FALSE, + .dontZoom = FALSE, + .notrapSignals = FALSE, + .caughtSignal = FALSE, +--- xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre 2009-02-27 16:32:45.000000000 +0100 +@@ -452,8 +452,8 @@ are: + Immediately kills the server -- no questions asked. This is disabled by + default. It can be enabled with the -retro command line flag or by setting + the -.B DontZap --__xconfigfile__(__filemansuffix__) file option. -+Immediately kills the server -- no questions asked. This behaviour can -+be changed with the +-__xconfigfile__(__filemansuffix__) file option to a FALSE value. +.B DontZap/ZapWarning -+__xconfigfile__(__filemansuffix__) file options. ++__xconfigfile__(__filemansuffix__) file options to a FALSE value. .TP 8 .B Ctrl+Alt+Keypad-Plus Change video mode to next one specified in the configuration file. +--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-28 20:29:42.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-28 20:30:44.000000000 +0100 +@@ -734,7 +734,7 @@ static OptionInfoRec FlagOptions[] = { + { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN, + {0}, FALSE }, + { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, +- {0}, TRUE }, ++ {0}, FALSE }, + { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN, + {0}, FALSE }, + { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, +@@ -848,8 +848,7 @@ configServerFlags(XF86ConfFlagsPtr flags + + xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); + xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); +- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap)) +- xf86Info.dontZap = !party_like_its_1989; ++ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); + xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning); + xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de