diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 37d4542..84784ae 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -61,9 +61,6 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.patch # force mode debugging on for randr 1.2 drivers Patch6002: xserver-1.5.1-mode-debug.patch -# FIXME -#Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch - # don't build the (broken) acpi code Patch6011: xserver-1.6.0-less-acpi-brokenness.patch @@ -506,6 +503,10 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Thu Sep 17 2009 Peter Hutterer +- xserver-1.5.99.3-dmx-xcalloc.patch: Obsolete, drop. +- cvs rm a few other patches not used anymore. + * Tue Sep 15 2009 Adam Jackson 1.6.99.901-2 - xserver-1.6.99-hush-prerelease-warning.patch: Quiet, you. - Point to bodhi for the "check for latest version" message. diff --git a/xserver-1.5.99.3-dmx-xcalloc.patch b/xserver-1.5.99.3-dmx-xcalloc.patch deleted file mode 100644 index a485fc1..0000000 --- a/xserver-1.5.99.3-dmx-xcalloc.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 8ea9f03ea3c4d2f80f487c2474699beaf71e010c Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Fri, 19 Dec 2008 14:36:31 +1000 -Subject: [PATCH] dmx: Death to xcalloc - -dmx' hilarious circular inclusion of server-side and client-side headers means -xcalloc resolves to Xcalloc. Stop this. We've grown up now and can use calloc -directly. ---- - hw/dmx/dmx.h | 4 ++-- - hw/dmx/dmxextension.c | 2 +- - hw/dmx/glxProxy/glxutil.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h -index 05e5fab..1a71417 100644 ---- a/hw/dmx/dmx.h -+++ b/hw/dmx/dmx.h -@@ -341,14 +341,14 @@ do { \ - #define _MAXSCREENSALLOCF(o,size,fatal) \ - do { \ - if (!o) { \ -- o = xcalloc((size), sizeof(*(o))); \ -+ o = calloc((size), sizeof(*(o))); \ - if (!o && fatal) FatalError(MAXSCREEN_FAILED_TXT #o); \ - } \ - } while (0) - #define _MAXSCREENSALLOCR(o,size,retval) \ - do { \ - if (!o) { \ -- o = xcalloc((size), sizeof(*(o))); \ -+ o = calloc((size), sizeof(*(o))); \ - if (!o) return retval; \ - } \ - } while (0) -diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c -index d20c844..6fd02dc 100644 ---- a/hw/dmx/dmxextension.c -+++ b/hw/dmx/dmxextension.c -@@ -1121,7 +1121,7 @@ static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n) - } - - /* Now allocate the memory we need */ -- images = xcalloc(len_images, sizeof(char)); -+ images = calloc(len_images, sizeof(char)); - gids = xalloc(glyphSet->hash.tableEntries*sizeof(Glyph)); - glyphs = xalloc(glyphSet->hash.tableEntries*sizeof(XGlyphInfo)); - -diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c -index 080992e..53b02a6 100644 ---- a/hw/dmx/glxProxy/glxutil.c -+++ b/hw/dmx/glxProxy/glxutil.c -@@ -69,7 +69,7 @@ __glXCalloc(size_t numElements, size_t elementSize) - if ((numElements == 0) || (elementSize == 0)) { - return NULL; - } -- addr = xcalloc(numElements, elementSize); -+ addr = calloc(numElements, elementSize); - if (addr == NULL) { - /* XXX: handle out of memory error */ - return NULL; -@@ -87,7 +87,7 @@ __glXRealloc(void *addr, size_t newSize) - xfree(addr); - return NULL; - } else { -- newAddr = xrealloc(addr, newSize); -+ newAddr = realloc(addr, newSize); - } - } else { - if (newSize == 0) { --- -1.6.0.4 - diff --git a/xserver-1.5.99.902-vnc.patch b/xserver-1.5.99.902-vnc.patch deleted file mode 100644 index 1619ddc..0000000 --- a/xserver-1.5.99.902-vnc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 62cd546931f99504bcf830f20eeefe0dbc81f8a9 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Thu, 12 Feb 2009 18:52:57 +0100 -Subject: [PATCH] Don't call drv->UnInit if device doesn't have driver. - -This bug probably isn't reproducable with "standard" devices and drivers but it -is reproducable with VNC devices. They are slave devices which doesn't have -LocalDevice structure filled. Upstream bug with more details - -https://bugs.freedesktop.org/show_bug.cgi?id=20087. ---- - hw/xfree86/common/xf86Xinput.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index 96352a4..3d89e39 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -668,7 +668,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev) - OsBlockSignals(); - RemoveDevice(pDev); - -- if (!isMaster) -+ if (!isMaster && pInfo != NULL) - { - if(drv->UnInit) - drv->UnInit(drv, pInfo, 0); --- -1.6.1.3 - diff --git a/xserver-1.6.0-restore-zap.patch b/xserver-1.6.0-restore-zap.patch deleted file mode 100644 index cc2fdc9..0000000 --- a/xserver-1.6.0-restore-zap.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 41da426ebe0d8dc0734ff9dc5bcbfac9d9bd97b9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 9 Apr 2009 10:12:27 +1000 -Subject: [PATCH] xfree86: restore default off for DontZap - -Zapping is triggered by xkb nowawdays, so make a note in the man page that -it's the Terminate_Server action. Since it's XKB, the correct way of disabling -it is through xkb rulesets. - -Signed-off-by: Peter Hutterer ---- - doc/Xserver.man.pre | 2 +- - hw/xfree86/common/xf86Config.c | 5 ++--- - hw/xfree86/doc/man/xorg.conf.man.pre | 11 +++++------ - 3 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre -index 8897e1a..dd81223 100644 ---- a/doc/Xserver.man.pre -+++ b/doc/Xserver.man.pre -@@ -223,7 +223,7 @@ turns on auto-repeat. - starts the stipple with the classic stipple and cursor visible. The default - is to start with a black root window, and to suppress display of the cursor - until the first time an application calls XDefineCursor(). For the Xorg --server, this also changes the default for the DontZap option to FALSE. For -+server, this also sets the default for the DontZap option to FALSE. For - kdrive servers, this implies -zap. - .TP 8 - .B \-s \fIminutes\fP -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 17223a1..54c835d 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -733,7 +733,7 @@ static OptionInfoRec FlagOptions[] = { - { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN, - {0}, FALSE }, - { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, -- {0}, TRUE }, -+ {0}, FALSE }, - { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, - {0}, FALSE }, - { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, -@@ -845,8 +845,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) - - 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_DONTZOOM, &xf86Info.dontZoom); - - xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); -diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre -index d45c3b8..a0230cd 100644 ---- a/hw/xfree86/doc/man/xorg.conf.man.pre -+++ b/hw/xfree86/doc/man/xorg.conf.man.pre -@@ -464,12 +464,11 @@ Default: off. - .TP 7 - .BI "Option \*qDontZap\*q \*q" boolean \*q - This disallows the use of the --.B Ctrl+Alt+Backspace --sequence. --That sequence is normally used to terminate the __xservername__ server. --When this option is enabled (as per default), that key sequence has no --special meaning. --Default: on. -+.B Terminate_Server -+XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options). -+This action is normally used to terminate the __xservername__ server. -+When this option is enabled, the action has no effect. -+Default: off. - .TP 7 - .BI "Option \*qDontZoom\*q \*q" boolean \*q - This disallows the use of the --- -1.6.2.2.447.g4afa7 - diff --git a/xserver-1.6.0-selinux-less.patch b/xserver-1.6.0-selinux-less.patch deleted file mode 100644 index d7322a2..0000000 --- a/xserver-1.6.0-selinux-less.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 98a389d6fb609cdecbf6422eb6a3a9b6bf503ec2 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 11 Mar 2009 12:59:36 -0400 -Subject: [PATCH] selinux: Don't enable unless there's something to do. - ---- - Xext/xselinux.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/Xext/xselinux.c b/Xext/xselinux.c -index f8495ea..042d134 100644 ---- a/Xext/xselinux.c -+++ b/Xext/xselinux.c -@@ -1952,6 +1952,10 @@ SELinuxExtensionInit(INITARGS) - return; - } - -+ /* Don't init unless there's something to do */ -+ if (!security_get_boolean_active("xserver_object_manager")) -+ return; -+ - /* Check SELinux mode in configuration file */ - switch(selinuxEnforcingState) { - case SELINUX_MODE_DISABLED: --- -1.6.1.3 - diff --git a/xserver-1.6.0-xinerama-crashes.patch b/xserver-1.6.0-xinerama-crashes.patch deleted file mode 100644 index bb9adca..0000000 --- a/xserver-1.6.0-xinerama-crashes.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 24e682d0fcc98d7c3f63fa484cc28285df48b499 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 25 Mar 2009 13:08:27 +1000 -Subject: [PATCH] dix: ignore non-pointer events in XineramaCheckMotion (#20557) - -Note that deviceKeyButtonPointer and keyButtonPointer have the same wire -layout, so we only need to check for event types. - -X.Org Bug 20557 - -Signed-off-by: Peter Hutterer ---- - dix/events.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/dix/events.c b/dix/events.c -index 6743cae..63b0674 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -625,6 +625,23 @@ XineramaCheckMotion(xEvent *xE, DeviceIntPtr pDev) - - if (xE && !syncEvents.playingEvents) - { -+ /* GetPointerEvents() guarantees that pointer events have the correct -+ rootX/Y set already. */ -+ switch(xE->u.u.type) -+ { -+ case ButtonPress: -+ case ButtonRelease: -+ case MotionNotify: -+ break; -+ default: -+ if (xE->u.u.type == DeviceButtonPress || -+ xE->u.u.type == DeviceButtonRelease || -+ xE->u.u.type == DeviceMotionNotify) -+ break; -+ /* all other events return FALSE */ -+ return FALSE; -+ } -+ - /* Motion events entering DIX get translated to Screen 0 - coordinates. Replayed events have already been - translated since they've entered DIX before */ --- -1.6.0.6 - diff --git a/xserver-1.6.0-xinerama-cursors.patch b/xserver-1.6.0-xinerama-cursors.patch deleted file mode 100644 index 2e093ab..0000000 --- a/xserver-1.6.0-xinerama-cursors.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3323f7ac880d5a8261d5b22059374fc9de8ca683 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 25 Mar 2009 12:55:42 +1000 -Subject: [PATCH] xfree86: fix SWCursor check in xf86CursorSetCursor. - -Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when -the pointer left the screen (in a Xinerama setup). -We must call the sprite rendering function if -- SW cursors are enabled, or -- The current device is not the VCP and not attached to the VCP. - -Reported-by: Gordon Yuan -Signed-off-by: Peter Hutterer ---- - hw/xfree86/ramdac/xf86Cursor.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c -index 2b73b16..896ed37 100644 ---- a/hw/xfree86/ramdac/xf86Cursor.c -+++ b/hw/xfree86/ramdac/xf86Cursor.c -@@ -302,9 +302,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, - - - if (pCurs == NullCursor) { /* means we're supposed to remove the cursor */ -- if (ScreenPriv->SWCursor || pDev != inputInfo.pointer) -- (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, -- x, y); -+ if (ScreenPriv->SWCursor || -+ !(pDev == inputInfo.pointer || !pDev->isMaster && pDev->u.master == inputInfo.pointer)) -+ (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, x, y); - else if (ScreenPriv->isUp) { - xf86SetCursor(pScreen, NullCursor, x, y); - ScreenPriv->isUp = FALSE; --- -1.6.0.6 -