05/06: gnu: xf86-video-trident: Fix build.

[Andy Wingo]

wingo pushed a commit to branch media-updates
in repository guix.

commit 72b63093fed910cee6919c0eb5d0f07d5164d192
Author: Andy Wingo <address@hidden>
Date:   Wed Feb 24 09:42:10 2016 +0100

    gnu: xf86-video-trident: Fix build.
    
    * gnu/packages/xorg.scm (xf86-video-trident): Remove patch.
    * gnu/packages/patches/xf86-video-trident-remove-mibstore.patch: Remove
      file.
---
 .../xf86-video-trident-remove-mibstore.patch       |   23 --------------------
 gnu/packages/xorg.scm                              |    4 +--
 2 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch 
b/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch
deleted file mode 100644
index 74c8987..0000000
--- a/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Removes references to mibstore.h and miInitializeBackingStore, which
-have been removed from xorg-server.  Zack Rusin <address@hidden>
-wrote: "It was a noop for at least 5 years and it has been removed."
-See: http://patches.openembedded.org/patch/46133/
-
---- xf86-video-trident-1.3.6/src/trident_driver.c.~1~  2012-07-15 
22:16:00.000000000 -0400
-+++ xf86-video-trident-1.3.6/src/trident_driver.c      2014-12-19 
01:45:29.529410518 -0500
-@@ -56,7 +56,6 @@
- 
- #include "mipointer.h"
- 
--#include "mibstore.h"
- #include "shadow.h"
- #include "trident.h"
- #include "trident_regs.h"
-@@ -3037,7 +3036,6 @@
-       TridentAccelInit(pScreen);
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- 
-     /* Initialise cursor functions */
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6376f0d..172ebc3 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3297,9 +3297,7 @@ X server.")
                ".tar.bz2"))
         (sha256
           (base32
-           "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc"))
-        (patches (list
-                  (search-patch "xf86-video-trident-remove-mibstore.patch")))))
+           "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc"))))
     (build-system gnu-build-system)
     (inputs `(("xf86dgaproto" ,xf86dgaproto)
               ("xorg-server" ,xorg-server)))