From 58e31b8d08b96bbf398c401d211770639c18320a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Apr 11 2007 21:44:10 +0000 Subject: remove a stray patch hunk --- diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 146093d..1581d66 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -58,8 +58,6 @@ Patch2003: xserver-1.2.0-vfprintf.patch Patch2004: xserver-1.2.0-honor-displaysize.patch Patch2005: xserver-1.2.99.901-xephyr-crash-at-exit.patch -Patch9999: fuck-the-kernel.patch - # assorted PCI layer shenanigans. oh the pain. Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch Patch2501: xserver-1.3.0-pci-bus-count.patch @@ -298,8 +296,6 @@ Xserver source code needed to build VNC server (Xvnc) %patch2503 -p1 -b .rom-search %patch2504 -p1 -b .domain-obiwan -%patch9999 -p1 -b .jx - %build # --with-rgb-path should be superfluous now ? diff --git a/xserver-1.3.0-no-prerelease-warning.patch b/xserver-1.3.0-no-prerelease-warning.patch index b4b8652..b8a436b 100644 --- a/xserver-1.3.0-no-prerelease-warning.patch +++ b/xserver-1.3.0-no-prerelease-warning.patch @@ -1,14 +1,3 @@ ---- xorg-server-1.2.99.905/configure.ac.jx 2007-04-06 16:52:25.000000000 -0400 -+++ xorg-server-1.2.99.905/configure.ac 2007-04-06 17:45:10.000000000 -0400 -@@ -238,7 +238,7 @@ - ;; - x86_64*|amd64*) - use_x86_asm="yes" -- I386_VIDEO=yes -+ I386_VIDEO=no - case $host_os in - *freebsd*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;; - *netbsd*) AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl]) --- xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c.jx 2007-01-31 19:55:51.000000000 -0500 +++ xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c 2007-04-11 12:32:24.000000000 -0400 @@ -1770,7 +1770,7 @@