summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-08-19 17:09:24 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2020-08-19 20:03:55 +0200
commit2577a0196f246f73a754b9b2a0ffdd6b9e64cdda (patch)
treee6cc550aacdf7afee61bb912136bfe6c35800cf8 /gnu/packages
parentb137d320b0071e13c3db754562dea71f2075e88f (diff)
downloadguix-2577a0196f246f73a754b9b2a0ffdd6b9e64cdda.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/patches/xf86-video-geode-glibc-2.20.patch15
-rw-r--r--gnu/packages/xorg.scm3
2 files changed, 1 insertions, 17 deletions
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 4dc69e3611..0000000000
--- 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 99c3431a8b..d4c4ab9ecc 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)))