02/05: gnu: xf86-video-geode: Remove unnecessary patch.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 2577a0196f246f73a754b9b2a0ffdd6b9e64cdda
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed Aug 19 17:09:24 2020 +0200

    gnu: xf86-video-geode: Remove unnecessary patch.
    
    * gnu/packages/xorg.scm (xf86-video-geode)[source]: Remove patch.
    * gnu/packages/patches/xf86-video-geode-glibc-2.20.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                           |  1 -
 gnu/packages/patches/xf86-video-geode-glibc-2.20.patch | 15 ---------------
 gnu/packages/xorg.scm                                  |  3 +--
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index d7f28c7..44680da 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1663,7 +1663,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch                 \
   %D%/packages/patches/x265-arm-flags.patch                    \
   %D%/packages/patches/xf86-video-ark-remove-mibstore.patch    \
-  %D%/packages/patches/xf86-video-geode-glibc-2.20.patch       \
   %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch      \
   %D%/packages/patches/xf86-video-savage-xorg-compat.patch     \
   %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
diff --git a/gnu/packages/patches/xf86-video-geode-glibc-2.20.patch 
b/gnu/packages/patches/xf86-video-geode-glibc-2.20.patch
deleted file mode 100644
index 4dc69e3..0000000
--- a/gnu/packages/patches/xf86-video-geode-glibc-2.20.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow builds with glibc 2.20.
-Based on a patch by Peter Hutterer <peter.hutterer@who-t.net>.
-See 
<https://raw.githubusercontent.com/openembedded/oe-core/master/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch>.
-
---- xf86-video-geode-2.11.16/src/lx_memory.c.~1~       2014-07-16 
16:59:37.000000000 -0400
-+++ xf86-video-geode-2.11.16/src/lx_memory.c   2014-12-19 00:38:11.753388268 
-0500
-@@ -23,6 +23,8 @@
-  * software without specific prior written permission.
-  */
- 
-+#include <xorg-server.h>
-+
- #include "xf86.h"
- #include "geode.h"
- #include "cim/cim_regs.h"
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 99c3431..d4c4ab9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2927,8 +2927,7 @@ It supports a variety of Adreno graphics chipsets.")
        (uri (string-append "mirror://xorg/individual/driver/xf86-video-geode-"
                            version ".tar.bz2"))
        (sha256
-        (base32 "0r2dz0agg0k5wrqdbicji6mh6svzyl0xgqk76hpcfdlzn2zx15zl"))
-       (patches (search-patches "xf86-video-geode-glibc-2.20.patch"))))
+        (base32 "0r2dz0agg0k5wrqdbicji6mh6svzyl0xgqk76hpcfdlzn2zx15zl"))))
     (build-system gnu-build-system)
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))