Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Mon Jan 18 14:06:34 CET 2010. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-12-13 12:09:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2010-01-16 19:05:21.000000000 +0100 @@ -1,0 +2,46 @@ +Sat Jan 16 19:06:44 CET 2010 - sndirsch@suse.de + +- set VIDEO_ABI_VERSION = 6 and INPUT_ABI_VERSION = 7 in specfile + +------------------------------------------------------------------- +Thu Jan 14 01:37:00 CET 2010 - ro@suse.de + +- update to 1.7.4 + - obsoletes acpi_events.diff + - obsoletes loadmod-bug197195.diff + - obsoletes events.diff + - obsoletes acpi-warning.diff + - obsoletes fbdev_fallback_fail_fix.diff + - obsoletes bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff + - obsoletes keyrelease-1.5.2.diff + - obsoletes 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch + - obsoletes 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch + - obsoletes bug532341.diff + - obsoletes no-return-in-nonvoid-function.diff + - adjusted 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch + - adjusted bitmap_always_unscaled.diff + - adjusted bug-197858_dpms.diff + - adjusted cache-xkbcomp-output-for-fast-start-up.patch + - adjusted driver-autoconfig.diff + - adjusted fixed-SYNC-extension-trigger-BlockHandler-test.diff + - adjusted fpic.diff + - adjusted missing_font_paths.diff + - adjusted p_default-module-path.diff + - adjusted p_ia64-console.diff + - adjusted p_xorg_acpi.diff + - adjusted xorg-detect-psb.patch + - adjusted xorg-server-xf4vnc-disable-dmxvnc.diff + - adjusted xorg-server-xf4vnc-fix.diff + - adjusted xorg-server-xf4vnc.patch + - adjusted xorg-x11-server.changes + - adjusted xorg-x11-server.spec + - adjusted zap_warning_xserver.diff +- removed truetype_fontpath.diff +- removed libdri_noPanoramiXExtension_symbol.patch +- exa-greedy.diff not applied +- fixed xorg-detect-psb.patch: + rewrite to use second level switch statement for device_id +- /usr/$lib/X11/Options is gone + (Remove xorgcfg 'Options' list.) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch acpi_events.diff acpi-warning.diff bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff bug532341.diff events.diff fbdev_fallback_fail_fix.diff keyrelease-1.5.2.diff libdri_noPanoramiXExtension_symbol.patch loadmod-bug197195.diff no-return-in-nonvoid-function.diff truetype_fontpath.diff xorg-server-1.6.5.tar.bz2 New: ---- xorg-server-1.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-server (Version 7.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.6.5 +%define dirsuffix 1.7.4 %define fglrx_driver_hack 0 ### FIXME %define vnc 1 @@ -33,7 +33,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 64 +Release: 65 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -43,8 +43,8 @@ Requires: pkgconfig xorg-x11-fonts-core xorg-x11 %if %suse_version > 1010 %ifnarch s390 s390x -Provides: VIDEO_ABI_VERSION = 5 -Provides: INPUT_ABI_VERSION = 4 +Provides: VIDEO_ABI_VERSION = 6 +Provides: INPUT_ABI_VERSION = 7 Requires: libpixman-1-0 >= 0.15.2 %endif %endif @@ -73,7 +73,6 @@ Patch23: disable-fbblt-opt.diff Patch27: mouse.diff Patch29: xephyr.diff -Patch32: acpi_events.diff Patch34: p_pci-off-by-one.diff.ia64 Patch36: libdrm.diff %if %vnc @@ -88,7 +87,6 @@ Patch47: xorg-server-xf4vnc-clientTimeout.diff Patch48: xorg-server-xf4vnc-fix.diff %endif -Patch41: loadmod-bug197195.diff Patch45: bug-197858_dpms.diff Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch Patch67: xorg-docs.diff @@ -100,10 +98,7 @@ Patch103: confine_to_shape.diff Patch104: bitmap_always_unscaled.diff Patch106: randr1_1-sig11.diff -Patch109: events.diff Patch112: fix-dpi-values.diff -Patch113: no-return-in-nonvoid-function.diff -Patch117: acpi-warning.diff Patch118: exa-greedy.diff Patch123: vidmode-sig11.diff Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch @@ -111,15 +106,10 @@ Patch128: pci-legacy-mem-fallback.diff Patch129: bug474071-fix1.diff Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff -Patch140: fbdev_fallback_fail_fix.diff -Patch142: bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff Patch143: autoconfig_fallback_fbdev_first.diff -Patch144: keyrelease-1.5.2.diff Patch145: driver-autoconfig.diff -Patch147: truetype_fontpath.diff Patch148: commit-c941479.diff # Moblin -Patch161: libdri_noPanoramiXExtension_symbol.patch Patch162: cache-xkbcomp-output-for-fast-start-up.patch %if %moblin Patch163: xserver-1.5.0-bg-none-root.patch @@ -136,10 +126,7 @@ Patch170: xserver-boottime.patch Patch171: moblin-use_preferred_mode_for_all_outputs.diff %endif -Patch190: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch -Patch191: 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch Patch200: bug534768-prefer_local_symbols.patch -Patch532341: bug532341.diff Patch202: 0001-Check-harder-for-primary-PCI-device.patch Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch Patch204: missing_font_paths.diff @@ -214,8 +201,6 @@ %patch23 %patch27 %patch29 -### Bug 197572: X.Org PCI/IA64 patches -%patch32 -p1 ### FIXME #%patch34 -p0 %patch36 -p0 @@ -230,7 +215,6 @@ %patch48 -p1 chmod 755 hw/vnc/symlink-vnc.sh %endif -%patch41 -p1 %patch45 -p0 ### FIXME #%patch63 -p1 @@ -246,11 +230,8 @@ %patch103 %patch104 -p1 %patch106 -p1 -%patch109 -p1 %patch112 -p0 -%patch113 -p0 -%patch117 -%patch118 -p1 +#patch118 -p1 %patch123 -p0 %patch125 -p1 %patch127 -p1 @@ -259,15 +240,10 @@ %patch129 -p0 popd %patch132 -p1 -%patch140 -p1 -%patch142 -p1 %patch143 -p0 -%patch144 -p1 %patch145 -p0 -%patch147 -p0 ### Bug #528397 #%patch148 -p1 -R -%patch161 -p1 %patch162 -p1 %if %moblin %patch163 -p1 @@ -282,10 +258,7 @@ %patch171 -p1 %endif # -%patch190 -p1 -%patch191 -p1 %patch200 -p1 -%patch532341 -p1 %patch202 -p1 %patch203 -p1 %patch204 -p0 @@ -541,9 +514,9 @@ %dir /etc/modprobe.d /etc/modprobe.d/50-nvidia.conf %endif -%ifarch ppc64 x86_64 -%dir /usr/%{_lib}/X11 -%endif +#%ifarch ppc64 x86_64 +#%dir /usr/%{_lib}/X11 +#%endif %dir /usr/%{_lib}/xorg %ifnarch s390 s390x %dir /var/lib/X11 @@ -571,7 +544,7 @@ /usr/bin/gtf %endif %ifnarch s390 s390x -/usr/%{_lib}/X11/* +#/usr/%{_lib}/X11/* /usr/%{_lib}/xorg/modules/ %{_mandir}/man4/* %endif ++++++ 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:32.000000000 +0100 @@ -5,22 +5,14 @@ The damage structure for the cursor is not deregistered before deallocation, causing a subsequent DamageUnregister () to segfault. ---- - mi/misprite.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/mi/misprite.c b/mi/misprite.c -index 692e6c9..c368928 100644 ---- a/mi/misprite.c -+++ b/mi/misprite.c -@@ -313,6 +313,7 @@ miSpriteCloseScreen (int i, ScreenPtr pScreen) +================================================================================ +--- xorg-server-1.7.4/mi/misprite.c ++++ xorg-server-1.7.4/mi/misprite.c +@@ -384,6 +384,7 @@ pScreen->InstallColormap = pScreenPriv->InstallColormap; pScreen->StoreColors = pScreenPriv->StoreColors; + miSpriteDisableDamage(pScreen, pScreenPriv); DamageDestroy (pScreenPriv->pDamage); - xfree ((pointer) pScreenPriv); --- -1.6.4.2 - + xfree (pScreenPriv); ++++++ bitmap_always_unscaled.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:32.000000000 +0100 @@ -36,22 +36,3 @@ case $host_os in darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; esac -Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/Makefile.am -+++ xorg-server-1.6.3.901/hw/xfree86/Makefile.am -@@ -100,11 +100,11 @@ dist_options_DATA = Options - - CPP_FILES_FLAGS = \ - -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ -- -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \ -+ -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \ - -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \ - -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \ -- -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \ -- -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \ -+ -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \ -+ -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \ - -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" - - relink: ++++++ bug-197858_dpms.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:32.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86Events.c -=================================================================== ---- hw/xfree86/common/xf86Events.c.orig +================================================================================ +--- hw/xfree86/common/xf86Events.c +++ hw/xfree86/common/xf86Events.c -@@ -124,6 +124,7 @@ typedef struct x_IHRec { +@@ -115,6 +115,7 @@ InputHandlerProc ihproc; pointer data; Bool enabled; @@ -10,40 +10,39 @@ struct x_IHRec * next; } IHRec, *IHPtr; -@@ -513,8 +514,12 @@ xf86VTSwitch() - for (i = 0; i < xf86NumScreens; i++) - xf86Screens[i]->LeaveVT(i, 0); - +@@ -456,8 +457,12 @@ + * Keep the order: Disable Device > LeaveVT + * EnterVT > EnableDevice + */ - for (ih = InputHandlers; ih; ih = ih->next) - xf86DisableInputHandler(ih); + for (ih = InputHandlers; ih; ih = ih->next) { -+ if (ih->is_input) -+ xf86DisableInputHandler(ih); -+ else -+ xf86DisableGeneralHandler(ih); ++ if (ih->is_input) ++ xf86DisableInputHandler(ih); ++ else ++ xf86DisableGeneralHandler(ih); + } - xf86AccessLeave(); /* We need this here, otherwise */ - xf86AccessLeaveState(); /* console won't be restored */ - -@@ -552,9 +557,12 @@ xf86VTSwitch() + for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) { + if (pInfo->dev) { + xf86ReleaseKeys(pInfo->dev); +@@ -499,8 +504,12 @@ + EnableDevice(pInfo->dev, TRUE); + pInfo = pInfo->next; } - /* XXX HACK */ - xf86ReleaseKeys(inputInfo.keyboard); - for (ih = InputHandlers; ih; ih = ih->next) - xf86EnableInputHandler(ih); -- + for (ih = InputHandlers; ih; ih = ih->next) { + if (ih->is_input) + xf86EnableInputHandler(ih); + else + xf86EnableGeneralHandler(ih); + } + xf86UnblockSIGIO(prevSIGIO); - } else { -@@ -617,8 +625,12 @@ xf86VTSwitch() - /* XXX HACK */ - xf86ReleaseKeys(inputInfo.keyboard); +@@ -556,8 +565,12 @@ + pInfo = pInfo->next; + } - for (ih = InputHandlers; ih; ih = ih->next) - xf86EnableInputHandler(ih); @@ -56,7 +55,7 @@ xf86UnblockSIGIO(prevSIGIO); } -@@ -655,8 +667,10 @@ xf86AddInputHandler(int fd, InputHandler +@@ -594,8 +607,10 @@ { IHPtr ih = addInputHandler(fd, proc, data); @@ -68,11 +67,9 @@ return ih; } -Index: os/WaitFor.c -=================================================================== ---- os/WaitFor.c.orig +--- os/WaitFor.c +++ os/WaitFor.c -@@ -141,6 +141,7 @@ static OsTimerPtr timers = NULL; +@@ -142,6 +142,7 @@ * For more info on ClientsWithInput, see ReadRequestFromClient(). * pClientsReady is an array to store ready client->index values into. *****************/ @@ -80,7 +77,7 @@ int WaitForSomething(int *pClientsReady) -@@ -278,10 +279,9 @@ WaitForSomething(int *pClientsReady) +@@ -279,10 +280,9 @@ if (expired) return 0; } @@ -93,7 +90,7 @@ if (*checkForInput[0] == *checkForInput[1]) { if (timers) -@@ -316,6 +316,12 @@ WaitForSomething(int *pClientsReady) +@@ -317,6 +317,12 @@ QueueWorkProc(EstablishNewConnections, NULL, (pointer)&LastSelectMask); ++++++ cache-xkbcomp-output-for-fast-start-up.patch ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -8,17 +8,10 @@ names. This saves boot time for around 1s on commodity netbooks. Signed-off-by: Yan Li <yan.i.li@intel.com> ---- - configure.ac | 6 +- - xkb/README.compiled | 8 +- - xkb/ddxLoad.c | 192 +++++++++++++++++++++++++++++++++++++++++--------- - 3 files changed, 164 insertions(+), 42 deletions(-) - -Index: xorg-server-1.6.3.901/configure.ac -=================================================================== ---- xorg-server-1.6.3.901.orig/configure.ac -+++ xorg-server-1.6.3.901/configure.ac -@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_S +================================================================================ +--- xorg-server-1.7.4/configure.ac ++++ xorg-server-1.7.4/configure.ac +@@ -502,9 +502,9 @@ AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), [ XKBPATH="$withval" ], [ XKBPATH="${datadir}/X11/xkb" ]) @@ -27,23 +20,21 @@ [ XKBOUTPUT="$withval" ], - [ XKBOUTPUT="compiled" ]) + [ XKBOUTPUT="${localstatedir}/cache/xkb" ]) - AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], - [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]), - [ SERVERCONFIG="$withval" ], -@@ -1807,7 +1807,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, + AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], + [Keyboard ruleset (default: base/evdev)]), + [ XKB_DFLT_RULES="$withval" ], +@@ -1120,7 +1120,7 @@ + dnl Make sure XKM_OUTPUT_DIR is an absolute path XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` - - if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then + if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then - XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" + AC_MSG_ERROR([xkb-output must be an absolute path.]) fi - # XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed -Index: xorg-server-1.6.3.901/xkb/README.compiled -=================================================================== ---- xorg-server-1.6.3.901.orig/xkb/README.compiled -+++ xorg-server-1.6.3.901/xkb/README.compiled -@@ -4,10 +4,10 @@ current keymap and/or any scratch keymap + dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed +--- xorg-server-1.7.4/xkb/README.compiled ++++ xorg-server-1.7.4/xkb/README.compiled +@@ -4,10 +4,10 @@ or some other tool might destroy or replace the files in this directory, so it is not a safe place to store compiled keymaps for long periods of time. The default keymap for any server is usually stored in: @@ -58,11 +49,9 @@ Unless the X server is modified, sharing this directory between servers on different hosts could cause problems. -Index: xorg-server-1.6.3.901/xkb/ddxLoad.c -=================================================================== ---- xorg-server-1.6.3.901.orig/xkb/ddxLoad.c -+++ xorg-server-1.6.3.901/xkb/ddxLoad.c -@@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. +--- xorg-server-1.7.4/xkb/ddxLoad.c ++++ xorg-server-1.7.4/xkb/ddxLoad.c +@@ -32,6 +32,12 @@ #include <xkb-config.h> #endif @@ -74,8 +63,8 @@ +#endif #include <stdio.h> #include <ctype.h> - #define NEED_EVENTS 1 -@@ -46,24 +52,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. + #include <X11/X.h> +@@ -45,24 +51,13 @@ #define XKBSRV_NEED_FILE_FUNCS #include <xkbsrv.h> #include <X11/extensions/XI.h> @@ -101,10 +90,10 @@ #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" #define ERROR_PREFIX "\"> \"" #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" -@@ -179,6 +174,45 @@ OutputDirectory( +@@ -177,6 +172,45 @@ } - static Bool + static Bool +Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input) +{ + int i; @@ -122,15 +111,15 @@ + + success = SHA1_Init (&ctx); + if (! success) -+ return BadAlloc; ++ return BadAlloc; + + success = SHA1_Update (&ctx, input, strlen(input)); + if (! success) -+ return BadAlloc; ++ return BadAlloc; + + success = SHA1_Final (sha1, &ctx); + if (! success) -+ return BadAlloc; ++ return BadAlloc; +#endif + + /* convert sha1 to sha1_asc */ @@ -147,7 +136,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, XkbComponentNamesPtr names, unsigned want, -@@ -187,7 +221,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr +@@ -185,7 +219,11 @@ int nameRtrnLen) { FILE * out; @@ -160,7 +149,7 @@ const char *emptystring = ""; const char *xkbbasedirflag = emptystring; -@@ -198,16 +236,70 @@ XkbDDXCompileKeymapByNames( XkbDescPtr +@@ -196,15 +234,70 @@ /* WIN32 has no popen. The input must be stored in a file which is used as input for xkbcomp. xkbcomp does not read from stdin. */ char tmpname[PATH_MAX]; @@ -207,8 +196,6 @@ + snprintf(xkmfile, sizeof(xkmfile), "server-%s", display); + } -- XkbEnsureSafeMapName(keymap); -+ XkbEnsureSafeMapName(xkmfile); OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir)); + /* set nameRtrn, fail if it's too small */ @@ -232,10 +219,11 @@ + condition, we compile it to a tmpfile then rename it to + xkmfile */ + ++ #ifdef WIN32 strcpy(tmpname, Win32TempDir()); strcat(tmpname, "\\xkb_XXXXXX"); -@@ -230,19 +322,30 @@ XkbDDXCompileKeymapByNames( XkbDescPtr +@@ -227,19 +320,30 @@ } } @@ -269,7 +257,7 @@ #ifndef WIN32 out= Popen(buf,"w"); #else -@@ -250,31 +353,43 @@ XkbDDXCompileKeymapByNames( XkbDescPtr +@@ -247,31 +351,43 @@ #endif if (out!=NULL) { @@ -326,7 +314,7 @@ #ifdef WIN32 /* remove the temporary file */ unlink(tmpname); -@@ -289,9 +404,17 @@ XkbDDXCompileKeymapByNames( XkbDescPtr +@@ -286,9 +402,17 @@ } if (nameRtrn) nameRtrn[0]= '\0'; @@ -345,7 +333,7 @@ } static FILE * -@@ -375,7 +498,6 @@ unsigned missing; +@@ -372,7 +496,6 @@ DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined); } fclose(file); ++++++ driver-autoconfig.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -1,6 +1,6 @@ ---- hw/xfree86/common/xf86AutoConfig.c.orig 2009-10-07 04:54:44.000000000 +0200 -+++ hw/xfree86/common/xf86AutoConfig.c 2009-10-07 04:56:23.000000000 +0200 -@@ -165,7 +165,11 @@ videoPtrToDriverList(struct pci_device * +--- hw/xfree86/common/xf86AutoConfig.c ++++ hw/xfree86/common/xf86AutoConfig.c +@@ -176,7 +176,11 @@ case 0x1142: driverList[0] = "apm"; break; case 0xedd8: driverList[0] = "ark"; break; case 0x1a03: driverList[0] = "ast"; break; @@ -12,12 +12,13 @@ + break; case 0x102c: driverList[0] = "chips"; break; case 0x1013: driverList[0] = "cirrus"; break; - case 0x8086: -@@ -179,7 +183,15 @@ videoPtrToDriverList(struct pci_device * + case 0x3d3d: driverList[0] = "glint"; break; +@@ -192,8 +196,20 @@ + break; case 0x102b: driverList[0] = "mga"; break; case 0x10c8: driverList[0] = "neomagic"; break; - case 0x105d: driverList[0] = "i128"; break; - case 0x10de: case 0x12d2: driverList[0] = "nv"; break; +- case 0x1106: driverList[0] = "openchrome"; break; + case 0x12d2: driverList[0] = "nv"; break; + case 0x10de: + driverList[0] = "nvidia"; @@ -27,31 +28,11 @@ + driverList[2] = "nv"; + } + break; - case 0x1163: driverList[0] = "rendition"; break; - case 0x5333: - switch (dev->device_id) -@@ -205,7 +217,11 @@ videoPtrToDriverList(struct pci_device * - case 0x3d3d: driverList[0] = "glint"; break; - case 0x1023: driverList[0] = "trident"; break; - case 0x100c: driverList[0] = "tseng"; break; -- case 0x1106: driverList[0] = "openchrome"; break; -+ case 0x1106: ++ case 0x1106: + driverList[0] = "via"; + driverList[1] = "openchrome"; + driverList[2] = "unichrome"; + break; - case 0x15ad: driverList[0] = "vmware"; break; - case 0x18ca: - if (dev->device_id == 0x47) -@@ -213,6 +229,11 @@ videoPtrToDriverList(struct pci_device * - else - driverList[0] = "xgi"; - break; -+ case 0x80ee: -+ if (dev->device_id == 0xbeef) { -+ driverList[0] = "vboxvideo"; -+ } -+ break; - default: break; - } - for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) { + case 0x1163: driverList[0] = "rendition"; break; + case 0x5333: + switch (dev->device_id) ++++++ fixed-SYNC-extension-trigger-BlockHandler-test.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -25,29 +25,28 @@ This fixes a problem introduced with commit 1f4fb022 where an idle counter expires unnoticed. Index: xorg-server-1.6.3.901/Xext/sync.c -=================================================================== ---- xorg-server-1.6.3.901.orig/Xext/sync.c -+++ xorg-server-1.6.3.901/Xext/sync.c -@@ -222,8 +222,7 @@ SyncCreateCounter( - ); - - static void SyncComputeBracketValues( -- SyncCounter * /* pCounter */, -- Bool /* startOver */ -+ SyncCounter * /* pCounter */ - ); +================================================================================ +--- xorg-server-1.7.4/Xext/sync.c ++++ xorg-server-1.7.4/Xext/sync.c +@@ -94,7 +94,7 @@ + #define XSyncCAAllTrigger \ + (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType) - static void -@@ -333,7 +332,7 @@ SyncDeleteTriggerFromCounter(pTrigger) +-static void SyncComputeBracketValues(SyncCounter *, Bool); ++static void SyncComputeBracketValues(SyncCounter *); + + static void SyncInitServerTime(void); + +@@ -167,7 +167,7 @@ } - + if (IsSystemCounter(pTrigger->pCounter)) - SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pTrigger->pCounter); } -@@ -361,7 +360,7 @@ SyncAddTriggerToCounter(pTrigger) +@@ -194,7 +194,7 @@ pTrigger->pCounter->pTriglist = pCur; if (IsSystemCounter(pTrigger->pCounter)) @@ -56,16 +55,16 @@ return Success; } -@@ -531,7 +530,7 @@ SyncInitTrigger(client, pTrigger, counte +@@ -351,7 +351,7 @@ } else if (IsSystemCounter(pCounter)) { - SyncComputeBracketValues(pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pCounter); } - + return Success; -@@ -829,13 +828,14 @@ SyncChangeCounter(pCounter, newval) +@@ -640,13 +640,14 @@ for (ptl = pCounter->pTriglist; ptl; ptl = pnext) { pnext = ptl->next; @@ -82,18 +81,16 @@ } } -@@ -1117,9 +1117,8 @@ SyncDestroySystemCounter(pSysCounter) +@@ -913,7 +914,7 @@ } static void --SyncComputeBracketValues(pCounter, startOver) -+SyncComputeBracketValues(pCounter) - SyncCounter *pCounter; -- Bool startOver; +-SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver) ++SyncComputeBracketValues(SyncCounter *pCounter) { SyncTriggerList *pCur; SyncTrigger *pTrigger; -@@ -1136,58 +1135,53 @@ SyncComputeBracketValues(pCounter, start +@@ -930,58 +931,53 @@ if (ct == XSyncCounterNeverChanges) return; @@ -191,7 +188,7 @@ } /* end for each trigger */ if (pnewgtval || pnewltval) -@@ -2541,11 +2535,17 @@ IdleTimeQueryValue (pointer pCounter, CA +@@ -2273,11 +2269,17 @@ } static void @@ -214,7 +211,7 @@ if (!pIdleTimeValueLess && !pIdleTimeValueGreater) return; -@@ -2563,46 +2563,57 @@ IdleTimeBlockHandler(pointer env, struct +@@ -2295,46 +2297,57 @@ * want level or edge trigger. Check the trigger list against the * current idle time, and if any succeed, bomb out of select() * immediately so we can reschedule. ++++++ fpic.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -1,10 +1,10 @@ Index: hw/xfree86/parser/Makefile.am -=================================================================== ---- hw/xfree86/parser/Makefile.am.orig +================================================================================ +--- hw/xfree86/parser/Makefile.am +++ hw/xfree86/parser/Makefile.am -@@ -22,7 +22,7 @@ libxf86config_a_SOURCES = \ - DRI.c \ - Extensions.c +@@ -33,7 +33,7 @@ + $(INTERNAL_SOURCES) + libxf86config_a_CFLAGS = $(AM_CFLAGS) -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC ++++++ missing_font_paths.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -1,11 +1,11 @@ ---- configure.ac.orig 2009-11-27 21:59:22.000000000 +0100 -+++ configure.ac 2009-11-27 22:03:59.000000000 +0100 -@@ -466,7 +466,7 @@ +--- configure.ac ++++ configure.ac +@@ -491,7 +491,7 @@ AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), [ FONTDIR="$withval" ], [ FONTDIR="${libdir}/X11/fonts" ]) --DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" -+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic" +-DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" ++DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic" case $host_os in darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; esac ++++++ p_default-module-path.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -1,11 +1,11 @@ Index: hw/xfree86/common/xf86Globals.c -=================================================================== ---- hw/xfree86/common/xf86Globals.c.orig +================================================================================ +--- hw/xfree86/common/xf86Globals.c +++ hw/xfree86/common/xf86Globals.c -@@ -141,7 +141,7 @@ xf86InfoRec xf86Info = { +@@ -143,7 +143,7 @@ + #endif }; const char *xf86ConfigFile = NULL; - const char *xf86InputDeviceList = NULL; -const char *xf86ModulePath = DEFAULT_MODULE_PATH; +const char *xf86ModulePath = DEFAULT_MODULE_PATH "/updates," DEFAULT_MODULE_PATH; MessageType xf86ModPathFrom = X_DEFAULT; ++++++ p_ia64-console.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -1,8 +1,8 @@ Index: linux/lnx_init.c -=================================================================== ---- linux/lnx_init.c.orig +================================================================================ +--- linux/lnx_init.c +++ linux/lnx_init.c -@@ -252,9 +252,6 @@ xf86OpenConsole(void) +@@ -230,9 +230,6 @@ { struct termios nTty; @@ -12,7 +12,7 @@ /* * now get the VT. This _must_ succeed, or else fail completely. */ -@@ -266,6 +263,10 @@ xf86OpenConsole(void) +@@ -244,6 +241,10 @@ FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n", strerror(errno)); @@ -23,7 +23,7 @@ if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", strerror(errno)); -@@ -384,6 +385,11 @@ xf86CloseConsole() +@@ -353,6 +354,11 @@ if (VTSwitch) { @@ -35,7 +35,7 @@ /* * Perform a switch back to the active VT when we were started */ -@@ -398,11 +404,6 @@ xf86CloseConsole() +@@ -367,11 +373,6 @@ activeVT = -1; } @@ -47,12 +47,10 @@ } close(xf86Info.consoleFd); /* make the vt-manager happy */ -Index: shared/VTsw_usl.c -=================================================================== ---- shared/VTsw_usl.c.orig +--- shared/VTsw_usl.c +++ shared/VTsw_usl.c -@@ -62,15 +62,15 @@ Bool - xf86VTSwitchAway() +@@ -62,15 +62,15 @@ + xf86VTSwitchAway(void) { xf86Info.vtRequestsPending = FALSE; +#ifdef OSSWITCHAWAY ++++++ p_xorg_acpi.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -1,6 +1,6 @@ Index: hw/xfree86/os-support/linux/lnx_acpi.c -=================================================================== ---- hw/xfree86/os-support/linux/lnx_acpi.c.orig +================================================================================ +--- hw/xfree86/os-support/linux/lnx_acpi.c +++ hw/xfree86/os-support/linux/lnx_acpi.c @@ -32,8 +32,10 @@ #define ACPI_VIDEO_HEAD_INVALID (~0u - 1) @@ -13,7 +13,7 @@ PMClose lnxACPIOpen(void); /* in milliseconds */ -@@ -52,6 +54,22 @@ lnxACPIReopen(OsTimerPtr timer, CARD32 t +@@ -52,6 +54,22 @@ #define LINE_LENGTH 80 @@ -36,7 +36,7 @@ static int lnxACPIGetEventFromOs(int fd, pmEvent *events, int num) { -@@ -127,16 +145,13 @@ lnxACPIConfirmEventToOs(int fd, pmEvent +@@ -127,15 +145,14 @@ } } @@ -48,14 +48,13 @@ int fd; struct sockaddr_un addr; int r = -1; + static int warned = 0; --#ifdef DEBUG -- ErrorF("ACPI: OSPMOpen called\n"); --#endif +- DebugF("ACPI: OSPMOpen called\n"); if (ACPIihPtr || !xf86Info.pmFlag) return NULL; -@@ -164,6 +179,27 @@ lnxACPIOpen(void) +@@ -164,6 +181,27 @@ return lnxCloseACPI; } @@ -83,7 +82,7 @@ static void lnxCloseACPI(void) { -@@ -177,5 +213,11 @@ lnxCloseACPI(void) +@@ -175,5 +213,11 @@ shutdown(fd, 2); close(fd); ACPIihPtr = NULL; @@ -95,9 +94,7 @@ + } } } -Index: hw/xfree86/os-support/linux/lnx_apm.c -=================================================================== ---- hw/xfree86/os-support/linux/lnx_apm.c.orig +--- hw/xfree86/os-support/linux/lnx_apm.c +++ hw/xfree86/os-support/linux/lnx_apm.c @@ -12,6 +12,7 @@ @@ -107,7 +104,7 @@ #endif #ifdef HAVE_APM -@@ -150,6 +151,14 @@ xf86OSPMOpen(void) +@@ -150,6 +151,14 @@ ret = lnxAPMOpen(); #endif ++++++ xorg-detect-psb.patch ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:33.000000000 +0100 @@ -1,14 +1,25 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86AutoConfig.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c -@@ -175,6 +175,9 @@ videoPtrToDriverList(struct pci_device * +================================================================================ +--- xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c ++++ xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c +@@ -186,12 +186,14 @@ + case 0x3d3d: driverList[0] = "glint"; break; + case 0x105d: driverList[0] = "i128"; break; case 0x8086: - if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) { - driverList[0] = "i740"; -+ } if ((dev->device_id == 0x8109) || (dev->device_id == 0x8108) || (dev->device_id == 0x4102) ) { -+ driverList[0] = "psb"; -+ driverList[1] = "psb_drv"; - } else { - driverList[0] = "intel"; - driverList[1] = "i810"; +- if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) { +- driverList[0] = "i740"; +- } else if (dev->device_id == 0x8108) { +- break; /* "hooray" for poulsbo */ +- } else { +- driverList[0] = "intel"; ++ switch (dev->device_id) ++ { ++ case 0x00d1: case 0x7800: ++ driverList[0] = "i740"; break; ++ case 0x8109: case 0x8108: case 0x4102: ++ driverList[0] = "psb"; driverList[1] = "psb_drv"; break; ++ default: ++ driverList[0] = "intel"; break; + } + break; + case 0x102b: driverList[0] = "mga"; break; ++++++ xorg-server-1.6.5.tar.bz2 -> xorg-server-1.7.4.tar.bz2 ++++++ ++++ 244647 lines of diff (skipped) ++++++ xorg-server-xf4vnc-disable-dmxvnc.diff ++++++ --- /var/tmp/diff_new_pack.q9Gx3O/_old 2010-01-18 14:01:37.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:37.000000000 +0100 @@ -1,6 +1,6 @@ Index: hw/dmx/Makefile.am -=================================================================== ---- hw/dmx/Makefile.am.orig +================================================================================ +--- hw/dmx/Makefile.am +++ hw/dmx/Makefile.am @@ -1,6 +1,6 @@ DIST_SUBDIRS = input vnc config glxProxy examples doc @@ -10,11 +10,9 @@ bin_PROGRAMS = Xdmx if XINERAMA -Index: hw/dmx/dmx-config.h -=================================================================== ---- hw/dmx/dmx-config.h.orig +--- hw/dmx/dmx-config.h +++ hw/dmx/dmx-config.h -@@ -72,8 +72,8 @@ +@@ -72,7 +72,7 @@ /* Enable the DMX extension */ #define DMXEXT @@ -23,25 +21,20 @@ +/* Disable VNC ability */ +#undef DMXVNC - /* Disable the extensions that are not currently supported */ - #undef MULTIBUFFER -Index: hw/dmx/input/Makefile.am -=================================================================== ---- hw/dmx/input/Makefile.am.orig + #endif /* DMX_CONFIG_H */ +--- hw/dmx/input/Makefile.am +++ hw/dmx/input/Makefile.am -@@ -65,7 +65,6 @@ AM_CFLAGS = $(DIX_CFLAGS) \ +@@ -61,7 +61,6 @@ + AM_CFLAGS = $(DIX_CFLAGS) \ -I$(top_srcdir)/hw/dmx \ - $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ - -DDMXVNC=1 \ $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ -Index: hw/dmx/vnc/Makefile.am -=================================================================== ---- hw/dmx/vnc/Makefile.am.orig +--- hw/dmx/vnc/Makefile.am +++ hw/dmx/vnc/Makefile.am -@@ -37,7 +37,6 @@ AM_CFLAGS = \ +@@ -37,7 +37,6 @@ -I$(top_srcdir)/hw/xfree86/common \ -DHAVE_DMX_CONFIG_H \ $(DIX_CFLAGS) \ ++++++ xorg-server-xf4vnc-fix.diff ++++++ ++++ 722 lines (skipped) ++++ between xorg-x11-server/xorg-server-xf4vnc-fix.diff ++++ and /mounts/work_src_done/STABLE/xorg-x11-server/xorg-server-xf4vnc-fix.diff ++++++ xorg-server-xf4vnc.patch ++++++ ++++ 1089 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.q9Gx3O/_old 2010-01-18 14:01:37.000000000 +0100 +++ /var/tmp/diff_new_pack.q9Gx3O/_new 2010-01-18 14:01:37.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Config.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c -@@ -706,6 +706,7 @@ typedef enum { +================================================================================ +--- xorg-server-1.7.4/hw/xfree86/common/xf86Config.c ++++ xorg-server-1.7.4/hw/xfree86/common/xf86Config.c +@@ -679,6 +679,7 @@ FLAG_NOTRAPSIGNALS, FLAG_DONTVTSWITCH, FLAG_DONTZAP, @@ -10,7 +10,7 @@ FLAG_DONTZOOM, FLAG_DISABLEVIDMODE, FLAG_ALLOWNONLOCAL, -@@ -743,6 +744,8 @@ static OptionInfoRec FlagOptions[] = { +@@ -717,6 +718,8 @@ {0}, FALSE }, { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, {0}, FALSE }, @@ -19,7 +19,7 @@ { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, {0}, FALSE }, { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, -@@ -855,6 +858,7 @@ configServerFlags(XF86ConfFlagsPtr flags +@@ -823,6 +826,7 @@ xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); @@ -27,12 +27,10 @@ xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); -Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Events.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c -@@ -191,12 +191,26 @@ xf86ProcessActionEvent(ActionEvent actio - #endif +--- xorg-server-1.7.4/hw/xfree86/common/xf86Events.c ++++ xorg-server-1.7.4/hw/xfree86/common/xf86Events.c +@@ -180,12 +180,26 @@ + DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg); switch (action) { case ACTION_TERMINATE: - if (!xf86Info.dontZap) { @@ -62,50 +60,40 @@ break; case ACTION_NEXT_MODE: if (!xf86Info.dontZoom) -Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Globals.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c -@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = { - .vtRequestsPending = FALSE, +--- xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c ++++ xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c +@@ -109,6 +109,7 @@ + #endif .dontVTSwitch = FALSE, .dontZap = FALSE, + .ZapWarning = TRUE, .dontZoom = FALSE, .notrapSignals = FALSE, .caughtSignal = FALSE, -Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Privstr.h -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h -@@ -72,6 +72,7 @@ typedef struct { - Bool vtRequestsPending; +--- xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h ++++ xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h +@@ -67,6 +67,7 @@ + #endif Bool dontVTSwitch; Bool dontZap; + Bool ZapWarning; Bool dontZoom; Bool notrapSignals; /* don't exit cleanly - die at fault */ Bool caughtSignal; -Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/Xorg.man.pre -+++ xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre -@@ -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 +--- xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre ++++ xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre +@@ -431,7 +431,7 @@ + .B Ctrl+Alt+Backspace + Immediately kills the server -- no questions asked. It can be disabled by + setting the -.B DontZap --__xconfigfile__(__filemansuffix__) file option to a FALSE value. +.B DontZap/ZapWarning -+__xconfigfile__(__filemansuffix__) file options to a FALSE value. + __xconfigfile__(__filemansuffix__) file option to a TRUE value. .TP 8 .B Ctrl+Alt+Keypad-Plus - Change video mode to next one specified in the configuration file. -Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/xorg.conf.man.pre -+++ xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre -@@ -470,6 +470,13 @@ This action is normally used to terminat +--- xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre ++++ xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre +@@ -479,6 +479,13 @@ When this option is enabled, the action has no effect. Default: off. .TP 7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org