01/01: gnu: xf86-video-voodoo: Ship patch locally.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 0f469c172e41345e2097df4239b96ee627402397
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Mon May 20 04:58:06 2019 +0200

    gnu: xf86-video-voodoo: Ship patch locally.
    
    The ORIGIN patch has been modified in place, probably *wild guessing
    sounds* by a server-side cgit update.
    
    * gnu/packages/xorg.scm (xf86-video-voodoo)[source]: Use SEARCH-PATCHES.
    * gnu/packages/patches/xf86-video-voodoo-pcitag.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  1 +
 .../patches/xf86-video-voodoo-pcitag.patch         | 34 ++++++++++++++++++++++
 gnu/packages/xorg.scm                              |  9 +-----
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 694bbfd..c2f2ce2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1368,6 +1368,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
   %D%/packages/patches/xf86-video-sis-xorg-compat.patch        \
   %D%/packages/patches/xf86-video-tga-remove-mibstore.patch    \
+  %D%/packages/patches/xf86-video-voodoo-pcitag.patch          \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
   %D%/packages/patches/xfce4-session-fix-xflock4.patch         \
   %D%/packages/patches/xfce4-settings-defaults.patch           \
diff --git a/gnu/packages/patches/xf86-video-voodoo-pcitag.patch 
b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch
new file mode 100644
index 0000000..5cadef3
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch
@@ -0,0 +1,34 @@
+From: Tobias Geerinckx-Rice <address@hidden>
+Date: Mon, 20 May 2019 04:52:33 +0200
+Subject: [PATCH] gnu: xf86-video-voodoo: Don't use PCITAG.
+
+Copied verbatim from upstream repository[0].
+
+[0]: 
https://cgit.freedesktop.org/xorg/driver/-xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593
+
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <address@hidden>
+Date: Mon, 22 Sep 2014 10:56:02 +1000
+Subject: don't use PCITAG in struct anymore
+
+---
+ src/voodoo.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/voodoo.h b/src/voodoo.h
+index bfed497..c3eb64e 100644
+--- a/src/voodoo.h
++++ b/src/voodoo.h
+@@ -23,7 +23,9 @@ typedef struct {
+   
+   Bool                      Voodoo2;          /* Set if Voodoo2 */
+   pciVideoPtr       PciInfo;          /* PCI data */
++#ifndef XSERVER_LIBPCIACCESS
+   PCITAG            PciTag;
++#endif
+   CARD32            PhysBase;
+   
+   CARD32            Width;            /* Current width */
+-- 
+cgit v1.0
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5d8b349..68f72be 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3488,14 +3488,7 @@ X server.")
           (base32
            "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"))
         (patches
-         (list (origin
-                 (method url-fetch)
-                 (uri "https://cgit.freedesktop.org/xorg/driver/\
-xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593")
-                 (sha256
-                  (base32
-                   "0rndmxf5b8j3hjnhrwrnzsq5024fli134fj1mprhkcrvax2zq8db"))
-                 (file-name "xf86-video-voodoo-pcitag.patch"))))))
+         (search-patches "xf86-video-voodoo-pcitag.patch"))))
     (build-system gnu-build-system)
     (inputs `(("xorgproto" ,xorgproto)
               ("xorg-server" ,xorg-server)))